Merge "OP_REQUEST_INSTALL_PACKAGES denied by default" into qt-dev (aacec3d1) · Commits · e / os / android_frameworks_base

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import android.content.pm.PackageUserState;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.UserManager;
		import android.provider.Settings;
		import android.util.Log;
		@@ -472,16 +471,6 @@ public class PackageInstallerActivity extends AlertActivity {
		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

+2 −4

Original line number	Diff line number	Diff line
		@@ -24816,11 +24816,9 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		if (mExternalSourcesPolicy != null) {
		int isTrusted = mExternalSourcesPolicy.getPackageTrustedToInstallApps(packageName, uid);
		if (isTrusted != PackageManagerInternal.ExternalSourcesPolicy.USER_DEFAULT) {
		return isTrusted == PackageManagerInternal.ExternalSourcesPolicy.USER_TRUSTED;
		}
		}
		return checkUidPermission(appOpPermission, uid) == PERMISSION_GRANTED;
		return false;
		}

		@Override