diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-06-23 23:48:38 +0000 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2021-06-23 21:36:25 -0700 |
| commit | 4c3d4ac80fe9f0fb4fbb4fcffcd2ba3f4e6fca6c (patch) | |
| tree | b694ee7c10ad78d944edccb1836b2e500cc9cf78 /data | |
| parent | 30de082df40adce4137ff0e9cc24f2dfc16401d5 (diff) | |
| parent | 4d8fc3bed423eccc15f2b32f534be35018c91f8a (diff) | |
Merge SP1A.210618.002
Change-Id: I72d03812a8377fc014aebad8db4e68eeded2d531
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/car/com.android.car.cluster.home.xml | 1 | ||||
| -rw-r--r-- | data/etc/services.core.protolog.json | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/data/etc/car/com.android.car.cluster.home.xml b/data/etc/car/com.android.car.cluster.home.xml index e1d2b18d7167..a3d0fcffc813 100644 --- a/data/etc/car/com.android.car.cluster.home.xml +++ b/data/etc/car/com.android.car.cluster.home.xml @@ -18,5 +18,6 @@ <privapp-permissions package="com.android.car.cluster.home"> <permission name="android.permission.INTERACT_ACROSS_USERS"/> <permission name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"/> + <permission name="android.car.permission.CAR_MONITOR_INPUT"/> </privapp-permissions> </permissions> diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index 3c9086dde021..ac5e2d0fcacb 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -961,6 +961,12 @@ "group": "WM_DEBUG_APP_TRANSITIONS", "at": "com\/android\/server\/wm\/AppTransitionController.java" }, + "-1003678883": { + "message": "Cleaning splash screen token=%s", + "level": "VERBOSE", + "group": "WM_DEBUG_STARTING_WINDOW", + "at": "com\/android\/server\/wm\/ActivityRecord.java" + }, "-1003060523": { "message": "Finish needs to pause: %s", "level": "VERBOSE", |