Snap for 7510676 from e63db370e025715d9f93a3afe0b2f2117b49cb61 to sc-d1-release (04193eba) · Commits · e / os / android_frameworks_av

PREUPLOAD.cfg

+2 −0

Original line number	Original line	Diff line number	Diff line
	[Hook Scripts]		[Hook Scripts]
	mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_partial.sh ${REPO_ROOT} ${PREUPLOAD_FILES}		mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_partial.sh ${REPO_ROOT} ${PREUPLOAD_FILES}

			hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

	[Builtin Hooks]		[Builtin Hooks]
	clang_format = true		clang_format = true

+29 −0

Original line number	Original line	Diff line number	Diff line
	@@ -98,6 +98,35 @@ bootclasspath_fragment {
	name: "com.android.media-bootclasspath-fragment",		name: "com.android.media-bootclasspath-fragment",
	contents: ["updatable-media"],		contents: ["updatable-media"],
	apex_available: ["com.android.media"],		apex_available: ["com.android.media"],

			api: {
			stub_libs: [
			// Stubs for the APIs provided by updatable-media. This has to be
			// specified explicitly because updatable-media is not a
			// java_sdk_library.
			"framework-media",
			],
			},

			// The bootclasspath_fragments that provide APIs on which this depends.
			fragments: [
			{
			apex: "com.android.art",
			module: "art-bootclasspath-fragment",
			},
			],

			// Additional stubs libraries that this fragment's contents use which are
			// not provided by another bootclasspath_fragment.
			additional_stubs: [
			"android-non-updatable",
			],

			// Additional hidden API flag files to override the defaults. This must only be
			// modified by the Soong or platform compat team.
			hidden_api: {
			max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
			},
	}		}

	// Encapsulate the contributions made by the com.android.media to the systemserverclasspath.		// Encapsulate the contributions made by the com.android.media to the systemserverclasspath.

0 → 100644

+5 −0

Original line number	Original line	Diff line number	Diff line
			# soong-team@ as the hiddenapi files are tightly coupled with Soong
			file:platform/build/soong:/OWNERS

			# compat-team@ for changes to hiddenapi files
			file:tools/platform-compat:/OWNERS

0 → 100644

+6 −0

Original line number	Original line	Diff line number	Diff line
			Landroid/media/MediaSession2$ControllerInfo;-><init>(Landroid/content/Context;IILjava/lang/String;Landroid/os/IInterface;)V
			Landroid/media/MediaSession2$ControllerInfo;->getPackageName()Ljava/lang/String;
			Landroid/media/MediaSession2$ControllerInfo;->getProvider()Landroid/media/update/MediaSession2Provider$ControllerInfoProvider;
			Landroid/media/MediaSession2$ControllerInfo;->getUid()I
			Landroid/media/MediaSession2$ControllerInfo;->isTrusted()Z
			Landroid/media/MediaSession2$ControllerInfo;->mProvider:Landroid/media/update/MediaSession2Provider$ControllerInfoProvider;

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -289,13 +289,14 @@ c2_status_t C2SoftAacDec::onStop() {
	mOutputDelayRingBufferFilled = 0;		mOutputDelayRingBufferFilled = 0;
	mBuffersInfo.clear();		mBuffersInfo.clear();

	// To make the codec behave the same before and after a reset, we need to invalidate the		status_t status = UNKNOWN_ERROR;
	// streaminfo struct. This does that:		if (mAACDecoder) {
	mStreamInfo->sampleRate = 0; // TODO: mStreamInfo is read only		aacDecoder_Close(mAACDecoder);
			status = initDecoder();
			}
	mSignalledError = false;		mSignalledError = false;

	return C2_OK;		return status == OK ? C2_OK : C2_CORRUPTED;
	}		}

	void C2SoftAacDec::onReset() {		void C2SoftAacDec::onReset() {