Snap for 9325773 from f1be4f072aa580da60f91402d1829abdae3fe05d to tm-qpr2-release (570b88b1) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import static com.android.internal.annotations.VisibleForTesting.Visibility.PACK
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.RemoteServiceException.BadForegroundServiceNotificationException;
		import android.app.RemoteServiceException.CannotDeliverBroadcastException;
		import android.app.RemoteServiceException.CannotPostForegroundServiceNotificationException;
		import android.app.RemoteServiceException.CrashedByAdbException;
		import android.app.RemoteServiceException.ForegroundServiceDidNotStartInTimeException;
		@@ -1975,9 +1974,6 @@ public final class ActivityThread extends ClientTransactionHandler
		case ForegroundServiceDidNotStartInTimeException.TYPE_ID:
		throw generateForegroundServiceDidNotStartInTimeException(message, extras);

		case CannotDeliverBroadcastException.TYPE_ID:
		throw new CannotDeliverBroadcastException(message);

		case CannotPostForegroundServiceNotificationException.TYPE_ID:
		throw new CannotPostForegroundServiceNotificationException(message);

core/java/android/app/ApplicationExitInfo.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -407,6 +407,15 @@ public final class ApplicationExitInfo implements Parcelable {
		*/
		public static final int SUBREASON_PACKAGE_UPDATE = 25;

		/**
		* The process was killed because of undelivered broadcasts; this would be set only when the
		* reason is {@link #REASON_OTHER}.
		*
		* For internal use only.
		* @hide
		*/
		public static final int SUBREASON_UNDELIVERED_BROADCAST = 26;

		// If there is any OEM code which involves additional app kill reasons, it should
		// be categorized in {@link #REASON_OTHER}, with subreason code starting from 1000.

		@@ -579,6 +588,7 @@ public final class ApplicationExitInfo implements Parcelable {
		SUBREASON_STOP_APP,
		SUBREASON_KILL_BACKGROUND,
		SUBREASON_PACKAGE_UPDATE,
		SUBREASON_UNDELIVERED_BROADCAST,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface SubReason {}
		@@ -1283,6 +1293,8 @@ public final class ApplicationExitInfo implements Parcelable {
		return "KILL BACKGROUND";
		case SUBREASON_PACKAGE_UPDATE:
		return "PACKAGE UPDATE";
		case SUBREASON_UNDELIVERED_BROADCAST:
		return "UNDELIVERED BROADCAST";
		default:
		return "UNKNOWN";
		}

core/java/android/app/RemoteServiceException.java

+4 −19

Original line number	Diff line number	Diff line
		@@ -70,21 +70,6 @@ public class RemoteServiceException extends AndroidRuntimeException {
		}
		}

		/**
		* Exception used to crash an app process when the system received a RemoteException
		* while delivering a broadcast to an app process.
		*
		* @hide
		*/
		public static class CannotDeliverBroadcastException extends RemoteServiceException {
		/** The type ID passed to {@link IApplicationThread#scheduleCrash}. */
		public static final int TYPE_ID = 2;

		public CannotDeliverBroadcastException(String msg) {
		super(msg);
		}
		}

		/**
		* Exception used to crash an app process when the system received a RemoteException
		* while posting a notification of a foreground service.
		@@ -94,7 +79,7 @@ public class RemoteServiceException extends AndroidRuntimeException {
		public static class CannotPostForegroundServiceNotificationException
		extends RemoteServiceException {
		/** The type ID passed to {@link IApplicationThread#scheduleCrash}. */
		public static final int TYPE_ID = 3;
		public static final int TYPE_ID = 2;

		public CannotPostForegroundServiceNotificationException(String msg) {
		super(msg);
		@@ -109,7 +94,7 @@ public class RemoteServiceException extends AndroidRuntimeException {
		*/
		public static class BadForegroundServiceNotificationException extends RemoteServiceException {
		/** The type ID passed to {@link IApplicationThread#scheduleCrash}. */
		public static final int TYPE_ID = 4;
		public static final int TYPE_ID = 3;

		public BadForegroundServiceNotificationException(String msg) {
		super(msg);
		@@ -125,7 +110,7 @@ public class RemoteServiceException extends AndroidRuntimeException {
		public static class MissingRequestPasswordComplexityPermissionException
		extends RemoteServiceException {
		/** The type ID passed to {@link IApplicationThread#scheduleCrash}. */
		public static final int TYPE_ID = 5;
		public static final int TYPE_ID = 4;

		public MissingRequestPasswordComplexityPermissionException(String msg) {
		super(msg);
		@@ -139,7 +124,7 @@ public class RemoteServiceException extends AndroidRuntimeException {
		*/
		public static class CrashedByAdbException extends RemoteServiceException {
		/** The type ID passed to {@link IApplicationThread#scheduleCrash}. */
		public static final int TYPE_ID = 6;
		public static final int TYPE_ID = 5;

		public CrashedByAdbException(String msg) {
		super(msg);

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

+204 −154

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/hardware/camera2/CaptureResult.java

+380 −380

File changed.

Preview size limit exceeded, changes collapsed.