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

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

Merge "Change ClipData.addItem signature" into oc-dev am: 5b26dac2 

am: bd3fa3c7

Change-Id: I475d9eca8667005959c5578548b622ed7460b2b0
parents 329b258c bd3fa3c7

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8445,7 +8445,7 @@ package android.content { 
    ctor public ClipData(android.content.ClipDescription, android.content.ClipData.Item);

    ctor public ClipData(android.content.ClipData);

    method public void addItem(android.content.ClipData.Item);

    method public void addItem(android.content.ClipData.Item, android.content.ContentResolver);

    method public void addItem(android.content.ContentResolver, android.content.ClipData.Item);

    method public int describeContents();

    method public android.content.ClipDescription getDescription();

    method public android.content.ClipData.Item getItemAt(int);

api/removed.txt

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ package android.app.usage { 


package android.content {



  public class ClipData implements android.os.Parcelable {

    method public deprecated void addItem(android.content.ClipData.Item, android.content.ContentResolver);

  }



  public abstract class Context {

    method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public abstract java.io.File getSharedPreferencesPath(java.lang.String);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8946,7 +8946,7 @@ package android.content { 
    ctor public ClipData(android.content.ClipDescription, android.content.ClipData.Item);

    ctor public ClipData(android.content.ClipData);

    method public void addItem(android.content.ClipData.Item);

    method public void addItem(android.content.ClipData.Item, android.content.ContentResolver);

    method public void addItem(android.content.ContentResolver, android.content.ClipData.Item);

    method public int describeContents();

    method public android.content.ClipDescription getDescription();

    method public android.content.ClipData.Item getItemAt(int);

api/system-removed.txt

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ package android.app.usage { 


package android.content {



  public class ClipData implements android.os.Parcelable {

    method public deprecated void addItem(android.content.ClipData.Item, android.content.ContentResolver);

  }



  public abstract class Context {

    method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public abstract java.io.File getSharedPreferencesPath(java.lang.String);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8476,7 +8476,7 @@ package android.content { 
    ctor public ClipData(android.content.ClipDescription, android.content.ClipData.Item);

    ctor public ClipData(android.content.ClipData);

    method public void addItem(android.content.ClipData.Item);

    method public void addItem(android.content.ClipData.Item, android.content.ContentResolver);

    method public void addItem(android.content.ContentResolver, android.content.ClipData.Item);

    method public int describeContents();

    method public android.content.ClipDescription getDescription();

    method public android.content.ClipData.Item getItemAt(int);