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

Commit c7609f2e authored by Nan Wu's avatar Nan Wu
Browse files

Add ww logging for add creator token event 

wtf is not appropriate for adding a creator token to an intent
because it is not an error. We simply want some statistics on
how often this happens and which app creats the intent.

Bug: 375396329
Test: statsd_testdrive 967
Flag: EXEMPT metrics
Change-Id: Iabf3d2b0fa0519f9910d69280e03e4d34910df71
parent 2f6d590b

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

+8 −5
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ import static android.provider.Settings.Global.WAIT_FOR_DEBUGGER; 
import static android.util.FeatureFlagUtils.SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS;

import static android.view.Display.INVALID_DISPLAY;













import static com.android.internal.util.FrameworkStatsLog.INTENT_CREATOR_TOKEN_ADDED;















import static com.android.internal.util.FrameworkStatsLog.UNSAFE_INTENT_EVENT_REPORTED__EVENT_TYPE__NEW_MUTABLE_IMPLICIT_PENDING_INTENT_RETRIEVED;















import static com.android.sdksandbox.flags.Flags.sdkSandboxInstrumentationInfo;















import static com.android.server.am.ActiveServices.FGS_SAW_RESTRICTIONS;










@@ -19291,12 +19292,14 @@ public class ActivityManagerService extends IActivityManager.Stub













                            + "} does not correspond to an intent in the extra bundle.");















                    continue;















                }













                Slog.wtf(TAG,













                        "A creator token is added to an intent. creatorPackage: " + creatorPackage













                                + "; intent: " + intent);













                IBinder creatorToken = createIntentCreatorToken(extraIntent, creatorPackage);













                IntentCreatorToken creatorToken = createIntentCreatorToken(extraIntent,













                        creatorPackage);















                if (creatorToken != null) {















                    extraIntent.setCreatorToken(creatorToken);













                    Slog.wtf(TAG, "A creator token is added to an intent. creatorPackage: "













                            + creatorPackage + "; intent: " + intent);













                    FrameworkStatsLog.write(INTENT_CREATOR_TOKEN_ADDED,













                            creatorToken.getCreatorUid());















                }















            } catch (Exception e) {















                Slog.wtf(TAG,









@@ -19307,7 +19310,7 @@ public class ActivityManagerService extends IActivityManager.Stub













        }















    }



























    private IBinder createIntentCreatorToken(Intent intent, String creatorPackage) {













    private IntentCreatorToken createIntentCreatorToken(Intent intent, String creatorPackage) {















        if (IntentCreatorToken.isValid(intent)) return null;















        int creatorUid = getCallingUid();















        IntentCreatorToken.Key key = new IntentCreatorToken.Key(creatorUid, creatorPackage, intent);