diff options
| author | 2017-03-15 12:24:21 -0700 | |
|---|---|---|
| committer | 2017-03-15 12:24:21 -0700 | |
| commit | f68b2661d367ed68de1fdf470491b11d18f6958e (patch) | |
| tree | dd3ab930ced31aca414f1347fdc5c93ad6d212aa | |
| parent | 402a384ac83338b5ec4c04dde3c9ba969de51c0f (diff) | |
More whitelisting
Bug 34973771
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Change-Id: I77c7001b31a963dfabe8036647a2e51ede6a759f
| -rw-r--r-- | services/core/java/com/android/server/pm/LauncherAppsService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index 71bfa648bd5f..e1426fdcf3ef 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -245,9 +245,12 @@ public class LauncherAppsService extends SystemService { // STOPSHIP Remove the whitelist. if ("com.google.android.talk".equals(callingPackage) - || "com.google.android.quicksearchbox".equals(callingPackage)) { + || "com.google.android.quicksearchbox".equals(callingPackage) + || "com.google.android.googlequicksearchbox".equals(callingPackage) + ) { return false; } + // STOPSHIP Change it to 'e'. Slog.wtfStack(TAG, message + " by " + callingPackage + " for another profile " + targetUserId + " from " + callingUserId); |