Merge cherrypicks of [8655472, 8655254, 8655915, 8655916, 8655554, 8655935,... (cee1542b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/UiModeManagerService.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -413,15 +413,15 @@ final class UiModeManagerService extends SystemService {
		try {
		synchronized (mLock) {
		if (mNightMode != mode) {
		if (UserManager.get(getContext()).isPrimaryUser()) {
		SystemProperties.set(SYSTEM_PROPERTY_DEVICE_THEME,
		Integer.toString(mode));
		}

		// Only persist setting if not in car mode
		if (!mCarModeEnabled) {
		Secure.putIntForUser(getContext().getContentResolver(),
		Secure.UI_NIGHT_MODE, mode, user);

		if (UserManager.get(getContext()).isPrimaryUser()) {
		SystemProperties.set(SYSTEM_PROPERTY_DEVICE_THEME,
		Integer.toString(mode));
		}
		}

		mNightMode = mode;

services/core/java/com/android/server/policy/PermissionPolicyService.java

+13 −8

Original line number	Diff line number	Diff line
		@@ -798,7 +798,7 @@ public final class PermissionPolicyService extends SystemService {
		@Override
		public boolean checkStartActivity(@NonNull Intent intent, int callingUid,
		@Nullable String callingPackage) {
		if (callingPackage != null && isActionRemovedForCallingPackage(intent.getAction(),
		if (callingPackage != null && isActionRemovedForCallingPackage(intent, callingUid,
		callingPackage)) {
		Slog.w(LOG_TAG, "Action Removed: starting " + intent.toString() + " from "
		+ callingPackage + " (uid=" + callingUid + ")");
		@@ -811,8 +811,9 @@ public final class PermissionPolicyService extends SystemService {
		* Check if the intent action is removed for the calling package (often based on target SDK
		* version). If the action is removed, we'll silently cancel the activity launch.
		*/
		private boolean isActionRemovedForCallingPackage(@Nullable String action,
		private boolean isActionRemovedForCallingPackage(@NonNull Intent intent, int callingUid,
		@NonNull String callingPackage) {
		String action = intent.getAction();
		if (action == null) {
		return false;
		}
		@@ -821,15 +822,19 @@ public final class PermissionPolicyService extends SystemService {
		case Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT: {
		ApplicationInfo applicationInfo;
		try {
		applicationInfo = getContext().getPackageManager().getApplicationInfo(
		callingPackage, 0);
		applicationInfo = getContext().getPackageManager().getApplicationInfoAsUser(
		callingPackage, 0, UserHandle.getUserId(callingUid));
		if (applicationInfo.targetSdkVersion >= Build.VERSION_CODES.Q) {
		// Applications targeting Q or higher should use
		// RoleManager.createRequestRoleIntent() instead.
		return true;
		}
		} catch (PackageManager.NameNotFoundException e) {
		Slog.i(LOG_TAG, "Cannot find application info for " + callingPackage);
		return false;
		}
		// Applications targeting Q should use RoleManager.createRequestRoleIntent()
		// instead.
		return applicationInfo.targetSdkVersion >= Build.VERSION_CODES.Q;
		// Make sure RequestRoleActivity can know the calling package if we allow it.
		intent.putExtra(Intent.EXTRA_CALLING_PACKAGE, callingPackage);
		return false;
		}
		default:
		return false;