commit 0e9befbf4b0e7a76c84ed4954bab033b253b2c5e
author Jeff Brown <jeffbrown@google.com> Thu Apr 08 16:47:19 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 08 16:47:19 2010 -0700
tree 29bbf39e6ff004477b6949327165181486dffbd5
parent 38f5d6454db75c054f3e5a0c55958e9b35844d5b
parent 5733ad453dcd8a64d3f6c151a14606d70ccda152

am b00771aa: am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo

Merge commit 'b00771aa806e9fd43669f09e8c348f2b4457ca0b' into kraken

* commit 'b00771aa806e9fd43669f09e8c348f2b4457ca0b':
  Workaround NPE caused by packages missing signatures.

libs/surfaceflinger/SurfaceFlinger.cpp

diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp
index 0722fda..8a197e2 100644
--- a/libs/surfaceflinger/SurfaceFlinger.cpp
+++ b/libs/surfaceflinger/SurfaceFlinger.cpp
@@ -1298,7 +1298,7 @@
         format = PIXEL_FORMAT_RGBA_8888;
         break;
     case PIXEL_FORMAT_OPAQUE:
-        format = PIXEL_FORMAT_RGB_565;
+        format = PIXEL_FORMAT_RGBX_8888;
         break;
     }
 

vpn/java/android/net/vpn/VpnManager.java

diff --git a/vpn/java/android/net/vpn/VpnManager.java b/vpn/java/android/net/vpn/VpnManager.java
index ce522c8..ce40b5d 100644
--- a/vpn/java/android/net/vpn/VpnManager.java
+++ b/vpn/java/android/net/vpn/VpnManager.java
@@ -85,7 +85,8 @@
 
     // TODO(oam): Test VPN when EFS is enabled (will do later)...
     public static String getProfilePath() {
-        return Environment.getDataDirectory().getPath() + PROFILES_PATH;
+        // This call will return the correct path if Encrypted FS is enabled or not.
+        return Environment.getSecureDataDirectory().getPath() + PROFILES_PATH;
     }
 
     /**