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

Commit 02c811c0 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Update system APIs based on feedback." into udc-dev

parents 255503b5 01e2824e

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -11157,6 +11157,7 @@ package android.content { 
    method public final String getDataScheme(int);

    method public final android.os.PatternMatcher getDataSchemeSpecificPart(int);

    method public final String getDataType(int);

    method @NonNull public final android.os.PersistableBundle getExtras();

    method public final int getPriority();

    method public final boolean hasAction(String);

    method public final boolean hasCategory(String);
@@ -11175,6 +11176,7 @@ package android.content { 
    method public void readFromXml(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method public final java.util.Iterator<android.os.PatternMatcher> schemeSpecificPartsIterator();

    method public final java.util.Iterator<java.lang.String> schemesIterator();

    method public final void setExtras(@NonNull android.os.PersistableBundle);

    method public final void setPriority(int);

    method public final java.util.Iterator<java.lang.String> typesIterator();

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

core/api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -3581,9 +3581,7 @@ package android.content { 
  }















  public class IntentFilter implements android.os.Parcelable {













    method @NonNull public final android.os.PersistableBundle getExtras();















    method public final int getOrder();













    method public final void setExtras(@NonNull android.os.PersistableBundle);















    method public final void setOrder(int);















  }







































core/java/android/content/IntentFilter.java



+1
−6






























Original line number
Diff line number
Diff line








@@ -2204,9 +2204,7 @@ public class IntentFilter implements Parcelable {













     * <p> Subsequent calls to this method  will override any previously set extras.















     *















     * @param extras The intent extras to match against.













     * @hide















     */













    @SystemApi















    public final void setExtras(@NonNull PersistableBundle extras) {















        mExtras = extras;















    }









@@ -2216,11 +2214,8 @@ public class IntentFilter implements Parcelable {













     *















     * @return the extras that were previously set using {@link #setExtras(PersistableBundle)} or















     *         an empty {@link PersistableBundle} object if no extras were set.













     * @hide















     */













    @SystemApi













    @NonNull













    public final PersistableBundle getExtras() {













    public final @NonNull PersistableBundle getExtras() {















        return mExtras == null ? new PersistableBundle() : mExtras;















    }