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

Commit d6b75293 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7496339, 7495273, 7495624, 7496340, 7496341, 7496342,...

Merge cherrypicks of [7496339, 7495273, 7495624, 7496340, 7496341, 7496342, 7496343, 7495658, 7494789, 7494790, 7494791, 7496344, 7496345, 7496346, 7496347, 7496574, 7496348, 7496575, 7496576, 7496260, 7496349, 7496350, 7496440, 7496577, 7496578, 7496261, 7495625, 7496442, 7496351] into pi-qpr3-release

Change-Id: I22c0d25a54e8b131261a0792f0e78b838fc89086
parents b101f7ec 80aa96eb
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -39,7 +39,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;
@@ -529,16 +528,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