Snap for 6431658 from 7fce13eef456b209b4f1d489da3e2cd8eed432b5 to mainline-release (43aae7f6) · Commits · e / os / android_frameworks_base

apex/media/framework/java/android/media/MediaParser.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -856,6 +856,7 @@ public final class MediaParser {
		private String mParserName;
		private Extractor mExtractor;
		private ExtractorInput mExtractorInput;
		private boolean mPendingExtractorInit;
		private long mPendingSeekPosition;
		private long mPendingSeekTimeMicros;
		private boolean mLoggedSchemeInitDataCreationException;
		@@ -972,7 +973,7 @@ public final class MediaParser {
		if (extractor.sniff(mExtractorInput)) {
		mParserName = parserName;
		mExtractor = extractor;
		mExtractor.init(new ExtractorOutputAdapter());
		mPendingExtractorInit = true;
		break;
		}
		} catch (EOFException e) {
		@@ -988,13 +989,17 @@ public final class MediaParser {
		}
		}

		if (mPendingExtractorInit) {
		mExtractor.init(new ExtractorOutputAdapter());
		mPendingExtractorInit = false;
		}
		if (isPendingSeek()) {
		mExtractor.seek(mPendingSeekPosition, mPendingSeekTimeMicros);
		removePendingSeek();
		}

		mPositionHolder.position = seekableInputReader.getPosition();
		int result = 0;
		int result;
		try {
		result = mExtractor.read(mExtractorInput, mPositionHolder);
		} catch (ParserException e) {

apex/sdkextensions/TEST_MAPPING

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		"name": "CtsSdkExtensionsTestCases"
		},
		{
		"name": "apiextensions_e2e_tests"
		"name": "sdkextensions_e2e_tests"
		}
		]
		}

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -4976,7 +4976,9 @@ package android.view.accessibility {
		method public void addAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener, @Nullable android.os.Handler);
		method @NonNull @RequiresPermission("android.permission.MANAGE_ACCESSIBILITY") public java.util.List<java.lang.String> getAccessibilityShortcutTargets(int);
		method @RequiresPermission("android.permission.MANAGE_ACCESSIBILITY") public void performAccessibilityShortcut();
		method @RequiresPermission("android.permission.MANAGE_ACCESSIBILITY") public void registerSystemAction(@NonNull android.app.RemoteAction, int);
		method public void removeAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener);
		method @RequiresPermission("android.permission.MANAGE_ACCESSIBILITY") public void unregisterSystemAction(int);
		}

		public static interface AccessibilityManager.AccessibilityServicesStateChangeListener {

cmds/statsd/src/atoms.proto

+15 −12

Original line number	Diff line number	Diff line
		@@ -668,7 +668,8 @@ message ActivityManagerSleepStateChanged {
		ASLEEP = 1;
		AWAKE = 2;
		}
		optional State state = 1 [(state_field_option).exclusive_state = true];
		optional State state = 1
		[(state_field_option).exclusive_state = true, (state_field_option).nested = false];
		}

		/**
		@@ -1185,7 +1186,8 @@ message BatterySaverModeStateChanged {
		OFF = 0;
		ON = 1;
		}
		optional State state = 1;
		optional State state = 1
		[(state_field_option).exclusive_state = true, (state_field_option).nested = false];
		}

		/**
		@@ -1195,7 +1197,8 @@ message BatterySaverModeStateChanged {
		* frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java
		*/
		message DeviceIdleModeStateChanged {
		optional android.server.DeviceIdleModeEnum state = 1;
		optional android.server.DeviceIdleModeEnum state = 1
		[(state_field_option).exclusive_state = true, (state_field_option).nested = false];
		}


		@@ -1206,7 +1209,8 @@ message DeviceIdleModeStateChanged {
		* frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java
		*/
		message DeviceIdlingModeStateChanged {
		optional android.server.DeviceIdleModeEnum state = 1;
		optional android.server.DeviceIdleModeEnum state = 1
		[(state_field_option).exclusive_state = true, (state_field_option).nested = false];
		}

		/**
		@@ -1250,7 +1254,8 @@ message ChargingStateChanged {
		*/
		message PluggedStateChanged {
		// Whether the device is plugged in, from frameworks/base/core/proto/android/os/enums.proto.
		optional android.os.BatteryPluggedStateEnum state = 1;
		optional android.os.BatteryPluggedStateEnum state = 1
		[(state_field_option).exclusive_state = true, (state_field_option).nested = false];
		}

		/**
		@@ -2714,8 +2719,9 @@ message UsbConnectorStateChanged {
		STATE_DISCONNECTED = 0;
		STATE_CONNECTED = 1;
		}
		optional State state = 1;
		optional string id = 2;
		optional State state = 1
		[(state_field_option).exclusive_state = true, (state_field_option).nested = false];
		optional string id = 2 [(state_field_option).primary_field = true];
		// Last active session in ms.
		// 0 when the port is in connected state.
		optional int64 last_connect_duration_millis = 3;
		@@ -3598,11 +3604,8 @@ message OverlayStateChanged {
		ENTERED = 1;
		EXITED = 2;
		}
		optional State state = 4 [
		(state_field_option).exclusive_state = true,
		(state_field_option).nested = false,
		(state_field_option).default_state_value = 2
		];
		optional State state = 4
		[(state_field_option).exclusive_state = true, (state_field_option).nested = false];
		}

		/**

core/java/android/app/ActivityManagerInternal.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,15 @@ public abstract class ActivityManagerInternal {
		public abstract boolean startIsolatedProcess(String entryPoint, String[] mainArgs,
		String processName, String abiOverride, int uid, Runnable crashHandler);

		/**
		* Called when a user has been deleted. This can happen during normal device usage
		* or just at startup, when partially removed users are purged. Any state persisted by the
		* ActivityManager should be purged now.
		*
		* @param userId The user being cleaned up.
		*/
		public abstract void onUserRemoved(@UserIdInt int userId);

		/**
		* Kill foreground apps from the specified user.
		*/