resolve merge conflicts of 2382108d012e2200e7ed04668542ab15ca7be6b4 to stage-aosp-master (10d816c4) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+0 −449

File changed.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-vendor-list.txt

+0 −14

Original line number	Diff line number	Diff line
		@@ -41,20 +41,6 @@ Landroid/location/ILocationManager;->getNetworkProviderPackage()Ljava/lang/Strin
		Landroid/location/ILocationManager;->reportLocation(Landroid/location/Location;Z)V
		Landroid/location/INetInitiatedListener$Stub;-><init>()V
		Landroid/location/INetInitiatedListener;->sendNiResponse(II)Z
		Landroid/media/AudioManager;->registerAudioPortUpdateListener(Landroid/media/AudioManager$OnAudioPortUpdateListener;)V
		Landroid/media/AudioManager;->unregisterAudioPortUpdateListener(Landroid/media/AudioManager$OnAudioPortUpdateListener;)V
		Landroid/media/AudioSystem;->checkAudioFlinger()I
		Landroid/media/AudioSystem;->getForceUse(I)I
		Landroid/media/AudioSystem;->getParameters(Ljava/lang/String;)Ljava/lang/String;
		Landroid/media/AudioSystem;->setForceUse(II)I
		Landroid/media/AudioSystem;->setParameters(Ljava/lang/String;)I
		Landroid/media/MediaDrm$Certificate;->getContent()[B
		Landroid/media/MediaDrm$Certificate;->getWrappedPrivateKey()[B
		Landroid/media/MediaDrm$CertificateRequest;->getData()[B
		Landroid/media/MediaDrm$CertificateRequest;->getDefaultUrl()Ljava/lang/String;
		Landroid/media/MediaDrm;->getCertificateRequest(ILjava/lang/String;)Landroid/media/MediaDrm$CertificateRequest;
		Landroid/media/MediaDrm;->provideCertificateResponse([B)Landroid/media/MediaDrm$Certificate;
		Landroid/media/MediaDrm;->signRSA([BLjava/lang/String;[B[B)[B
		Landroid/media/tv/ITvRemoteProvider$Stub;-><init>()V
		Landroid/media/tv/ITvRemoteServiceInput;->clearInputBridge(Landroid/os/IBinder;)V
		Landroid/media/tv/ITvRemoteServiceInput;->closeInputBridge(Landroid/os/IBinder;)V

media/java/android/media/AmrInputStream.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import java.io.InputStream;
		import java.io.IOException;
		import java.nio.ByteBuffer;

		import android.annotation.UnsupportedAppUsage;
		import android.media.MediaCodec.BufferInfo;
		import android.util.Log;

		@@ -53,6 +54,7 @@ public final class AmrInputStream extends InputStream {
		/**
		* DO NOT USE - use MediaCodec instead
		*/
		@UnsupportedAppUsage
		public AmrInputStream(InputStream inputStream) {
		Log.w(TAG, "@@@@ AmrInputStream is not a public API @@@@");
		mInputStream = inputStream;

media/java/android/media/AsyncPlayer.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.media;

		import android.annotation.NonNull;
		import android.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.media.PlayerBase;
		import android.net.Uri;
		@@ -248,6 +249,7 @@ public class AsyncPlayer {
		*
		* @hide
		*/
		@UnsupportedAppUsage
		public void setUsesWakeLock(Context context) {
		if (mWakeLock != null \|\| mThread != null) {
		// if either of these has happened, we've already played something.

media/java/android/media/AudioAttributes.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.media;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.UnsupportedAppUsage;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -372,11 +373,16 @@ public final class AudioAttributes implements Parcelable {
		private final static int FLAG_ALL_PUBLIC = FLAG_AUDIBILITY_ENFORCED \|
		FLAG_HW_AV_SYNC \| FLAG_LOW_LATENCY;

		@UnsupportedAppUsage
		private int mUsage = USAGE_UNKNOWN;
		@UnsupportedAppUsage
		private int mContentType = CONTENT_TYPE_UNKNOWN;
		@UnsupportedAppUsage
		private int mSource = MediaRecorder.AudioSource.AUDIO_SOURCE_INVALID;
		@UnsupportedAppUsage
		private int mFlags = 0x0;
		private HashSet<String> mTags;
		@UnsupportedAppUsage
		private String mFormattedTags;
		private Bundle mBundle; // lazy-initialized, may be null

		@@ -646,6 +652,7 @@ public final class AudioAttributes implements Parcelable {
		* @param tag
		* @return the same Builder instance.
		*/
		@UnsupportedAppUsage
		public Builder addTag(String tag) {
		mTags.add(tag);
		return this;
		@@ -675,6 +682,7 @@ public final class AudioAttributes implements Parcelable {
		* @param streamType
		* @return the same Builder instance.
		*/
		@UnsupportedAppUsage
		public Builder setInternalLegacyStreamType(int streamType) {
		switch(streamType) {
		case AudioSystem.STREAM_VOICE_CALL:
		@@ -1016,6 +1024,7 @@ public final class AudioAttributes implements Parcelable {
		* @param aa non-null AudioAttributes.
		* @return a valid stream type for volume control that matches the attributes.
		*/
		@UnsupportedAppUsage
		public static int toLegacyStreamType(@NonNull AudioAttributes aa) {
		return toVolumeStreamType(false /fromGetVolumeControlStream/, aa);
		}