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

Commit c48903b7 authored by Dave Langemak's avatar Dave Langemak Committed by android-build-merger
Browse files

Merge \\"Hide APIs that shouldn\\'t have been public\\" into nyc-mr1-dev am: 8317f930 

am: d34da3b6

Change-Id: I49e9fc1f0f58db9f6200b954b5b639ac263ca8da
parents 084c4d73 d34da3b6

api/current.txt

+0 −5
Original line number Original line Diff line number Diff line
@@ -10068,17 +10068,14 @@ package android.content.pm { 
    method public android.content.ComponentName getActivity();

    method public android.content.ComponentName getActivity();

    method public java.util.Set<java.lang.String> getCategories();

    method public java.util.Set<java.lang.String> getCategories();

    method public java.lang.CharSequence getDisabledMessage();

    method public java.lang.CharSequence getDisabledMessage();

    method public int getDisabledMessageResourceId();

    method public android.os.PersistableBundle getExtras();

    method public android.os.PersistableBundle getExtras();

    method public java.lang.String getId();

    method public java.lang.String getId();

    method public android.content.Intent getIntent();

    method public android.content.Intent getIntent();

    method public long getLastChangedTimestamp();

    method public long getLastChangedTimestamp();

    method public java.lang.CharSequence getLongLabel();

    method public java.lang.CharSequence getLongLabel();

    method public int getLongLabelResourceId();

    method public java.lang.String getPackage();

    method public java.lang.String getPackage();

    method public int getRank();

    method public int getRank();

    method public java.lang.CharSequence getShortLabel();

    method public java.lang.CharSequence getShortLabel();

    method public int getShortLabelResourceId();

    method public android.os.UserHandle getUserHandle();

    method public android.os.UserHandle getUserHandle();

    method public boolean hasKeyFieldsOnly();

    method public boolean hasKeyFieldsOnly();

    method public boolean isDeclaredInManifest();

    method public boolean isDeclaredInManifest();
@@ -10092,7 +10089,6 @@ package android.content.pm { 
  }

  }

















  public static class ShortcutInfo.Builder {







  public static class ShortcutInfo.Builder {











    ctor public deprecated ShortcutInfo.Builder(android.content.Context);














    ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);







    ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);











    method public android.content.pm.ShortcutInfo build();







    method public android.content.pm.ShortcutInfo build();











    method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);







    method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);









@@ -10100,7 +10096,6 @@ package android.content.pm {









    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);







    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);











    method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);







    method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);











    method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);







    method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);











    method public deprecated android.content.pm.ShortcutInfo.Builder setId(java.lang.String);














    method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);







    method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);











    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);







    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);











    method public android.content.pm.ShortcutInfo.Builder setRank(int);







    method public android.content.pm.ShortcutInfo.Builder setRank(int);

























api/system-current.txt



+0
−5




























Original line number
Original line
Diff line number
Diff line








@@ -10493,17 +10493,14 @@ package android.content.pm {









    method public android.content.ComponentName getActivity();







    method public android.content.ComponentName getActivity();











    method public java.util.Set<java.lang.String> getCategories();







    method public java.util.Set<java.lang.String> getCategories();











    method public java.lang.CharSequence getDisabledMessage();







    method public java.lang.CharSequence getDisabledMessage();











    method public int getDisabledMessageResourceId();














    method public android.os.PersistableBundle getExtras();







    method public android.os.PersistableBundle getExtras();











    method public java.lang.String getId();







    method public java.lang.String getId();











    method public android.content.Intent getIntent();







    method public android.content.Intent getIntent();











    method public long getLastChangedTimestamp();







    method public long getLastChangedTimestamp();











    method public java.lang.CharSequence getLongLabel();







    method public java.lang.CharSequence getLongLabel();











    method public int getLongLabelResourceId();














    method public java.lang.String getPackage();







    method public java.lang.String getPackage();











    method public int getRank();







    method public int getRank();











    method public java.lang.CharSequence getShortLabel();







    method public java.lang.CharSequence getShortLabel();











    method public int getShortLabelResourceId();














    method public android.os.UserHandle getUserHandle();







    method public android.os.UserHandle getUserHandle();











    method public boolean hasKeyFieldsOnly();







    method public boolean hasKeyFieldsOnly();











    method public boolean isDeclaredInManifest();







    method public boolean isDeclaredInManifest();









@@ -10517,7 +10514,6 @@ package android.content.pm {









  }







  }



























  public static class ShortcutInfo.Builder {







  public static class ShortcutInfo.Builder {











    ctor public deprecated ShortcutInfo.Builder(android.content.Context);














    ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);







    ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);











    method public android.content.pm.ShortcutInfo build();







    method public android.content.pm.ShortcutInfo build();











    method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);







    method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);









