commit c02a09aa565318f37d9481d05d50610fe722e4b4
author Jim Miller <jaggies@google.com> Wed Apr 14 14:47:48 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 14 14:47:48 2010 -0700
tree 549a8a696e159b861e5e365f264b6de83ced5511
parent 6023d0b93d18c868450c3390a43984acdfbad1eb
parent 2deec7edc937b1d19df0a74c4cd0c5ee3ef33070

Merge "Fix 2594148: confirm PIN/Password before resetting device" into froyo

src/com/android/settings/InstalledAppDetails.java

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 @@
             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"));