commit d6da0d25cbe8d246dff6ecf6198f3420706a6bb1
author Makoto Onuki <omakoto@google.com> Mon Apr 03 23:38:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 03 23:38:55 2017 +0000
tree b9f5c0e0415443e25fa4809550729b0b9111a4fd
parent 7c700a3d78a82b05b8f9d91c2d251e545e414007
parent 5fd39fad261fbe7c3fce8403e2de557990f80aaa

Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev
am: 5fd39fad26

Change-Id: I5b81cd880d505d8525a6210525c2b9c0c09b57a0

core/java/android/content/pm/LauncherApps.java

diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java
index 912ce3d..4d76755 100644
--- a/core/java/android/content/pm/LauncherApps.java
+++ b/core/java/android/content/pm/LauncherApps.java
@@ -419,7 +419,7 @@
      */
     private void logErrorForInvalidProfileAccess(@NonNull UserHandle target) {
         if (UserHandle.myUserId() != target.getIdentifier() && mUserManager.isManagedProfile()) {
-            Log.e(TAG, "Accessing other profiles/users from managed profile is no longer allowed.");
+            Log.w(TAG, "Accessing other profiles/users from managed profile is no longer allowed.");
         }
     }
 

services/core/java/com/android/server/pm/LauncherAppsService.java

diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index 0b40fc5..f79f6f4 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -242,18 +242,8 @@
             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)
-                            || "com.google.android.googlequicksearchbox".equals(callingPackage)
-                            ) {
-                        return false;
-                    }
-                    // STOPSHIP Change it to 'e'.
-                    Slog.wtfStack(TAG, message + " by " + callingPackage + " for another profile "
+                    Slog.w(TAG, message + " by " + callingPackage + " for another profile "
                             + targetUserId + " from " + callingUserId);
-
                     return false;
                 }