diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-02-11 19:34:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-11 19:34:30 +0000 |
| commit | 517e0274cb2cfd215b20622280d5e256e8282bbb (patch) | |
| tree | c4faa0b3e8d1db30fc8a2deb3bb13b38de5a9364 /services/backup | |
| parent | 1641e192a82e266159e0b82078a8f98ebcd3d8ff (diff) | |
| parent | 1a24bb597aeb1b019d55988b574e5db1b0e4232c (diff) | |
| download | frameworks_base-517e0274cb2cfd215b20622280d5e256e8282bbb.zip frameworks_base-517e0274cb2cfd215b20622280d5e256e8282bbb.tar.gz frameworks_base-517e0274cb2cfd215b20622280d5e256e8282bbb.tar.bz2 | |
Merge "Move hidden ApplicationInfo flags into a separate field."
automerge: 1a24bb5
* commit '1a24bb597aeb1b019d55988b574e5db1b0e4232c':
Move hidden ApplicationInfo flags into a separate field.
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 fea1a7a..a55f55d 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -1855,7 +1855,8 @@ public class BackupManagerService extends IBackupManager.Stub { 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"); @@ -3107,7 +3108,7 @@ public class BackupManagerService extends IBackupManager.Stub { 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); |