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

Commit 29b04374 authored by Nan Wu's avatar Nan Wu Committed by Android (Google) Code Review
Browse files

Merge "Log to detect usage of whitelistToken when sending non-PI target" into main

parents 09ca88f9 3ced332a

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

+13 −0
Original line number Diff line number Diff line
@@ -5446,6 +5446,19 @@ public class ActivityManagerService extends IActivityManager.Stub 
                intent = new Intent(Intent.ACTION_MAIN);

            }

            try {

                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, allowlistToken, null,

                        requiredPermission, options);

            } catch (RemoteException e) {