diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-02-11 20:42:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 20:42:38 +0000 |
| commit | 512965420a8c5b00780610e962574215c91cf829 (patch) | |
| tree | d04a21af4b1518aede528de5a9e276eb6a6418dc /src/com/android/packageinstaller/PackageInstallerActivity.java | |
| parent | eee9dadb267c8d21344321732ca44c80a989b4b0 (diff) | |
| parent | 10763f1caaf75389302a175a18f7b302848e3b36 (diff) | |
| download | android_packages_apps_PackageInstaller-512965420a8c5b00780610e962574215c91cf829.tar.gz android_packages_apps_PackageInstaller-512965420a8c5b00780610e962574215c91cf829.tar.bz2 android_packages_apps_PackageInstaller-512965420a8c5b00780610e962574215c91cf829.zip | |
am 10763f1c: Merge "Hidden ApplicationInfo flags are now in privateFlags."
* commit '10763f1caaf75389302a175a18f7b302848e3b36':
Hidden ApplicationInfo flags are now in privateFlags.
Diffstat (limited to 'src/com/android/packageinstaller/PackageInstallerActivity.java')
| -rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index e600dd8f..9153d71a 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -356,7 +356,8 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen try { mSourceInfo = mPm.getApplicationInfo(callerPackage, 0); if (mSourceInfo != null) { - if ((mSourceInfo.flags & ApplicationInfo.FLAG_PRIVILEGED) != 0) { + if ((mSourceInfo.privateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) + != 0) { // Privileged apps are not considered an unknown source. return false; } @@ -593,7 +594,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen ApplicationInfo sourceInfo = getSourceInfo(); if (sourceInfo != null) { if (uidFromIntent != VerificationParams.NO_UID && - (mSourceInfo.flags & ApplicationInfo.FLAG_PRIVILEGED) != 0) { + (mSourceInfo.privateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) != 0) { return uidFromIntent; } @@ -623,7 +624,8 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen ApplicationInfo applicationInfo = mPm.getApplicationInfo(packageName, 0); - if ((applicationInfo.flags & ApplicationInfo.FLAG_PRIVILEGED) != 0) { + if ((applicationInfo.privateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) + != 0) { return uidFromIntent; } } catch (NameNotFoundException ex) { |