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

Merge changes from topic "presubmit-am-0635c718d1dd418e8eb0c803ec3b93fe" into sc-v2-dev-plus-aosp

Browse Source 
* changes:
  [automerge] Show a warning about mismatching test / APK certs 2p: 983caeddb4
  Show a warning about mismatching test / APK certs
This commit is contained in:
Makoto Onuki
2022-03-08 16:32:57 +00:00
committed by Android (Google) Code Review
parent 76472b2e16 81a4e81176
commit 7badfb1f20
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -13813,14 +13813,26 @@ public class ActivityManagerService extends IActivityManager.Stub
return false;
}
if (!Build.IS_DEBUGGABLE) {
int match = mContext.getPackageManager().checkSignatures(
ii.targetPackage, ii.packageName);
if (match < 0 && match != PackageManager.SIGNATURE_FIRST_NOT_SIGNED) {
int match = mContext.getPackageManager().checkSignatures(
ii.targetPackage, ii.packageName);
if (match < 0 && match != PackageManager.SIGNATURE_FIRST_NOT_SIGNED) {
if (Build.IS_DEBUGGABLE) {
String message = "Instrumentation test " + ii.packageName
+ " doesn't have a signature matching the target "
+ ii.targetPackage
+ ", which would not be allowed on the production Android builds";
if (callingUid != Process.ROOT_UID) {
Slog.e(TAG, message
+ ". THIS WILL BE DISALLOWED ON FUTURE ANDROID VERSIONS"
+ " unless from a rooted ADB shell.");
} else {
Slog.w(TAG, message);
}
} else {
String msg = "Permission Denial: starting instrumentation "
+ className + " from pid="
+ Binder.getCallingPid()
+ ", uid=" + Binder.getCallingPid()
+ ", uid=" + Binder.getCallingUid()
+ " not allowed because package " + ii.packageName
+ " does not have a signature matching the target "
+ ii.targetPackage;