Merge cherrypicks of ['googleplex-android-review.googlesource.com/27954536',... (c1353ff4) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -73,14 +73,14 @@ constructor(
		AccessibilityNodeInfoCompat.ACTION_CLICK,
		resources.getString(R.string.accessibility_enter_hint)
		)

		override fun onInitializeAccessibilityNodeInfo(
		v: View,
		info: AccessibilityNodeInfo
		) {
		super.onInitializeAccessibilityNodeInfo(v, info)
		when (accessibilityHintType) {
		AccessibilityHintType.BOUNCER ->
		info.addAction(accessibilityBouncerHint)
		AccessibilityHintType.BOUNCER -> info.addAction(accessibilityBouncerHint)
		AccessibilityHintType.ENTER -> info.addAction(accessibilityEnterHint)
		AccessibilityHintType.NONE -> return
		}
		@@ -204,12 +204,12 @@ constructor(
		/* reversible */ false,
		)

		// LockscreenFingerprint <=> LockscreenLocked
		// LockscreenFingerprint => LockscreenLocked
		animatedIconDrawable.addTransition(
		R.id.locked_fp,
		R.id.locked,
		context.getDrawable(R.drawable.fp_to_locked) as AnimatedVectorDrawable,
		/* reversible */ true,
		/* reversible */ false,
		)

		// LockscreenUnlocked <=> AodLocked

+1 −1

Original line number	Diff line number	Diff line
		@@ -1603,7 +1603,7 @@ public class SystemConfig {
		} else {
		mPackageToSharedUidAllowList.put(pkgName, sharedUid);
		}
		}
		} break;
		case "asl-file": {
		String packageName = parser.getAttributeValue(null, "package");
		String path = parser.getAttributeValue(null, "path");

+2 −1

Original line number	Diff line number	Diff line
		@@ -2790,8 +2790,9 @@ public class AppOpsService extends IAppOpsService.Stub {
		* have information on them.
		*/
		private static boolean isOpAllowedForUid(int uid) {
		int appId = UserHandle.getAppId(uid);
		return Flags.runtimePermissionAppopsMappingEnabled()
		&& (uid == Process.ROOT_UID \|\| uid == Process.SYSTEM_UID);
		&& (appId == Process.ROOT_UID \|\| appId == Process.SYSTEM_UID);
		}

		@Override