@@ -10525,7 +10521,6 @@ package android.content.pm {









    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);







    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);











    method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);







    method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);











    method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);







    method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);











    method public deprecated android.content.pm.ShortcutInfo.Builder setId(java.lang.String);














    method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);







    method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);











    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);







    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);











    method public android.content.pm.ShortcutInfo.Builder setRank(int);







    method public android.content.pm.ShortcutInfo.Builder setRank(int);

























api/test-current.txt



+0
−5




























Original line number
Original line
Diff line number
Diff line








@@ -10081,17 +10081,14 @@ package android.content.pm {









    method public android.content.ComponentName getActivity();







    method public android.content.ComponentName getActivity();











    method public java.util.Set<java.lang.String> getCategories();







    method public java.util.Set<java.lang.String> getCategories();











    method public java.lang.CharSequence getDisabledMessage();







    method public java.lang.CharSequence getDisabledMessage();











    method public int getDisabledMessageResourceId();














    method public android.os.PersistableBundle getExtras();







    method public android.os.PersistableBundle getExtras();











    method public java.lang.String getId();







    method public java.lang.String getId();











    method public android.content.Intent getIntent();







    method public android.content.Intent getIntent();











    method public long getLastChangedTimestamp();







    method public long getLastChangedTimestamp();











    method public java.lang.CharSequence getLongLabel();







    method public java.lang.CharSequence getLongLabel();











    method public int getLongLabelResourceId();














    method public java.lang.String getPackage();







    method public java.lang.String getPackage();











    method public int getRank();







    method public int getRank();











    method public java.lang.CharSequence getShortLabel();







    method public java.lang.CharSequence getShortLabel();











    method public int getShortLabelResourceId();














    method public android.os.UserHandle getUserHandle();







    method public android.os.UserHandle getUserHandle();











    method public boolean hasKeyFieldsOnly();







    method public boolean hasKeyFieldsOnly();











    method public boolean isDeclaredInManifest();







    method public boolean isDeclaredInManifest();









@@ -10105,7 +10102,6 @@ package android.content.pm {









  }







  }



























  public static class ShortcutInfo.Builder {







  public static class ShortcutInfo.Builder {











    ctor public deprecated ShortcutInfo.Builder(android.content.Context);














    ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);







    ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);











    method public android.content.pm.ShortcutInfo build();







    method public android.content.pm.ShortcutInfo build();











    method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);







    method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);









@@ -10113,7 +10109,6 @@ package android.content.pm {









    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);







    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);











    method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);







    method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);











    method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);







    method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);











    method public deprecated android.content.pm.ShortcutInfo.Builder setId(java.lang.String);














    method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);







    method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);











    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);







    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);











    method public android.content.pm.ShortcutInfo.Builder setRank(int);







    method public android.content.pm.ShortcutInfo.Builder setRank(int);

























core/java/android/content/pm/ShortcutInfo.java



+7
−5




























Original line number
Original line
Diff line number
Diff line








@@ -696,7 +696,8 @@ public final class ShortcutInfo implements Parcelable {









        private PersistableBundle mExtras;







        private PersistableBundle mExtras;































        /**







        /**











         * Old style constructor.  STOPSHIP hide it before launch.







         * Old style constructor.














         * @hide











         */







         */











        @Deprecated







        @Deprecated











        public Builder(Context context) {







        public Builder(Context context) {









@@ -704,7 +705,8 @@ public final class ShortcutInfo implements Parcelable {









        }







        }































        /**







        /**











         * Used with the old style constructor, kept for unit tests. STOPSHIP hide it before launch.







         * Used with the old style constructor, kept for unit tests.














         * @hide











         */







         */











        @NonNull







        @NonNull











        @Deprecated







        @Deprecated










@@ -1004,7 +1006,7 @@ public final class ShortcutInfo implements Parcelable {









        return mTitle;







        return mTitle;











    }







    }































    /** TODO Javadoc */







    /** @hide */











    public int getShortLabelResourceId() {







    public int getShortLabelResourceId() {











        return mTitleResId;







        return mTitleResId;











    }







    }









@@ -1017,7 +1019,7 @@ public final class ShortcutInfo implements Parcelable {









        return mText;







        return mText;











    }







    }































    /** TODO Javadoc */







    /** @hide */











    public int getLongLabelResourceId() {







    public int getLongLabelResourceId() {











        return mTextResId;







        return mTextResId;











    }







    }









@@ -1030,7 +1032,7 @@ public final class ShortcutInfo implements Parcelable {









        return mDisabledMessage;







        return mDisabledMessage;











    }







    }































    /** TODO Javadoc */







    /** @hide */











    public int getDisabledMessageResourceId() {







    public int getDisabledMessageResourceId() {











        return mDisabledMessageResId;







        return mDisabledMessageResId;











    }







    }