5 files changed, 34 insertions, 5 deletions

diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 0ae9187..5fc3437 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -529,7 +529,8 @@ public class ActivityManager {
     static public boolean isHighEndGfx() {
         return (!isLowRamDeviceStatic() &&
                 !Resources.getSystem().getBoolean(com.android.internal.R.bool.config_avoidGfxAccel))
-                || isForcedHighEndGfx();
+                || isForcedHighEndGfx()
+                || "0".equals(SystemProperties.get("ro.softwaregl", "0"));
     }
 
     /**
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index dd15d38..16727fe 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -1147,7 +1147,16 @@ public class Camera {
                         // Set to oneshot mode again.
                         setHasPreviewCallback(true, false);
                     }
-                    pCb.onPreviewFrame((byte[])msg.obj, mCamera);
+
+                    byte[] luminances = (byte[])msg.obj;
+                    if(getParameters().getPreviewFormat() == ImageFormat.RGB_565)
+                        // Convert to greyscale
+                        // Apps expect YUV as default format. Greyscale is
+                        // only the first layer of YUV, but it's all that's
+                        // needed by barcode scanner apps.
+                        rgbToBw(luminances);
+
+                    pCb.onPreviewFrame(luminances, mCamera);
                 }
                 return;
 
@@ -1216,6 +1225,17 @@ public class Camera {
         }
     }
 
+    private void rgbToBw(byte[] pixels)
+    {
+        Size previewsize = getParameters().getPreviewSize();
+        int height = previewsize.height;
+        int width = previewsize.width;
+
+        native_rgbToBw(pixels, width, height);
+    }
+
+    private native void native_rgbToBw(byte[] pixelBuffer, int bufWidth, int bufHeight);
+
     private static void postEventFromNative(Object camera_ref,
                                             int what, int arg1, int arg2, Object obj)
     {
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 3ab16fe..e6f1f4a 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4926,6 +4926,13 @@ public final class Settings {
                 "lock_screen_allow_private_notifications";
 
         /**
+         * Separate password for encryption and the lockscreen.
+         * @hide
+         */
+        public static final String LOCK_SEPARATE_ENCRYPTION_PASSWORD =
+                "lock_separate_encryption_password";
+
+        /**
          * Set by the system to track if the user needs to see the call to action for
          * the lockscreen notification policy.
          * @hide
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index d598291..fa3d9c9 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -189,7 +189,7 @@ public abstract class WallpaperService extends Service {
 
         final BaseSurfaceHolder mSurfaceHolder = new BaseSurfaceHolder() {
             {
-                mRequestedFormat = PixelFormat.RGBX_8888;
+                mRequestedFormat = PixelFormat.RGBA_8888;
             }
 
             @Override
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
index 5e58250..f67bb9c 100644
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -19,6 +19,7 @@ package android.view;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
+import android.os.SystemProperties;
 import android.view.Surface.OutOfResourcesException;
 
 import java.io.File;
@@ -161,14 +162,14 @@ public abstract class HardwareRenderer {
      *
      * @hide
      */
-    public static boolean sRendererDisabled = false;
+    public static boolean sRendererDisabled = SystemProperties.get("ro.softwaregl").equals("1") ? true : false;
 
     /**
      * Further hardware renderer disabling for the system process.
      *
      * @hide
      */
-    public static boolean sSystemRendererDisabled = false;
+    public static boolean sSystemRendererDisabled = SystemProperties.get("ro.softwaregl").equals("1") ? true : false;
 
     private boolean mEnabled;
     private boolean mRequested = true;