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

Commit 88492160 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge "OP_REQUEST_INSTALL_PACKAGES denied by default" into qt-dev 

am: aacec3d1

Change-Id: I7e7f922a98bef65f3fd889e2389bccee93f45fb2
parents d3d18051 aacec3d1

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

+0 −11
Original line number Original line Diff line number Diff line
@@ -43,7 +43,6 @@ import android.content.pm.PackageUserState; 
import android.net.Uri;

import android.net.Uri;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Process;

import android.os.Process;

import android.os.RemoteException;

import android.os.UserManager;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.Settings;

import android.util.Log;

import android.util.Log;
@@ -472,16 +471,6 @@ public class PackageInstallerActivity extends AlertActivity { 
                mOriginatingUid, mOriginatingPackage);

                mOriginatingUid, mOriginatingPackage);

        switch (appOpMode) {

        switch (appOpMode) {

            case AppOpsManager.MODE_DEFAULT:

            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,

                mAppOpsManager.setMode(appOpCode, mOriginatingUid,

                        mOriginatingPackage, AppOpsManager.MODE_ERRORED);

                        mOriginatingPackage, AppOpsManager.MODE_ERRORED);

                // fall through

                // fall through

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -24816,11 +24816,9 @@ public class PackageManagerService extends IPackageManager.Stub 
        }

        }

        if (mExternalSourcesPolicy != null) {

        if (mExternalSourcesPolicy != null) {

            int isTrusted = mExternalSourcesPolicy.getPackageTrustedToInstallApps(packageName, uid);

            int isTrusted = mExternalSourcesPolicy.getPackageTrustedToInstallApps(packageName, uid);

            if (isTrusted != PackageManagerInternal.ExternalSourcesPolicy.USER_DEFAULT) {

            return isTrusted == PackageManagerInternal.ExternalSourcesPolicy.USER_TRUSTED;

            return isTrusted == PackageManagerInternal.ExternalSourcesPolicy.USER_TRUSTED;

        }

        }

        }

        return false;

        return checkUidPermission(appOpPermission, uid) == PERMISSION_GRANTED;

    }

    }

















    @Override







    @Override