Merge "Temporarily whitelist apps known to hit the wtf case"

2017-02-23 18:33:13 +00:00
parent ba9e399ffd 18280782bc
commit 112a5b62d8
1 changed files with 6 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -242,6 +242,12 @@ public class LauncherAppsService extends SystemService {
            try {
                UserInfo callingUserInfo = mUm.getUserInfo(callingUserId);
                if (callingUserInfo.isManagedProfile()) {
+
+                    // STOPSHIP Remove the whitelist.
+                    if ("com.google.android.talk".equals(callingPackage)
+                            || "com.google.android.quicksearchbox".equals(callingPackage)) {
+                        return false;
+                    }
                    Slog.wtfStack(TAG, message + " by " + callingPackage + " for another profile "
                            + targetUserId + " from " + callingUserId);