commit 38f5d6454db75c054f3e5a0c55958e9b35844d5b
author Jeff Brown <jeffbrown@google.com> Thu Apr 08 16:47:15 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 08 16:47:15 2010 -0700
tree 29bbf39e6ff004477b6949327165181486dffbd5
parent c99332653f4fe6379171ea03c69091f385899cc1
parent 68e2f857406fdc9e9489754a03aa6a413a403962

am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo

Merge commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0' into kraken

* commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0':
  Improve robustness of package manager certificate collection.

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;
     }
 
     /**