Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "OP_REQUEST_INSTALL_PACKAGES denied by default" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-09 22:02:30 +00:00
committed by Android (Google) Code Review
parent dc33291f3c acc75528ff
commit aacec3d111
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
View File

@@ -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

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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 checkUidPermission(appOpPermission, uid) == PERMISSION_GRANTED; return false;
} }
@Override @Override