diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-02-11 12:37:12 -0800 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-02-11 12:37:12 -0800 |
| commit | 33d3c53da021f0d044028860ace0f4ad817273f5 (patch) | |
| tree | 1ebd67dbfa35109595bd6258633abba7931f1290 /services/backup | |
| parent | c093955af1434a7023093acb148ab152d915e59c (diff) | |
| parent | 517e0274cb2cfd215b20622280d5e256e8282bbb (diff) | |
| download | frameworks_base-33d3c53da021f0d044028860ace0f4ad817273f5.zip frameworks_base-33d3c53da021f0d044028860ace0f4ad817273f5.tar.gz frameworks_base-33d3c53da021f0d044028860ace0f4ad817273f5.tar.bz2 | |
resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp
Change-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a
Diffstat (limited to 'services/backup')
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index c1e4994..4d7ebed 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -1865,7 +1865,8 @@ public class BackupManagerService { boolean tryBindTransport(ServiceInfo info) { try { PackageInfo packInfo = mPackageManager.getPackageInfo(info.packageName, 0); - if ((packInfo.applicationInfo.flags & ApplicationInfo.FLAG_PRIVILEGED) != 0) { + if ((packInfo.applicationInfo.privateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) + != 0) { return bindTransport(info); } else { Slog.w(TAG, "Transport package " + info.packageName + " not privileged"); @@ -3196,7 +3197,7 @@ public class BackupManagerService { final boolean isSharedStorage = pkg.packageName.equals(SHARED_BACKUP_AGENT_PACKAGE); final boolean sendApk = mIncludeApks && !isSharedStorage - && ((app.flags & ApplicationInfo.FLAG_FORWARD_LOCK) == 0) + && ((app.privateFlags & ApplicationInfo.PRIVATE_FLAG_FORWARD_LOCK) == 0) && ((app.flags & ApplicationInfo.FLAG_SYSTEM) == 0 || (app.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0); |