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

Merge "Don't back up disabled apps" into oc-dev

Browse Source 
am: 628690ea2b

Change-Id: If8008f3c14bdb12dee5e400ce96394e1f541f462
This commit is contained in:
Chris Tate
2017-04-17 17:44:18 +00:00
committed by android-build-merger
parent a7cba48907 628690ea2b
commit 281def0704
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -798,6 +798,19 @@ public class BackupManagerService {
return ((app.flags & ApplicationInfo.FLAG_STOPPED) != 0);
}
// We also avoid backups of 'disabled' apps
private static boolean appIsDisabled(ApplicationInfo app, PackageManager pm) {
switch (pm.getApplicationEnabledSetting(app.packageName)) {
case PackageManager.COMPONENT_ENABLED_STATE_DISABLED:
case PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER:
case PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED:
return true;
default:
return false;
}
}
/* does *not* check overall backup eligibility policy! */
private static boolean appGetsFullBackup(PackageInfo pkg) {
if (pkg.applicationInfo.backupAgentName != null) {
@@ -10774,7 +10787,8 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
PackageInfo packageInfo = mPackageManager.getPackageInfo(packageName,
PackageManager.GET_SIGNATURES);
if (!appIsEligibleForBackup(packageInfo.applicationInfo) ||
appIsStopped(packageInfo.applicationInfo)) {
appIsStopped(packageInfo.applicationInfo) ||
appIsDisabled(packageInfo.applicationInfo, mPackageManager)) {
return false;
}
IBackupTransport transport = mTransportManager.getCurrentTransportBinder();