Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e13d6076 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Updates based on API council guidance." into oc-dev

am: 3ba71171

Change-Id: I75953e083e10972dcc44c431ff84bf3977e8d442
parents e04b73c9 3ba71171
Loading
Loading
Loading
Loading
+4 −24
Original line number Diff line number Diff line
@@ -3579,7 +3579,6 @@ package android.app {
    method public boolean dispatchTrackballEvent(android.view.MotionEvent);
    method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
    method public deprecated void enterPictureInPictureMode();
    method public deprecated boolean enterPictureInPictureMode(android.app.PictureInPictureArgs);
    method public boolean enterPictureInPictureMode(android.app.PictureInPictureParams);
    method public <T extends android.view.View> T findViewById(int);
    method public void finish();
@@ -3754,7 +3753,6 @@ package android.app {
    method public void setImmersive(boolean);
    method public void setIntent(android.content.Intent);
    method public final void setMediaController(android.media.session.MediaController);
    method public void setPictureInPictureArgs(android.app.PictureInPictureArgs);
    method public void setPictureInPictureParams(android.app.PictureInPictureParams);
    method public final deprecated void setProgress(int);
    method public final deprecated void setProgressBarIndeterminate(boolean);
@@ -3834,7 +3832,6 @@ package android.app {
    method public int getLauncherLargeIconDensity();
    method public int getLauncherLargeIconSize();
    method public int getLockTaskModeState();
    method public static deprecated int getMaxNumPictureInPictureActions();
    method public int getMemoryClass();
    method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo);
    method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo);
@@ -4971,7 +4968,6 @@ package android.app {
  public class KeyguardManager {
    method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
    method public deprecated void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler);
    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
    method public boolean inKeyguardRestrictedInputMode();
    method public boolean isDeviceLocked();
@@ -5120,7 +5116,6 @@ package android.app {
    method public android.app.Notification clone();
    method public int describeContents();
    method public int getBadgeIconType();
    method public java.lang.String getChannel();
    method public java.lang.String getChannelId();
    method public java.lang.String getGroup();
    method public int getGroupAlertBehavior();
@@ -5129,7 +5124,6 @@ package android.app {
    method public java.lang.String getShortcutId();
    method public android.graphics.drawable.Icon getSmallIcon();
    method public java.lang.String getSortKey();
    method public long getTimeout();
    method public long getTimeoutAfter();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;
@@ -5332,7 +5326,6 @@ package android.app {
    method public android.app.Notification.Builder setAutoCancel(boolean);
    method public android.app.Notification.Builder setBadgeIconType(int);
    method public android.app.Notification.Builder setCategory(java.lang.String);
    method public android.app.Notification.Builder setChannel(java.lang.String);
    method public android.app.Notification.Builder setChannelId(java.lang.String);
    method public android.app.Notification.Builder setChronometerCountDown(boolean);
    method public android.app.Notification.Builder setColor(int);
@@ -5377,7 +5370,6 @@ package android.app {
    method public android.app.Notification.Builder setSubText(java.lang.CharSequence);
    method public android.app.Notification.Builder setTicker(java.lang.CharSequence);
    method public deprecated android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews);
    method public android.app.Notification.Builder setTimeout(long);
    method public android.app.Notification.Builder setTimeoutAfter(long);
    method public android.app.Notification.Builder setUsesChronometer(boolean);
    method public deprecated android.app.Notification.Builder setVibrate(long[]);
@@ -5696,21 +5688,10 @@ package android.app {
    method public abstract void onSendFinished(android.app.PendingIntent, android.content.Intent, int, java.lang.String, android.os.Bundle);
  }
  public final deprecated class PictureInPictureArgs extends android.app.PictureInPictureParams {
    ctor public deprecated PictureInPictureArgs();
    ctor public deprecated PictureInPictureArgs(float, java.util.List<android.app.RemoteAction>);
    method public deprecated void setActions(java.util.List<android.app.RemoteAction>);
    method public deprecated void setAspectRatio(float);
    method public deprecated void setSourceRectHint(android.graphics.Rect);
  }
  public class PictureInPictureParams implements android.os.Parcelable {
  public final class PictureInPictureParams implements android.os.Parcelable {
    method public int describeContents();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final android.os.Parcelable.Creator<android.app.PictureInPictureParams> CREATOR;
    field protected android.util.Rational mAspectRatio;
    field protected android.graphics.Rect mSourceRectHint;
    field protected java.util.List<android.app.RemoteAction> mUserActions;
  }
  public static class PictureInPictureParams.Builder {
@@ -31596,7 +31577,7 @@ package android.os {
  public class TestLooperManager {
    method public void execute(android.os.Message);
    method public android.os.MessageQueue getQueue();
    method public android.os.MessageQueue getMessageQueue();
    method public boolean hasMessages(android.os.Handler, java.lang.Object, int);
    method public boolean hasMessages(android.os.Handler, java.lang.Object, java.lang.Runnable);
    method public android.os.Message next();
@@ -37007,7 +36988,7 @@ package android.service.autofill {
  public final class FillRequest implements android.os.Parcelable {
    method public int describeContents();
    method public android.os.Bundle getClientState();
    method public java.util.ArrayList<android.service.autofill.FillContext> getFillContexts();
    method public java.util.List<android.service.autofill.FillContext> getFillContexts();
    method public int getFlags();
    method public int getId();
    method public void writeToParcel(android.os.Parcel, int);
@@ -37989,7 +37970,6 @@ package android.speech.tts {
    method public void onRangeStart(java.lang.String, int, int, int);
    method public abstract void onStart(java.lang.String);
    method public void onStop(java.lang.String, boolean);
    method public deprecated void onUtteranceRangeStart(java.lang.String, int, int);
  }
  public class Voice implements android.os.Parcelable {
@@ -47767,7 +47747,7 @@ package android.view.autofill {
    method public void unregisterCallback(android.view.autofill.AutofillManager.AutofillCallback);
    field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE";
    field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT";
    field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.EXTRA_CLIENT_STATE";
    field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.CLIENT_STATE";
  }
  public static abstract class AutofillManager.AutofillCallback {
+62 −0
Original line number Diff line number Diff line
package android.app {

  public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {
    method public deprecated boolean enterPictureInPictureMode(android.app.PictureInPictureArgs);
    method public deprecated void setPictureInPictureArgs(android.app.PictureInPictureArgs);
  }

  public class ActivityManager {
    method public static deprecated int getMaxNumPictureInPictureActions();
  }

  public class KeyguardManager {
    method public deprecated void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler);
  }

  public class Notification implements android.os.Parcelable {
    method public deprecated java.lang.String getChannel();
    method public deprecated long getTimeout();
    method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);
  }

  public static class Notification.Builder {
    method public deprecated android.app.Notification.Builder setChannel(java.lang.String);
    method public deprecated android.app.Notification.Builder setTimeout(long);
  }

  public static final class Notification.TvExtender implements android.app.Notification.Extender {
    method public deprecated java.lang.String getChannel();
  }

  public final deprecated class PictureInPictureArgs implements android.os.Parcelable {
    method public static android.app.PictureInPictureArgs convert(android.app.PictureInPictureParams);
    method public static android.app.PictureInPictureParams convert(android.app.PictureInPictureArgs);
    method public void copyOnlySet(android.app.PictureInPictureArgs);
    method public java.util.List<android.app.RemoteAction> getActions();
    method public float getAspectRatio();
    method public android.util.Rational getAspectRatioRational();
    method public android.graphics.Rect getSourceRectHint();
    method public android.graphics.Rect getSourceRectHintInsets();
    method public boolean hasSetActions();
    method public boolean hasSetAspectRatio();
    method public boolean hasSourceBoundsHint();
    method public boolean hasSourceBoundsHintInsets();
    method public deprecated void setSourceRectHintInsets(android.graphics.Rect);
    method public void truncateActions(int);
    field public static final android.os.Parcelable.Creator<android.app.PictureInPictureArgs> CREATOR;
  }

  public static class PictureInPictureArgs.Builder {
    ctor public PictureInPictureArgs.Builder();
    method public android.app.PictureInPictureArgs build();
    method public android.app.PictureInPictureArgs.Builder setActions(java.util.List<android.app.RemoteAction>);
    method public android.app.PictureInPictureArgs.Builder setAspectRatio(android.util.Rational);
    method public android.app.PictureInPictureArgs.Builder setSourceRectHint(android.graphics.Rect);
  }

  public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable {
    method public deprecated void showAsNotification(android.content.Context);
  }
@@ -221,6 +271,10 @@ package android.os {
    ctor public RecoverySystem();
  }

  public class TestLooperManager {
    method public deprecated android.os.MessageQueue getQueue();
  }

  public class UserManager {
    method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
    method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
@@ -382,6 +436,14 @@ package android.provider {

}

package android.speech.tts {

  public abstract class UtteranceProgressListener {
    method public deprecated void onUtteranceRangeStart(java.lang.String, int, int);
  }

}

package android.test.mock {

  public deprecated class MockPackageManager extends android.content.pm.PackageManager {
+4 −25
Original line number Diff line number Diff line
@@ -3712,7 +3712,6 @@ package android.app {
    method public boolean dispatchTrackballEvent(android.view.MotionEvent);
    method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
    method public deprecated void enterPictureInPictureMode();
    method public deprecated boolean enterPictureInPictureMode(android.app.PictureInPictureArgs);
    method public boolean enterPictureInPictureMode(android.app.PictureInPictureParams);
    method public <T extends android.view.View> T findViewById(int);
    method public void finish();
@@ -3890,7 +3889,6 @@ package android.app {
    method public void setImmersive(boolean);
    method public void setIntent(android.content.Intent);
    method public final void setMediaController(android.media.session.MediaController);
    method public void setPictureInPictureArgs(android.app.PictureInPictureArgs);
    method public void setPictureInPictureParams(android.app.PictureInPictureParams);
    method public final deprecated void setProgress(int);
    method public final deprecated void setProgressBarIndeterminate(boolean);
@@ -3977,7 +3975,6 @@ package android.app {
    method public int getLauncherLargeIconDensity();
    method public int getLauncherLargeIconSize();
    method public int getLockTaskModeState();
    method public static deprecated int getMaxNumPictureInPictureActions();
    method public int getMemoryClass();
    method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo);
    method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo);
@@ -5153,7 +5150,6 @@ package android.app {
  public class KeyguardManager {
    method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
    method public deprecated void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler);
    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
    method public boolean inKeyguardRestrictedInputMode();
    method public boolean isDeviceLocked();
@@ -5302,7 +5298,6 @@ package android.app {
    method public android.app.Notification clone();
    method public int describeContents();
    method public int getBadgeIconType();
    method public java.lang.String getChannel();
    method public java.lang.String getChannelId();
    method public java.lang.String getGroup();
    method public int getGroupAlertBehavior();
@@ -5312,7 +5307,6 @@ package android.app {
    method public java.lang.String getShortcutId();
    method public android.graphics.drawable.Icon getSmallIcon();
    method public java.lang.String getSortKey();
    method public long getTimeout();
    method public long getTimeoutAfter();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;
@@ -5518,7 +5512,6 @@ package android.app {
    method public android.app.Notification.Builder setAutoCancel(boolean);
    method public android.app.Notification.Builder setBadgeIconType(int);
    method public android.app.Notification.Builder setCategory(java.lang.String);
    method public android.app.Notification.Builder setChannel(java.lang.String);
    method public android.app.Notification.Builder setChannelId(java.lang.String);
    method public android.app.Notification.Builder setChronometerCountDown(boolean);
    method public android.app.Notification.Builder setColor(int);
@@ -5563,7 +5556,6 @@ package android.app {
    method public android.app.Notification.Builder setSubText(java.lang.CharSequence);
    method public android.app.Notification.Builder setTicker(java.lang.CharSequence);
    method public deprecated android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews);
    method public android.app.Notification.Builder setTimeout(long);
    method public android.app.Notification.Builder setTimeoutAfter(long);
    method public android.app.Notification.Builder setUsesChronometer(boolean);
    method public deprecated android.app.Notification.Builder setVibrate(long[]);
@@ -5668,7 +5660,6 @@ package android.app {
    ctor public Notification.TvExtender();
    ctor public Notification.TvExtender(android.app.Notification);
    method public android.app.Notification.Builder extend(android.app.Notification.Builder);
    method public java.lang.String getChannel();
    method public java.lang.String getChannelId();
    method public android.app.PendingIntent getContentIntent();
    method public android.app.PendingIntent getDeleteIntent();
@@ -5903,21 +5894,10 @@ package android.app {
    method public abstract void onSendFinished(android.app.PendingIntent, android.content.Intent, int, java.lang.String, android.os.Bundle);
  }
  public final deprecated class PictureInPictureArgs extends android.app.PictureInPictureParams {
    ctor public deprecated PictureInPictureArgs();
    ctor public deprecated PictureInPictureArgs(float, java.util.List<android.app.RemoteAction>);
    method public deprecated void setActions(java.util.List<android.app.RemoteAction>);
    method public deprecated void setAspectRatio(float);
    method public deprecated void setSourceRectHint(android.graphics.Rect);
  }
  public class PictureInPictureParams implements android.os.Parcelable {
  public final class PictureInPictureParams implements android.os.Parcelable {
    method public int describeContents();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final android.os.Parcelable.Creator<android.app.PictureInPictureParams> CREATOR;
    field protected android.util.Rational mAspectRatio;
    field protected android.graphics.Rect mSourceRectHint;
    field protected java.util.List<android.app.RemoteAction> mUserActions;
  }
  public static class PictureInPictureParams.Builder {
@@ -34422,7 +34402,7 @@ package android.os {
  public class TestLooperManager {
    method public void execute(android.os.Message);
    method public android.os.MessageQueue getQueue();
    method public android.os.MessageQueue getMessageQueue();
    method public boolean hasMessages(android.os.Handler, java.lang.Object, int);
    method public boolean hasMessages(android.os.Handler, java.lang.Object, java.lang.Runnable);
    method public android.os.Message next();
@@ -40131,7 +40111,7 @@ package android.service.autofill {
  public final class FillRequest implements android.os.Parcelable {
    method public int describeContents();
    method public android.os.Bundle getClientState();
    method public java.util.ArrayList<android.service.autofill.FillContext> getFillContexts();
    method public java.util.List<android.service.autofill.FillContext> getFillContexts();
    method public int getFlags();
    method public int getId();
    method public void writeToParcel(android.os.Parcel, int);
@@ -41256,7 +41236,6 @@ package android.speech.tts {
    method public void onRangeStart(java.lang.String, int, int, int);
    method public abstract void onStart(java.lang.String);
    method public void onStop(java.lang.String, boolean);
    method public deprecated void onUtteranceRangeStart(java.lang.String, int, int);
  }
  public class Voice implements android.os.Parcelable {
@@ -51364,7 +51343,7 @@ package android.view.autofill {
    method public void unregisterCallback(android.view.autofill.AutofillManager.AutofillCallback);
    field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE";
    field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT";
    field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.EXTRA_CLIENT_STATE";
    field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.CLIENT_STATE";
  }
  public static abstract class AutofillManager.AutofillCallback {
+62 −0
Original line number Diff line number Diff line
package android.app {

  public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {
    method public deprecated boolean enterPictureInPictureMode(android.app.PictureInPictureArgs);
    method public deprecated void setPictureInPictureArgs(android.app.PictureInPictureArgs);
  }

  public class ActivityManager {
    method public static deprecated int getMaxNumPictureInPictureActions();
  }

  public class KeyguardManager {
    method public deprecated void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler);
  }

  public class Notification implements android.os.Parcelable {
    method public deprecated java.lang.String getChannel();
    method public deprecated long getTimeout();
    method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);
  }

  public static class Notification.Builder {
    method public deprecated android.app.Notification.Builder setChannel(java.lang.String);
    method public deprecated android.app.Notification.Builder setTimeout(long);
  }

  public static final class Notification.TvExtender implements android.app.Notification.Extender {
    method public deprecated java.lang.String getChannel();
  }

  public final deprecated class PictureInPictureArgs implements android.os.Parcelable {
    method public static android.app.PictureInPictureArgs convert(android.app.PictureInPictureParams);
    method public static android.app.PictureInPictureParams convert(android.app.PictureInPictureArgs);
    method public void copyOnlySet(android.app.PictureInPictureArgs);
    method public java.util.List<android.app.RemoteAction> getActions();
    method public float getAspectRatio();
    method public android.util.Rational getAspectRatioRational();
    method public android.graphics.Rect getSourceRectHint();
    method public android.graphics.Rect getSourceRectHintInsets();
    method public boolean hasSetActions();
    method public boolean hasSetAspectRatio();
    method public boolean hasSourceBoundsHint();
    method public boolean hasSourceBoundsHintInsets();
    method public deprecated void setSourceRectHintInsets(android.graphics.Rect);
    method public void truncateActions(int);
    field public static final android.os.Parcelable.Creator<android.app.PictureInPictureArgs> CREATOR;
  }

  public static class PictureInPictureArgs.Builder {
    ctor public PictureInPictureArgs.Builder();
    method public android.app.PictureInPictureArgs build();
    method public android.app.PictureInPictureArgs.Builder setActions(java.util.List<android.app.RemoteAction>);
    method public android.app.PictureInPictureArgs.Builder setAspectRatio(android.util.Rational);
    method public android.app.PictureInPictureArgs.Builder setSourceRectHint(android.graphics.Rect);
  }

  public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable {
    method public deprecated void showAsNotification(android.content.Context);
  }
@@ -215,6 +265,10 @@ package android.os {
    ctor public RecoverySystem();
  }

  public class TestLooperManager {
    method public deprecated android.os.MessageQueue getQueue();
  }

  public class UserManager {
    method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
    method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
@@ -376,6 +430,14 @@ package android.provider {

}

package android.speech.tts {

  public abstract class UtteranceProgressListener {
    method public deprecated void onUtteranceRangeStart(java.lang.String, int, int);
  }

}

package android.test.mock {

  public deprecated class MockPackageManager extends android.content.pm.PackageManager {
+4 −24

File changed.

Preview size limit exceeded, changes collapsed.

Loading