summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-03-15 22:13:23 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-03-15 22:13:26 +0000
commit1176f7b2b097a25db3b0150e92e60b446a9952c9 (patch)
treee9dc1208f9f1826af3c7f56f955439cf4fa0bfda
parentda42f4aaa9d2b23bc11d02ab11f78b0b68e8f9c7 (diff)
parentf68b2661d367ed68de1fdf470491b11d18f6958e (diff)
Merge "More whitelisting"
-rw-r--r--services/core/java/com/android/server/pm/LauncherAppsService.java5
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);