Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable moving 3rd party apps to internal if not allowed."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-20 00:57:31 +00:00
committed by Android (Google) Code Review
parent f8f27c68fd 022b8eaa1d
commit 54df14956e
4 changed files with 295 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core/java/android/app/ApplicationPackageManager.java
View File

@@ -24,6 +24,7 @@ import android.annotation.XmlRes;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.IntentSender;
@@ -1386,7 +1387,7 @@ public class ApplicationPackageManager extends PackageManager {
}
}
ApplicationPackageManager(ContextImpl context,
protected ApplicationPackageManager(ContextImpl context,
IPackageManager pm) {
mContext = context;
mPM = pm;
@@ -1820,6 +1821,12 @@ public class ApplicationPackageManager extends PackageManager {
@Override
public @Nullable VolumeInfo getPackageCurrentVolume(ApplicationInfo app) {
final StorageManager storage = mContext.getSystemService(StorageManager.class);
return getPackageCurrentVolume(app, storage);
}
@VisibleForTesting
protected @Nullable VolumeInfo getPackageCurrentVolume(ApplicationInfo app,
StorageManager storage) {
if (app.isInternal()) {
return storage.findVolumeById(VolumeInfo.ID_PRIVATE_INTERNAL);
} else if (app.isExternalAsec()) {
@@ -1831,25 +1838,43 @@ public class ApplicationPackageManager extends PackageManager {
@Override
public @NonNull List<VolumeInfo> getPackageCandidateVolumes(ApplicationInfo app) {
final StorageManager storage = mContext.getSystemService(StorageManager.class);
final VolumeInfo currentVol = getPackageCurrentVolume(app);
final List<VolumeInfo> vols = storage.getVolumes();
final StorageManager storageManager = mContext.getSystemService(StorageManager.class);
return getPackageCandidateVolumes(app, storageManager, mPM);
}
@VisibleForTesting
protected @NonNull List<VolumeInfo> getPackageCandidateVolumes(ApplicationInfo app,
StorageManager storageManager, IPackageManager pm) {
final VolumeInfo currentVol = getPackageCurrentVolume(app, storageManager);
final List<VolumeInfo> vols = storageManager.getVolumes();
final List<VolumeInfo> candidates = new ArrayList<>();
for (VolumeInfo vol : vols) {
if (Objects.equals(vol, currentVol) || isPackageCandidateVolume(mContext, app, vol)) {
if (Objects.equals(vol, currentVol)
|| isPackageCandidateVolume(mContext, app, vol, pm)) {
candidates.add(vol);
}
}
return candidates;
}
private boolean isPackageCandidateVolume(
ContextImpl context, ApplicationInfo app, VolumeInfo vol) {
final boolean forceAllowOnExternal = Settings.Global.getInt(
@VisibleForTesting
protected boolean isForceAllowOnExternal(Context context) {
return Settings.Global.getInt(
context.getContentResolver(), Settings.Global.FORCE_ALLOW_ON_EXTERNAL, 0) != 0;
// Private internal is always an option
}
@VisibleForTesting
protected boolean isAllow3rdPartyOnInternal(Context context) {
return context.getResources().getBoolean(
com.android.internal.R.bool.config_allow3rdPartyAppOnInternal);
}
private boolean isPackageCandidateVolume(
ContextImpl context, ApplicationInfo app, VolumeInfo vol, IPackageManager pm) {
final boolean forceAllowOnExternal = isForceAllowOnExternal(context);
if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(vol.getId())) {
return true;
return app.isSystemApp() || isAllow3rdPartyOnInternal(context);
}
// System apps and apps demanding internal storage can't be moved
@@ -1875,7 +1900,7 @@ public class ApplicationPackageManager extends PackageManager {
// Some apps can't be moved. (e.g. device admins)
try {
if (mPM.isPackageDeviceAdminOnAnyUser(app.packageName)) {
if (pm.isPackageDeviceAdminOnAnyUser(app.packageName)) {
return false;
}
} catch (RemoteException e) {

8
core/java/android/content/pm/PackageManager.java
View File

@@ -1359,6 +1359,14 @@ public abstract class PackageManager {
*/
public static final int MOVE_FAILED_DEVICE_ADMIN = -8;
/**
* Error code that is passed to the {@link IPackageMoveObserver} if system does not allow
* non-system apps to be moved to internal storage.
*
* @hide
*/
public static final int MOVE_FAILED_3RD_PARTY_NOT_ALLOWED_ON_INTERNAL = -9;
/**
* Flag parameter for {@link #movePackage} to indicate that
* the package should be moved to internal storage if its