Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev (5fd39fad) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.");
		}
		}

+1 −11

Original line number	Diff line number	Diff line
		@@ -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;
		}