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

Commit 78b33d01 authored by Nan Wu's avatar Nan Wu Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE am: e5069813 am: b936aa12 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25165838



Change-Id: I32cc277da264cba730d9d43ad4ac49154eb4ad66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1bfc9e6 b936aa12

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

+14 −1
Original line number Diff line number Diff line
@@ -5434,7 +5434,20 @@ public class ActivityManagerService extends IActivityManager.Stub 
                intent = new Intent(Intent.ACTION_MAIN);

            }

            try {

                target.send(code, intent, resolvedType, allowlistToken, null,

                if (allowlistToken != null) {

                    final int callingUid = Binder.getCallingUid();

                    final String packageName;

                    final long token = Binder.clearCallingIdentity();

                    try {

                        packageName = AppGlobals.getPackageManager().getNameForUid(callingUid);

                    } finally {

                        Binder.restoreCallingIdentity(token);

                    }

                    Slog.wtf(TAG, "Send a non-null allowlistToken to a non-PI target."

                            + " Calling package: " + packageName + "; intent: " + intent

                            + "; options: " + options);

                }

                target.send(code, intent, resolvedType, null, null,

                        requiredPermission, options);

            } catch (RemoteException e) {

            }