diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-29 20:02:59 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-29 20:02:59 +0000 |
| commit | 4eb049be98cb0cba6174a6d6114af6ceae9c59fb (patch) | |
| tree | 9766e25f6b485ffc2345fac0915e2bc6d0cb7fb6 | |
| parent | cc0dddceb5286162a34deea700cfe942f3222919 (diff) | |
| parent | c6124717cfc88ba0ddbe6720fc18e43342126a45 (diff) | |
| download | android_packages_apps_PackageInstaller-4eb049be98cb0cba6174a6d6114af6ceae9c59fb.tar.gz android_packages_apps_PackageInstaller-4eb049be98cb0cba6174a6d6114af6ceae9c59fb.tar.bz2 android_packages_apps_PackageInstaller-4eb049be98cb0cba6174a6d6114af6ceae9c59fb.zip | |
release-request-99856c15-b008-4977-9971-f86523a23c0a-for-git_oc-m2-release-4367109 snap-temp-L18300000107415568
Change-Id: Iece11b0570d89f4a12923a956e33fd67bb0df093
| -rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 61154716..06444179 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -519,7 +519,10 @@ public class PackageInstallerActivity extends OverlayTouchActivity implements On showDialogInner(DLG_ANONYMOUS_SOURCE); return; } - int appOpMode = mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_REQUEST_INSTALL_PACKAGES, + // Shouldn't use static constant directly, see b/65534401. + final int appOpCode = + AppOpsManager.permissionToOpCode(Manifest.permission.REQUEST_INSTALL_PACKAGES); + final int appOpMode = mAppOpsManager.checkOpNoThrow(appOpCode, mOriginatingUid, mOriginatingPackage); switch (appOpMode) { case AppOpsManager.MODE_DEFAULT: @@ -533,7 +536,7 @@ public class PackageInstallerActivity extends OverlayTouchActivity implements On } catch (RemoteException exc) { Log.e(TAG, "Unable to talk to package manager"); } - mAppOpsManager.setMode(AppOpsManager.OP_REQUEST_INSTALL_PACKAGES, mOriginatingUid, + mAppOpsManager.setMode(appOpCode, mOriginatingUid, mOriginatingPackage, AppOpsManager.MODE_ERRORED); // fall through case AppOpsManager.MODE_ERRORED: |