Snap for 6417465 from ad89080ba2dd7bf789abb8e538a2ac6c8b5adec2 to mainline-release (1a3307e7) · Commits · e / os / android_frameworks_base

Android.bp

+4 −66

Original line number	Diff line number	Diff line
		@@ -273,9 +273,6 @@ filegroup {
		// etc.
		":framework-javastream-protos",
		":statslog-framework-java-gen", // FrameworkStatsLog.java

		// telephony annotations
		":framework-telephony-annotations",
		],
		}

		@@ -942,6 +939,7 @@ filegroup {

		aidl_interface {
		name: "libincremental_aidl",
		unstable: true,
		srcs: [
		":incremental_aidl",
		],
		@@ -960,6 +958,7 @@ aidl_interface {

		aidl_interface {
		name: "libdataloader_aidl",
		unstable: true,
		srcs: [
		":dataloader_aidl",
		],
		@@ -981,6 +980,7 @@ aidl_interface {

		aidl_interface {
		name: "libincremental_manager_aidl",
		unstable: true,
		srcs: [
		":incremental_manager_aidl",
		],
		@@ -1224,62 +1224,6 @@ build = [
		"ApiDocs.bp",
		]

		// TODO(b/147699819): move to frameworks/base/telephony/ folder
		droidstubs {
		name: "framework-telephony-stubs-srcs",
		srcs: [
		":framework-telephony-sources",
		":framework_native_aidl",
		":framework-javastream-protos",
		],
		aidl: {
		local_include_dirs: [
		"core/java",
		"telecomm/java"
		],
		},
		libs: [
		"framework-annotations-lib",
		"android.hardware.radio-V1.5-java",
		],
		check_api: {
		current: {
		// TODO(b/147699819): remove telephony prefix when moved
		api_file: "telephony/api/system-current.txt",
		removed_api_file: "telephony/api/system-removed.txt",
		},
		},
		// TODO: make telephony inherit the shared stubs and remove this
		args: "--show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
		"\\) " +
		"--error UnhiddenSystemApi " +
		"--hide BroadcastBehavior " +
		"--hide DeprecationMismatch " +
		"--hide HiddenSuperclass " +
		"--hide HiddenTypedefConstant " +
		"--hide HiddenTypeParameter " +
		"--hide MissingPermission " +
		"--hide RequiresPermission " +
		"--hide SdkConstant " +
		"--hide Todo " +
		"--hide Typo " +
		"--hide UnavailableSymbol ",
		filter_packages: ["android.telephony"],
		sdk_version: "system_current",
		}

		java_library {
		name: "framework-telephony-stubs",
		srcs: [":framework-telephony-stubs-srcs"],
		// TODO(b/147699819): move public aidls to a separate folder and potentially remove
		// below aidl exports.
		aidl: {
		export_include_dirs: ["telephony/java"],
		},
		sdk_version: "module_current",
		}

		java_library {
		name: "framework-telephony",
		srcs: [
		@@ -1315,12 +1259,6 @@ java_library {
		installable: true,
		}

		filegroup {
		// TODO (b/147690217): move to frameworks/base/telephony/common.
		name: "framework-telephony-annotations",
		srcs: ["telephony/java/android/telephony/Annotation.java"],
		}

		filegroup {
		name: "framework-telephony-jarjar-rules",
		srcs: ["telephony/framework-telephony-jarjar-rules.txt"],

Android.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -36,10 +36,6 @@ include $(CLEAR_VARS)
		# always included.
		INTERNAL_SDK_SOURCE_DIRS := $(addprefix $(LOCAL_PATH)/,$(dirs_to_document))

		$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE))
		$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))
		$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE))

		# sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip.
		# So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to
		# $(OUT_DOCS)/offline-sdk.

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

+43 −24

Original line number	Diff line number	Diff line
		@@ -718,8 +718,6 @@ public final class MediaParser {
		private static final String TS_MODE_SINGLE_PMT = "single_pmt";
		private static final String TS_MODE_MULTI_PMT = "multi_pmt";
		private static final String TS_MODE_HLS = "hls";
		@Nullable
		private static final Constructor<DrmInitData.SchemeInitData> SCHEME_INIT_DATA_CONSTRUCTOR;

		// Instance creation methods.

		@@ -854,6 +852,7 @@ public final class MediaParser {
		private final InputReadingDataReader mExoDataReader;
		private final DataReaderAdapter mScratchDataReaderAdapter;
		private final ParsableByteArrayAdapter mScratchParsableByteArrayAdapter;
		@Nullable private final Constructor<DrmInitData.SchemeInitData> mSchemeInitDataConstructor;
		private String mParserName;
		private Extractor mExtractor;
		private ExtractorInput mExtractorInput;
		@@ -1055,6 +1054,7 @@ public final class MediaParser {
		removePendingSeek();
		mScratchDataReaderAdapter = new DataReaderAdapter();
		mScratchParsableByteArrayAdapter = new ParsableByteArrayAdapter();
		mSchemeInitDataConstructor = getSchemeInitDataConstructor();
		}

		private boolean isPendingSeek() {
		@@ -1196,7 +1196,7 @@ public final class MediaParser {
		}
		}

		private static final class MediaParserDrmInitData extends DrmInitData {
		private final class MediaParserDrmInitData extends DrmInitData {

		private final SchemeInitData[] mSchemeDatas;

		@@ -1229,10 +1229,9 @@ public final class MediaParser {
		return mSchemeDatas.length;
		}

		private static DrmInitData.SchemeInitData toFrameworkSchemeInitData(
		SchemeData exoSchemeData)
		private DrmInitData.SchemeInitData toFrameworkSchemeInitData(SchemeData exoSchemeData)
		throws IllegalAccessException, InvocationTargetException, InstantiationException {
		return SCHEME_INIT_DATA_CONSTRUCTOR.newInstance(
		return mSchemeInitDataConstructor.newInstance(
		exoSchemeData.uuid, exoSchemeData.mimeType, exoSchemeData.data);
		}
		}
		@@ -1413,14 +1412,12 @@ public final class MediaParser {
		setOptionalMediaFormatInt(result, MediaFormat.KEY_HEIGHT, format.height);

		List<byte[]> initData = format.initializationData;
		if (initData != null) {
		for (int i = 0; i < initData.size(); i++) {
		result.setByteBuffer("csd-" + i, ByteBuffer.wrap(initData.get(i)));
		}
		}
		setPcmEncoding(format, result);
		setOptionalMediaFormatString(result, MediaFormat.KEY_LANGUAGE, format.language);
		setOptionalMediaFormatInt(result, MediaFormat.KEY_MAX_INPUT_SIZE, format.maxInputSize);
		setOptionalMediaFormatInt(result, MediaFormat.KEY_PCM_ENCODING, format.pcmEncoding);
		setOptionalMediaFormatInt(result, MediaFormat.KEY_ROTATION, format.rotationDegrees);
		setOptionalMediaFormatInt(result, MediaFormat.KEY_SAMPLE_RATE, format.sampleRate);
		setOptionalMediaFormatInt(
		@@ -1463,6 +1460,27 @@ public final class MediaParser {
		return result;
		}

		private static void setPcmEncoding(Format format, MediaFormat result) {
		int exoPcmEncoding = format.pcmEncoding;
		setOptionalMediaFormatInt(result, "exo-pcm-encoding", format.pcmEncoding);
		int mediaFormatPcmEncoding;
		switch (exoPcmEncoding) {
		case C.ENCODING_PCM_8BIT:
		mediaFormatPcmEncoding = AudioFormat.ENCODING_PCM_8BIT;
		break;
		case C.ENCODING_PCM_16BIT:
		mediaFormatPcmEncoding = AudioFormat.ENCODING_PCM_16BIT;
		break;
		case C.ENCODING_PCM_FLOAT:
		mediaFormatPcmEncoding = AudioFormat.ENCODING_PCM_FLOAT;
		break;
		default:
		// No matching value. Do nothing.
		return;
		}
		result.setInteger(MediaFormat.KEY_PCM_ENCODING, mediaFormatPcmEncoding);
		}

		private static void setOptionalMediaFormatInt(MediaFormat mediaFormat, String key, int value) {
		if (value != Format.NO_VALUE) {
		mediaFormat.setInteger(key, value);
		@@ -1479,7 +1497,7 @@ public final class MediaParser {
		private DrmInitData toFrameworkDrmInitData(
		com.google.android.exoplayer2.drm.DrmInitData exoDrmInitData) {
		try {
		return exoDrmInitData != null && SCHEME_INIT_DATA_CONSTRUCTOR != null
		return exoDrmInitData != null && mSchemeInitDataConstructor != null
		? new MediaParserDrmInitData(exoDrmInitData)
		: null;
		} catch (Throwable e) {
		@@ -1515,6 +1533,19 @@ public final class MediaParser {
		}
		}

		@Nullable
		private static Constructor<DrmInitData.SchemeInitData> getSchemeInitDataConstructor() {
		// TODO: Use constructor statically when available.
		Constructor<DrmInitData.SchemeInitData> constructor;
		try {
		return DrmInitData.SchemeInitData.class.getConstructor(
		UUID.class, String.class, byte[].class);
		} catch (Throwable e) {
		Log.e(TAG, "Unable to get SchemeInitData constructor.");
		return null;
		}
		}

		// Static initialization.

		static {
		@@ -1558,17 +1589,5 @@ public final class MediaParser {
		expectedTypeByParameterName.put(PARAMETER_TS_DETECT_ACCESS_UNITS, Boolean.class);
		expectedTypeByParameterName.put(PARAMETER_TS_ENABLE_HDMV_DTS_AUDIO_STREAMS, Boolean.class);
		EXPECTED_TYPE_BY_PARAMETER_NAME = Collections.unmodifiableMap(expectedTypeByParameterName);

		// TODO: Use constructor statically when available.
		Constructor<DrmInitData.SchemeInitData> constructor;
		try {
		constructor =
		DrmInitData.SchemeInitData.class.getConstructor(
		UUID.class, String.class, byte[].class);
		} catch (Throwable e) {
		Log.e(TAG, "Unable to get SchemeInitData constructor.");
		constructor = null;
		}
		SCHEME_INIT_DATA_CONSTRUCTOR = constructor;
		}
		}

apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,11 @@ public class SdkExtensions {
		if (sdk < VERSION_CODES.R) {
		throw new IllegalArgumentException(String.valueOf(sdk) + " does not have extensions");
		}

		if (sdk == VERSION_CODES.R) {
		return R_EXTENSION_INT;
		}
		return 0;
		}

		}

apex/statsd/aidl/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ filegroup {

		aidl_interface {
		name: "statsd-aidl",
		unstable: true,
		srcs: [
		"android/os/IPendingIntentRef.aidl",
		"android/os/IPullAtomCallback.aidl",