diff options
| author | 2017-04-03 23:31:56 +0000 | |
|---|---|---|
| committer | 2017-04-03 23:32:00 +0000 | |
| commit | 5fd39fad261fbe7c3fce8403e2de557990f80aaa (patch) | |
| tree | 39ef52cf58cf407af21614804195373afe4dc3c4 | |
| parent | fcfb396f5ec65f0053c67941cd236568236b9758 (diff) | |
| parent | 3cc7cd1c18f5d5b2df0f8aebb22fdb3feb23ecd0 (diff) | |
Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev
| -rw-r--r-- | core/java/android/content/pm/LauncherApps.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/LauncherAppsService.java | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index 912ce3d49ba1..4d767555e3b3 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -419,7 +419,7 @@ public class LauncherApps { */ 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."); } } diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index 0b40fc533b5f..f79f6f40294c 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 @@ 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) - || "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; } |