Merge "Fix 258181 Enable moving apps to external storage if install location is set and they had been moved to internal storage." into froyo
This commit is contained in:
committed by
Android (Google) Code Review
commit
6023d0b93d
@@ -239,15 +239,11 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
|
|||||||
moveDisable = false;
|
moveDisable = false;
|
||||||
} else {
|
} else {
|
||||||
mMoveAppButton.setText(R.string.move_app_to_sdcard);
|
mMoveAppButton.setText(R.string.move_app_to_sdcard);
|
||||||
if ((mAppInfo.flags & ApplicationInfo.FLAG_FORWARD_LOCK) != 0 ||
|
if ((mAppInfo.flags & ApplicationInfo.FLAG_FORWARD_LOCK) == 0 &&
|
||||||
(mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
|
(mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0 &&
|
||||||
moveDisable = true;
|
pkgInfo != null) {
|
||||||
} else if (pkgInfo != null) {
|
if (pkgInfo.installLocation == PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL) {
|
||||||
if (pkgInfo.installLocation ==
|
moveDisable = false;
|
||||||
PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {
|
|
||||||
// If an application explicitly specifies install location
|
|
||||||
// consider that
|
|
||||||
moveDisable = true;
|
|
||||||
} else if (pkgInfo.installLocation == PackageInfo.INSTALL_LOCATION_UNSPECIFIED) {
|
} else if (pkgInfo.installLocation == PackageInfo.INSTALL_LOCATION_UNSPECIFIED) {
|
||||||
IPackageManager ipm = IPackageManager.Stub.asInterface(
|
IPackageManager ipm = IPackageManager.Stub.asInterface(
|
||||||
ServiceManager.getService("package"));
|
ServiceManager.getService("package"));
|
||||||
|
Reference in New Issue
Block a user