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

Commit ea9226bb authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Add additional overriding methods to signature files" into main am: 35863731 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2744915



Change-Id: I597c3ee935c418857a34784d3f0e145c7f5e037c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af9495df 35863731

core/api/current.txt

+33 −11
Original line number Diff line number Diff line 
// Signature format: 2.0

// - add-additional-overrides=no

// - migrating=Migration in progress see b/299366704

package android {















  public final class Manifest {










@@ -5677,6 +5675,7 @@ package android.app {













    ctor @Deprecated public FragmentBreadCrumbs(android.content.Context, android.util.AttributeSet);















    ctor @Deprecated public FragmentBreadCrumbs(android.content.Context, android.util.AttributeSet, int);















    method @Deprecated public void onBackStackChanged();













    method @Deprecated protected void onLayout(boolean, int, int, int, int);















    method @Deprecated public void setActivity(android.app.Activity);















    method @Deprecated public void setMaxVisible(int);















    method @Deprecated public void setOnBreadCrumbClickListener(android.app.FragmentBreadCrumbs.OnBreadCrumbClickListener);










@@ -13542,6 +13541,7 @@ package android.content.res {



























  public interface XmlResourceParser extends org.xmlpull.v1.XmlPullParser android.util.AttributeSet java.lang.AutoCloseable {















    method public void close();













    method public String getAttributeNamespace(int);















  }





























}










@@ -20227,7 +20227,7 @@ package android.inputmethodservice {













    method @Deprecated public boolean isPreviewEnabled();















    method @Deprecated public boolean isProximityCorrectionEnabled();















    method @Deprecated public boolean isShifted();













    method public void onClick(android.view.View);













    method @Deprecated public void onClick(android.view.View);















    method @Deprecated public void onDetachedFromWindow();















    method @Deprecated public void onDraw(android.graphics.Canvas);















    method @Deprecated protected boolean onLongPress(android.inputmethodservice.Keyboard.Key);










@@ -24759,7 +24759,7 @@ package android.media {



























  @Deprecated public class RemoteControlClient.MetadataEditor extends android.media.MediaMetadataEditor {















    method @Deprecated public void apply();













    method public Object clone() throws java.lang.CloneNotSupportedException;













    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;















    method @Deprecated public android.media.RemoteControlClient.MetadataEditor putBitmap(int, android.graphics.Bitmap) throws java.lang.IllegalArgumentException;















    method @Deprecated public android.media.RemoteControlClient.MetadataEditor putLong(int, long) throws java.lang.IllegalArgumentException;















    method @Deprecated public android.media.RemoteControlClient.MetadataEditor putObject(int, Object) throws java.lang.IllegalArgumentException;










@@ -27613,6 +27613,7 @@ package android.media.tv {













    method @NonNull public java.util.List<android.media.AudioPresentation> getAudioPresentations();















    method public String getSelectedTrack(int);















    method public java.util.List<android.media.tv.TvTrackInfo> getTracks(int);













    method protected void onLayout(boolean, int, int, int, int);















    method public boolean onUnhandledInputEvent(android.view.InputEvent);















    method public void overrideTvAppAttributionSource(@NonNull android.content.AttributionSource);















    method public void reset();










@@ -44040,7 +44041,6 @@ package android.telephony {













    method public int getLongitude();















    method public int getNetworkId();















    method public int getSystemId();













    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityCdma> CREATOR;















  }























@@ -44056,7 +44056,6 @@ package android.telephony {













    method @Nullable public String getMncString();















    method @Nullable public String getMobileNetworkOperator();















    method @Deprecated public int getPsc();













    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityGsm> CREATOR;















  }























@@ -44074,7 +44073,6 @@ package android.telephony {













    method @Nullable public String getMobileNetworkOperator();















    method public int getPci();















    method public int getTac();













    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityLte> CREATOR;















  }























@@ -44087,7 +44085,6 @@ package android.telephony {













    method @IntRange(from=0, to=3279165) public int getNrarfcn();















    method @IntRange(from=0, to=1007) public int getPci();















    method @IntRange(from=0, to=16777215) public int getTac();













    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityNr> CREATOR;















  }























@@ -44101,7 +44098,6 @@ package android.telephony {













    method @Nullable public String getMncString();















    method @Nullable public String getMobileNetworkOperator();















    method public int getUarfcn();













    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityTdscdma> CREATOR;















  }























@@ -44117,7 +44113,6 @@ package android.telephony {













    method @Nullable public String getMobileNetworkOperator();















    method public int getPsc();















    method public int getUarfcn();













    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityWcdma> CREATOR;















  }
























@@ -44201,6 +44196,7 @@ package android.telephony {



























  public final class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {















    method public int describeContents();













    method public boolean equals(Object);















    method public int getAsuLevel();















    method public int getCdmaDbm();















    method public int getCdmaEcio();









@@ -44211,24 +44207,28 @@ package android.telephony {













    method public int getEvdoLevel();















    method public int getEvdoSnr();















    method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public int getLevel();













    method public int hashCode();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthCdma> CREATOR;















  }





























  public final class CellSignalStrengthGsm extends android.telephony.CellSignalStrength implements android.os.Parcelable {















    method public int describeContents();













    method public boolean equals(Object);















    method public int getAsuLevel();















    method public int getBitErrorRate();















    method public int getDbm();















    method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public int getLevel();















    method public int getRssi();















    method public int getTimingAdvance();













    method public int hashCode();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthGsm> CREATOR;















  }





























  public final class CellSignalStrengthLte extends android.telephony.CellSignalStrength implements android.os.Parcelable {















    method public int describeContents();













    method public boolean equals(Object);















    method public int getAsuLevel();















    method @IntRange(from=0, to=15) public int getCqi();















    method @IntRange(from=1, to=6) public int getCqiTableIndex();









@@ -44239,12 +44239,14 @@ package android.telephony {













    method public int getRssi();















    method public int getRssnr();















    method public int getTimingAdvance();













    method public int hashCode();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthLte> CREATOR;















  }





























  public final class CellSignalStrengthNr extends android.telephony.CellSignalStrength implements android.os.Parcelable {















    method public int describeContents();













    method public boolean equals(Object);















    method public int getAsuLevel();















    method @IntRange(from=0, to=15) @NonNull public java.util.List<java.lang.Integer> getCsiCqiReport();















    method @IntRange(from=1, to=3) public int getCsiCqiTableIndex();









@@ -44257,26 +44259,31 @@ package android.telephony {













    method public int getSsRsrq();















    method public int getSsSinr();















    method @IntRange(from=0, to=1282) public int getTimingAdvanceMicros();













    method public int hashCode();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthNr> CREATOR;















  }





























  public final class CellSignalStrengthTdscdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {















    method public int describeContents();













    method public boolean equals(Object);















    method public int getAsuLevel();















    method public int getDbm();















    method @IntRange(from=0, to=4) public int getLevel();















    method public int getRscp();













    method public int hashCode();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthTdscdma> CREATOR;















  }





























  public final class CellSignalStrengthWcdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {















    method public int describeContents();













    method public boolean equals(Object);















    method public int getAsuLevel();















    method public int getDbm();















    method public int getEcNo();















    method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public int getLevel();













    method public int hashCode();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthWcdma> CREATOR;















  }










@@ -47056,6 +47063,7 @@ package android.text {













    method @Deprecated public int length();















    method @Deprecated public static android.text.AlteredCharSequence make(CharSequence, char[], int, int);















    method @Deprecated public CharSequence subSequence(int, int);













    method @Deprecated public String toString();















  }





























  @Deprecated public class AndroidCharacter {










@@ -47469,6 +47477,7 @@ package android.text {













    method public void removeSpan(Object);















    method public void setSpan(Object, int, int, int);















    method public CharSequence subSequence(int, int);













    method public String toString();















  }





























  public static final class PrecomputedText.Params {










@@ -47598,6 +47607,7 @@ package android.text {













    method public void setFilters(android.text.InputFilter[]);















    method public void setSpan(Object, int, int, int);















    method public CharSequence subSequence(int, int);













    method public String toString();















    method public static android.text.SpannableStringBuilder valueOf(CharSequence);















  }
























@@ -49224,7 +49234,9 @@ package android.util {













    method public boolean containsValue(Object);















    method public void ensureCapacity(int);















    method public java.util.Set<java.util.Map.Entry<K,V>> entrySet();













    method public boolean equals(@Nullable Object);















    method public V get(Object);













    method public int hashCode();















    method public int indexOfKey(Object);















    method public int indexOfValue(Object);















    method public boolean isEmpty();










@@ -49256,7 +49268,9 @@ package android.util {













    method public boolean contains(Object);















    method public boolean containsAll(java.util.Collection<?>);















    method public void ensureCapacity(int);













    method public boolean equals(@Nullable Object);















    method public void forEach(java.util.function.Consumer<? super E>);













    method public int hashCode();















    method public int indexOf(Object);















    method public boolean isEmpty();















    method public java.util.Iterator<E> iterator();










@@ -57952,6 +57966,7 @@ package android.widget {













    ctor @Deprecated public AbsoluteLayout(android.content.Context, android.util.AttributeSet);















    ctor @Deprecated public AbsoluteLayout(android.content.Context, android.util.AttributeSet, int);















    ctor @Deprecated public AbsoluteLayout(android.content.Context, android.util.AttributeSet, int, int);













    method @Deprecated protected void onLayout(boolean, int, int, int, int);















  }





























  @Deprecated public static class AbsoluteLayout.LayoutParams extends android.view.ViewGroup.LayoutParams {










@@ -58030,6 +58045,7 @@ package android.widget {













    method public long getSelectedItemId();















    method public int getSelectedItemPosition();















    method public abstract android.view.View getSelectedView();













    method protected void onLayout(boolean, int, int, int, int);















    method public boolean performItemClick(android.view.View, int, long);















    method public abstract void setAdapter(T);















    method public void setEmptyView(android.view.View);










@@ -58676,6 +58692,7 @@ package android.widget {













    method public android.widget.FrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet);















    method @Deprecated public boolean getConsiderGoneChildrenWhenMeasuring();















    method public boolean getMeasureAllChildren();













    method protected void onLayout(boolean, int, int, int, int);















    method public void setMeasureAllChildren(boolean);















  }
























@@ -58729,6 +58746,7 @@ package android.widget {













    method public boolean getUseDefaultMargins();















    method public boolean isColumnOrderPreserved();















    method public boolean isRowOrderPreserved();













    method protected void onLayout(boolean, int, int, int, int);















    method public void setAlignmentMode(int);















    method public void setColumnCount(int);















    method public void setColumnOrderPreserved(boolean);










@@ -58951,6 +58969,7 @@ package android.widget {













    method public float getWeightSum();















    method public boolean isBaselineAligned();















    method public boolean isMeasureWithLargestChildEnabled();













    method protected void onLayout(boolean, int, int, int, int);















    method public void setBaselineAligned(boolean);















    method public void setBaselineAlignedChildIndex(int);















    method public void setDividerDrawable(android.graphics.drawable.Drawable);










@@ -59499,6 +59518,7 @@ package android.widget {













    method public android.widget.RelativeLayout.LayoutParams generateLayoutParams(android.util.AttributeSet);















    method public int getGravity();















    method public int getIgnoreGravity();













    method protected void onLayout(boolean, int, int, int, int);















    method public void setGravity(int);















    method public void setHorizontalGravity(int);















    method public void setIgnoreGravity(int);










@@ -59953,6 +59973,7 @@ package android.widget {













    method @Deprecated public boolean isMoving();















    method @Deprecated public boolean isOpened();















    method @Deprecated public void lock();













    method @Deprecated protected void onLayout(boolean, int, int, int, int);















    method @Deprecated public void open();















    method @Deprecated public void setOnDrawerCloseListener(android.widget.SlidingDrawer.OnDrawerCloseListener);















    method @Deprecated public void setOnDrawerOpenListener(android.widget.SlidingDrawer.OnDrawerOpenListener);










@@ -60597,6 +60618,7 @@ package android.widget {













    method public boolean hideOverflowMenu();















    method public void inflateMenu(@MenuRes int);















    method public boolean isOverflowMenuShowing();













    method protected void onLayout(boolean, int, int, int, int);















    method public void setCollapseContentDescription(@StringRes int);















    method public void setCollapseContentDescription(@Nullable CharSequence);















    method public void setCollapseIcon(@DrawableRes int);










@@ -60751,7 +60773,7 @@ package android.widget {













    method @Deprecated public android.view.View getZoomControls();















    method @Deprecated public boolean isAutoDismissed();















    method @Deprecated public boolean isVisible();













    method public boolean onTouch(android.view.View, android.view.MotionEvent);













    method @Deprecated public boolean onTouch(android.view.View, android.view.MotionEvent);















    method @Deprecated public void setAutoDismissed(boolean);















    method @Deprecated public void setFocusable(boolean);















    method @Deprecated public void setOnZoomListener(android.widget.ZoomButtonsController.OnZoomListener);

























core/api/module-lib-current.txt



+0
−2




























Original line number
Diff line number
Diff line















// Signature format: 2.0













// - add-additional-overrides=no













// - migrating=Migration in progress see b/299366704















package android {































  public static final class Manifest.permission {

































core/api/module-lib-removed.txt



+0
−2




























Original line number
Diff line number
Diff line















// Signature format: 2.0












// - add-additional-overrides=no













// - migrating=Migration in progress see b/299366704
























core/api/removed.txt



+0
−2




























Original line number
Diff line number
Diff line















// Signature format: 2.0













// - add-additional-overrides=no













// - migrating=Migration in progress see b/299366704















package android.app {































  public class Notification implements android.os.Parcelable {

































core/api/system-current.txt



+44
−2


























File changed.
Preview size limit exceeded, changes collapsed.