Snap for 6349563 from 366b79483cc59e01723e782ce103d94db7feda72 to mainline-release (61344e7b) · Commits · e / os / android_frameworks_base

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

+8 −5

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.annotation.CheckResult;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.StringDef;
		import android.media.MediaCodec.CryptoInfo;
		import android.net.Uri;
		import android.text.TextUtils;
		import android.util.Pair;
		@@ -386,7 +387,7 @@ public final class MediaParser {
		/**
		* Called once all the data of a sample has been passed to {@link #onSampleDataFound}.
		*
		* <p>Also includes sample metadata, like presentation timestamp and flags.
		* <p>Includes sample metadata, like presentation timestamp and flags.
		*
		* @param trackIndex The index of the track to which the sample corresponds.
		* @param timeMicros The media timestamp associated with the sample, in microseconds.
		@@ -396,8 +397,10 @@ public final class MediaParser {
		* @param offset The number of bytes that have been consumed by {@code
		* onSampleDataFound(int, MediaParser.InputReader)} for the specified track, since the
		* last byte belonging to the sample whose metadata is being passed.
		* @param cryptoData Encryption data required to decrypt the sample. May be null for
		* unencrypted samples.
		* @param cryptoInfo Encryption data required to decrypt the sample. May be null for
		* unencrypted samples. MediaParser may reuse {@link CryptoInfo} instances to avoid
		* allocations, so implementations of this method must not write to or keep reference to
		* the fields of this parameter.
		*/
		void onSampleCompleted(
		int trackIndex,
		@@ -405,7 +408,7 @@ public final class MediaParser {
		int flags,
		int size,
		int offset,
		@Nullable MediaCodec.CryptoInfo cryptoData);
		@Nullable CryptoInfo cryptoInfo);
		}

		/**
		@@ -1404,7 +1407,7 @@ public final class MediaParser {
		return null;
		}

		private static MediaCodec.CryptoInfo toCryptoInfo(TrackOutput.CryptoData encryptionData) {
		private static CryptoInfo toCryptoInfo(TrackOutput.CryptoData encryptionData) {
		// TODO: Implement.
		return null;
		}

api/current.txt

+41 −43

Original line number	Diff line number	Diff line
		@@ -5666,8 +5666,6 @@ package android.app {
		public static final class Notification.BubbleMetadata implements android.os.Parcelable {
		method public int describeContents();
		method public boolean getAutoExpandBubble();
		method @Deprecated @Nullable public android.graphics.drawable.Icon getBubbleIcon();
		method @Deprecated @Nullable public android.app.PendingIntent getBubbleIntent();
		method @Nullable public android.app.PendingIntent getDeleteIntent();
		method @Dimension(unit=android.annotation.Dimension.DP) public int getDesiredHeight();
		method @DimenRes public int getDesiredHeightResId();
		@@ -5684,8 +5682,6 @@ package android.app {
		ctor public Notification.BubbleMetadata.Builder(@NonNull String);
		ctor public Notification.BubbleMetadata.Builder(@NonNull android.app.PendingIntent, @NonNull android.graphics.drawable.Icon);
		method @NonNull public android.app.Notification.BubbleMetadata build();
		method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder createIntentBubble(@NonNull android.app.PendingIntent, @NonNull android.graphics.drawable.Icon);
		method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder createShortcutBubble(@NonNull String);
		method @NonNull public android.app.Notification.BubbleMetadata.Builder setAutoExpandBubble(boolean);
		method @NonNull public android.app.Notification.BubbleMetadata.Builder setDeleteIntent(@Nullable android.app.PendingIntent);
		method @NonNull public android.app.Notification.BubbleMetadata.Builder setDesiredHeight(@Dimension(unit=android.annotation.Dimension.DP) int);
		@@ -13389,6 +13385,7 @@ package android.database.sqlite {
		method public void disableWriteAheadLogging();
		method public boolean enableWriteAheadLogging();
		method public void endTransaction();
		method public void execPerConnectionSQL(@NonNull String, @Nullable Object[]) throws android.database.SQLException;
		method public void execSQL(String) throws android.database.SQLException;
		method public void execSQL(String, Object[]) throws android.database.SQLException;
		method public static String findEditTable(String);
		@@ -43134,9 +43131,9 @@ package android.service.autofill {
		}

		public final class InlinePresentation implements android.os.Parcelable {
		ctor public InlinePresentation(@NonNull android.app.slice.Slice, @NonNull android.view.inline.InlinePresentationSpec, boolean);
		ctor public InlinePresentation(@NonNull android.app.slice.Slice, @NonNull android.widget.inline.InlinePresentationSpec, boolean);
		method public int describeContents();
		method @NonNull public android.view.inline.InlinePresentationSpec getInlinePresentationSpec();
		method @NonNull public android.widget.inline.InlinePresentationSpec getInlinePresentationSpec();
		method @NonNull public android.app.slice.Slice getSlice();
		method public boolean isPinned();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		@@ -56778,38 +56775,6 @@ package android.view.contentcapture {

		}

		package android.view.inline {

		public class InlineContentView extends android.view.ViewGroup {
		method @Nullable public android.view.SurfaceControl getSurfaceControl();
		method public boolean isZOrderedOnTop();
		method public void onLayout(boolean, int, int, int, int);
		method public void setSurfaceControlCallback(@Nullable android.view.inline.InlineContentView.SurfaceControlCallback);
		method public boolean setZOrderedOnTop(boolean);
		}

		public static interface InlineContentView.SurfaceControlCallback {
		method public void onCreated(@NonNull android.view.SurfaceControl);
		method public void onDestroyed(@NonNull android.view.SurfaceControl);
		}

		public final class InlinePresentationSpec implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.util.Size getMaxSize();
		method @NonNull public android.util.Size getMinSize();
		method @Nullable public android.os.Bundle getStyle();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inline.InlinePresentationSpec> CREATOR;
		}

		public static final class InlinePresentationSpec.Builder {
		ctor public InlinePresentationSpec.Builder(@NonNull android.util.Size, @NonNull android.util.Size);
		method @NonNull public android.view.inline.InlinePresentationSpec build();
		method @NonNull public android.view.inline.InlinePresentationSpec.Builder setStyle(@NonNull android.os.Bundle);
		}

		}

		package android.view.inputmethod {

		public class BaseInputConnection implements android.view.inputmethod.InputConnection {
		@@ -56981,7 +56946,7 @@ package android.view.inputmethod {
		public final class InlineSuggestion implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.view.inputmethod.InlineSuggestionInfo getInfo();
		method public void inflate(@NonNull android.content.Context, @NonNull android.util.Size, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.view.inline.InlineContentView>);
		method public void inflate(@NonNull android.content.Context, @NonNull android.util.Size, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.widget.inline.InlineContentView>);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InlineSuggestion> CREATOR;
		}
		@@ -56989,7 +56954,7 @@ package android.view.inputmethod {
		public final class InlineSuggestionInfo implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public String[] getAutofillHints();
		method @NonNull public android.view.inline.InlinePresentationSpec getPresentationSpec();
		method @NonNull public android.widget.inline.InlinePresentationSpec getInlinePresentationSpec();
		method @NonNull public String getSource();
		method @NonNull public String getType();
		method public boolean isPinned();
		@@ -57005,8 +56970,8 @@ package android.view.inputmethod {
		method public int describeContents();
		method @Nullable public android.os.Bundle getExtras();
		method @NonNull public String getHostPackageName();
		method @NonNull public java.util.List<android.widget.inline.InlinePresentationSpec> getInlinePresentationSpecs();
		method public int getMaxSuggestionCount();
		method @NonNull public java.util.List<android.view.inline.InlinePresentationSpec> getPresentationSpecs();
		method @NonNull public android.os.LocaleList getSupportedLocales();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InlineSuggestionsRequest> CREATOR;
		@@ -57014,10 +56979,11 @@ package android.view.inputmethod {
		}

		public static final class InlineSuggestionsRequest.Builder {
		ctor public InlineSuggestionsRequest.Builder(@NonNull java.util.List<android.view.inline.InlinePresentationSpec>);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder addPresentationSpecs(@NonNull android.view.inline.InlinePresentationSpec);
		ctor public InlineSuggestionsRequest.Builder(@NonNull java.util.List<android.widget.inline.InlinePresentationSpec>);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder addInlinePresentationSpecs(@NonNull android.widget.inline.InlinePresentationSpec);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest build();
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setExtras(@NonNull android.os.Bundle);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setInlinePresentationSpecs(@NonNull java.util.List<android.widget.inline.InlinePresentationSpec>);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setMaxSuggestionCount(int);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setSupportedLocales(@NonNull android.os.LocaleList);
		}
		@@ -61611,6 +61577,38 @@ package android.widget {

		}

		package android.widget.inline {

		public class InlineContentView extends android.view.ViewGroup {
		method @Nullable public android.view.SurfaceControl getSurfaceControl();
		method public boolean isZOrderedOnTop();
		method public void onLayout(boolean, int, int, int, int);
		method public void setSurfaceControlCallback(@Nullable android.widget.inline.InlineContentView.SurfaceControlCallback);
		method public boolean setZOrderedOnTop(boolean);
		}

		public static interface InlineContentView.SurfaceControlCallback {
		method public void onCreated(@NonNull android.view.SurfaceControl);
		method public void onDestroyed(@NonNull android.view.SurfaceControl);
		}

		public final class InlinePresentationSpec implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.util.Size getMaxSize();
		method @NonNull public android.util.Size getMinSize();
		method @Nullable public android.os.Bundle getStyle();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.widget.inline.InlinePresentationSpec> CREATOR;
		}

		public static final class InlinePresentationSpec.Builder {
		ctor public InlinePresentationSpec.Builder(@NonNull android.util.Size, @NonNull android.util.Size);
		method @NonNull public android.widget.inline.InlinePresentationSpec build();
		method @NonNull public android.widget.inline.InlinePresentationSpec.Builder setStyle(@NonNull android.os.Bundle);
		}

		}

		package dalvik.annotation {

		@Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface TestTarget {

api/removed.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,16 @@ package android.app {
		method @Deprecated public void setLatestEventInfo(android.content.Context, CharSequence, CharSequence, android.app.PendingIntent);
		}

		public static final class Notification.BubbleMetadata implements android.os.Parcelable {
		method @Deprecated @Nullable public android.graphics.drawable.Icon getBubbleIcon();
		method @Deprecated @Nullable public android.app.PendingIntent getBubbleIntent();
		}

		public static final class Notification.BubbleMetadata.Builder {
		method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder createIntentBubble(@NonNull android.app.PendingIntent, @NonNull android.graphics.drawable.Icon);
		method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder createShortcutBubble(@NonNull String);
		}

		public static class Notification.Builder {
		method @Deprecated public android.app.Notification.Builder setChannel(String);
		method @Deprecated public android.app.Notification.Builder setTimeout(long);

api/system-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -10883,8 +10883,6 @@ package android.telephony {
		method @Deprecated @NonNull public String getDataConnectionApn();
		method @Deprecated public int getDataConnectionApnTypeBitMask();
		method @Deprecated public int getDataConnectionFailCause();
		method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();
		method @Deprecated public int getDataConnectionNetworkType();
		method @Deprecated public int getDataConnectionState();
		}

api/system-removed.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,11 @@ package android.telecom {

		package android.telephony {

		public final class PreciseDataConnectionState implements android.os.Parcelable {
		method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();
		method @Deprecated public int getDataConnectionNetworkType();
		}

		public class TelephonyManager {
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();
		method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();