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

Commit 7badfb1f authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerge] Show a warning about mismatching test / APK certs 2p: 983caedd
  Show a warning about mismatching test / APK certs
parents 76472b2e 81a4e811

services/core/java/com/android/server/am/ActivityManagerService.java

+17 −5
Original line number Diff line number Diff line
@@ -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) {













                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;