Snap for 7992035 from 559dbb9079c13b3b479e7aa042a193685184998a to sc-v2-release (1105cc98) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraCharacteristics.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -2632,7 +2632,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* </tbody>
		* </table>
		* <p>For applications targeting SDK version 31 or newer, if the mobile device declares to be
		* {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS media performance class} S,
		* media performance class 12 or higher by setting
		* {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* the primary camera devices (first rear/front camera in the camera ID list) will not
		* support JPEG sizes smaller than 1080p. If the application configures a JPEG stream
		* smaller than 1080p, the camera device will round up the JPEG image size to at least
		@@ -2705,9 +2706,11 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* </tbody>
		* </table>
		* <p>For applications targeting SDK version 31 or newer, if the mobile device doesn't declare
		* to be media performance class S, or if the camera device isn't a primary rear/front
		* camera, the minimum required output stream configurations are the same as for applications
		* targeting SDK version older than 31.</p>
		* to be media performance class 12 or better by setting
		* {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* or if the camera device isn't a primary rear/front camera, the minimum required output
		* stream configurations are the same as for applications targeting SDK version older than
		* 31.</p>
		* <p>Refer to {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} for additional
		* mandatory stream configurations on a per-capability basis.</p>
		* <p>Exception on 176x144 (QCIF) resolution: camera devices usually have a fixed capability for

core/java/android/os/AppZygote.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ public class AppZygote {
		// Last UID/GID of the range the AppZygote can setuid()/setgid() to
		private final int mZygoteUidGidMax;

		private final int mZygoteRuntimeFlags;

		private final Object mLock = new Object();

		/**
		@@ -56,11 +58,13 @@ public class AppZygote {

		private final ApplicationInfo mAppInfo;

		public AppZygote(ApplicationInfo appInfo, int zygoteUid, int uidGidMin, int uidGidMax) {
		public AppZygote(ApplicationInfo appInfo, int zygoteUid, int uidGidMin, int uidGidMax,
		int runtimeFlags) {
		mAppInfo = appInfo;
		mZygoteUid = zygoteUid;
		mZygoteUidGidMin = uidGidMin;
		mZygoteUidGidMax = uidGidMax;
		mZygoteRuntimeFlags = runtimeFlags;
		}

		/**
		@@ -110,7 +114,7 @@ public class AppZygote {
		mZygoteUid,
		mZygoteUid,
		null, // gids
		0, // runtimeFlags
		mZygoteRuntimeFlags, // runtimeFlags
		"app_zygote", // seInfo
		abi, // abi
		abi, // acceptedAbiList

data/etc/platform.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,7 @@
		<assign-permission name="android.permission.WATCH_APPOPS" uid="cameraserver" />
		<assign-permission name="android.permission.MANAGE_APP_OPS_MODES" uid="cameraserver" />
		<assign-permission name="android.permission.OBSERVE_SENSOR_PRIVACY" uid="cameraserver" />
		<assign-permission name="android.permission.REAL_GET_TASKS" uid="cameraserver" />

		<assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="graphics" />

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,7 @@ public class PhonePipMenuController implements PipMenuController {
		mSystemWindows.addView(mPipMenuView,
		getPipMenuLayoutParams(MENU_WINDOW_TITLE, 0 /* width /, 0 / height */),
		0, SHELL_ROOT_LAYER_PIP);
		setShellRootAccessibilityWindow();
		}

		private void detachPipMenuView() {
		@@ -546,6 +547,10 @@ public class PhonePipMenuController implements PipMenuController {
		mListeners.forEach(l -> l.onPipMenuStateChangeFinish(menuState));
		}
		mMenuState = menuState;
		setShellRootAccessibilityWindow();
		}

		private void setShellRootAccessibilityWindow() {
		switch (mMenuState) {
		case MENU_STATE_NONE:
		mSystemWindows.setShellRootAccessibilityWindow(0, SHELL_ROOT_LAYER_PIP, null);

packages/SystemUI/res/layout/auth_biometric_contents.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,9 @@
		android:accessibilityLiveRegion="polite"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:marqueeRepeatLimit="marquee_forever"
		android:scrollHorizontally="true"
		android:fadingEdge="horizontal"
		android:textColor="@color/biometric_dialog_gray"/>

		<LinearLayout