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

Unverified Commit 6ee7acf2 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge remote-tracking branch 'aosp/oreo-mr1-security-release' into lineage-15.1 

* aosp/oreo-mr1-security-release:
  [RESTRICT AUTOMERGE]: Merge commit '217f31fb' into OP_REQUEST_INSTALL_PACKAGES-denied
  Ask for PIN when granting permissions in front of lock screen
  RESTRICT AUTOMERGE: Trust session id only if started with ACTION_CONFIRM_INSTALL
  RESTRICT AUTOMERGE: Always use safe labels

Change-Id: I90dd2a6fcbc28d7de845dda32ec17600d5b6b993
parents b3f9d239 c3a4cf72

src/com/android/packageinstaller/PackageInstallerActivity.java

+0 −11
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.net.Uri; 
import android.os.Build;

import android.os.Bundle;

import android.os.Process;

import android.os.RemoteException;

import android.os.UserManager;

import android.provider.Settings;

import android.support.annotation.NonNull;
@@ -526,16 +525,6 @@ public class PackageInstallerActivity extends OverlayTouchActivity implements On 
                mOriginatingUid, mOriginatingPackage);

        switch (appOpMode) {

            case AppOpsManager.MODE_DEFAULT:

                try {

                    int result = mIpm.checkUidPermission(

                            Manifest.permission.REQUEST_INSTALL_PACKAGES, mOriginatingUid);

                    if (result == PackageManager.PERMISSION_GRANTED) {

                        initiateInstall();

                        break;

                    }

                } catch (RemoteException exc) {

                    Log.e(TAG, "Unable to talk to package manager");

                }

                mAppOpsManager.setMode(appOpCode, mOriginatingUid,

                        mOriginatingPackage, AppOpsManager.MODE_ERRORED);

                // fall through