Merge "Fix 258181 Enable moving apps to external storage if install location is set and they had been moved to internal storage." into froyo

1 files changed, 5 insertions, 9 deletions

diff --git a/src/com/android/settings/InstalledAppDetails.java b/src/com/android/settings/InstalledAppDetails.java
index 52e9844..a8ceab0 100644
--- a/src/com/android/settings/InstalledAppDetails.java
+++ b/src/com/android/settings/InstalledAppDetails.java
@@ -239,15 +239,11 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
             moveDisable = false;
         } else {
             mMoveAppButton.setText(R.string.move_app_to_sdcard);
-            if ((mAppInfo.flags & ApplicationInfo.FLAG_FORWARD_LOCK) != 0 ||
-                    (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                moveDisable = true;
-            } else if (pkgInfo != null) {
-                if (pkgInfo.installLocation ==
-                    PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {
-                    // If an application explicitly specifies install location
-                    // consider that
-                    moveDisable = true;
+            if ((mAppInfo.flags & ApplicationInfo.FLAG_FORWARD_LOCK) == 0 &&
+                    (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0 &&
+                    pkgInfo != null) {
+                if (pkgInfo.installLocation == PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL) {
+                    moveDisable = false;
                 } else if (pkgInfo.installLocation == PackageInfo.INSTALL_LOCATION_UNSPECIFIED) {
                     IPackageManager ipm  = IPackageManager.Stub.asInterface(
                             ServiceManager.getService("package"));