PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '6023d0b93d18c868450c3390a43984acdfbad1eb' into kraken

* commit '6023d0b93d18c868450c3390a43984acdfbad1eb':
  Fix 258181
This commit is contained in:
Suchi Amalapurapu
2010-04-14 16:30:47 -07:00
committed by Android Git Automerger
parent 6e61b2177b 6023d0b93d
commit bbeb73656c
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/InstalledAppDetails.java
View File

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