diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 782dc46..49d639d 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -1662,6 +1662,21 @@ public final class ActivityThread {
         return (sCurrentActivityThread != null) ? sCurrentActivityThread.mSystemThread : false;
     }

+    public static int isSystemApp() {
+        ApplicationInfo ai = null;
+
+        try {
+            ai = getPackageManager().getApplicationInfo(currentOpPackageName(), 0, UserHandle.myUserId());
+        } catch (RemoteException e) {
+            return -1;
+        }
+
+        if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0)
+            return 1;
+        else
+            return 0;
+    }
+
     public static String currentOpPackageName() {
         ActivityThread am = currentActivityThread();
         return (am != null && am.getApplication() != null)
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index dd15d38..6bda753 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -20,6 +20,7 @@ import android.app.ActivityThread;
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.ImageFormat;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -486,7 +487,11 @@ public class Camera {

         String packageName = ActivityThread.currentOpPackageName();

-        //Force HAL1 if the package name falls in this bucket
+        // Force HAL1 for all user apps
+        if (ActivityThread.isSystemApp() == 0)
+            halVersion = CAMERA_HAL_API_VERSION_1_0;
+
+        // Force HAL1 if the package is system app and its name falls in this bucket
         String packageList = SystemProperties.get("camera.hal1.packagelist", "");
         if (packageList.length() > 0) {
             TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');