Snap for 7612197 from a633284efe0b205c6d83a62e11bde0e28bd408eb to sc-release (a9fef455) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -5654,8 +5654,8 @@ public final class ActivityThread extends ClientTransactionHandler
		*/
		private void scheduleRelaunchActivityIfPossible(@NonNull ActivityClientRecord r,
		boolean preserveWindow) {
		if (r.activity.mFinished \|\| r.token instanceof Binder) {
		// Do not schedule relaunch if the activity is finishing or not a local object (e.g.
		if ((r.activity != null && r.activity.mFinished) \|\| r.token instanceof Binder) {
		// Do not schedule relaunch if the activity is finishing or is a local object (e.g.
		// created by ActivtiyGroup that server side doesn't recognize it).
		return;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ public final class CameraExtensionUtils {
		ImageWriter writer = null;
		Image img = null;
		SurfaceInfo surfaceInfo = new SurfaceInfo();
		int nativeFormat = SurfaceUtils.getSurfaceFormat(s);
		int nativeFormat = SurfaceUtils.detectSurfaceFormat(s);
		int dataspace = SurfaceUtils.getSurfaceDataspace(s);
		Size surfaceSize = SurfaceUtils.getSurfaceSize(s);
		surfaceInfo.mFormat = nativeFormat;

+17 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,23 @@ public class SurfaceUtils {
		return surfaceType;
		}

		/**
		* Detect and retrieve the Surface format without any
		* additional overrides.
		*
		* @param surface The surface to be queried for format.
		* @return format of the surface.
		*
		* @throws IllegalArgumentException if the surface is already abandoned.
		*/
		public static int detectSurfaceFormat(Surface surface) {
		checkNotNull(surface);
		int surfaceType = nativeDetectSurfaceType(surface);
		if (surfaceType == BAD_VALUE) throw new IllegalArgumentException("Surface was abandoned");

		return surfaceType;
		}

		/**
		* Get the Surface dataspace.
		*

+2 −0

Original line number	Diff line number	Diff line
		@@ -550,6 +550,8 @@
		<protected-broadcast android:name="com.android.server.telecom.intent.action.CALLS_ADD_ENTRY" />
		<protected-broadcast android:name="com.android.settings.location.MODE_CHANGING" />
		<protected-broadcast android:name="com.android.settings.bluetooth.ACTION_DISMISS_PAIRING" />
		<protected-broadcast android:name="com.android.settings.network.DELETE_SUBSCRIPTION" />
		<protected-broadcast android:name="com.android.settings.network.SWITCH_TO_SUBSCRIPTION" />
		<protected-broadcast android:name="com.android.settings.wifi.action.NETWORK_REQUEST" />

		<protected-broadcast android:name="NotificationManagerService.TIMEOUT" />

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		android:layout_width="wrap_content"
		android:layout_gravity="center"
		android:padding="0dp"
		android:background="@null"
		android:contentDescription="@string/splash_screen_view_icon_description"/>

		<View android:id="@+id/splashscreen_branding_view"