Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 691692d4 authored by Suprabh Shukla's avatar Suprabh Shukla
Browse files

Not using app op code constant directly from PackageInstaller 

Since AppOpsManager op codes are hidden apis, they can be modified by
OEMs. Referencing the codes directly prohibits partners from freely
using the integer ids to assign to their own op codes. Using a string
identifier to indirectly infer the integer code is more flexible.

Test: Builds, boots, existing tests pass

Bug: 65534401
Change-Id: I5a69690871b5b55f2f8d45d0cf53b5f25ff5abff
parent 51712e3b

src/com/android/packageinstaller/PackageInstallerActivity.java

+5 −2
Original line number Diff line number Diff line
@@ -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: