Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change ClipData.addItem signature" into oc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2017-04-28 17:53:09 +00:00
committed by Android (Google) Code Review
parent 7188fda4af c35c02f1ea
commit 5b26dac2c3
7 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -8424,7 +8424,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);

4
api/removed.txt
View File

@@ -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);

2
api/system-current.txt
View File

@@ -8924,7 +8924,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);

4
api/system-removed.txt
View File

@@ -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);

2
api/test-current.txt
View File

@@ -8455,7 +8455,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);

4
api/test-removed.txt
View File

@@ -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);

12
core/java/android/content/ClipData.java
View File

@@ -846,7 +846,7 @@ public class ClipData implements Parcelable {
* Add a new Item to the overall ClipData container.
* <p> This method will <em>not</em> update the list of available MIME types in the
* {@link ClipDescription}. It should be used only when adding items which do not add new
* MIME types to this clip. If this is not the case, use {@link #addItem(Item, ContentResolver)}
* MIME types to this clip. If this is not the case, use {@link #addItem(ContentResolver, Item)}
* or call {@link #ClipData(CharSequence, String[], Item)} with a complete list of MIME types.
* @param item Item to be added.
*/
@@ -857,15 +857,21 @@ public class ClipData implements Parcelable {
mItems.add(item);
}
/** @removed use #addItem(ContentResolver, Item) instead */
@Deprecated
public void addItem(Item item, ContentResolver resolver) {
addItem(resolver, item);
}
/**
* Add a new Item to the overall ClipData container.
* <p> Unlike {@link #addItem(Item)}, this method will update the list of available MIME types
* in the {@link ClipDescription}.
* @param item Item to be added.
* @param resolver ContentResolver used to get information about the URI possibly contained in
* the item.
* @param item Item to be added.
*/
public void addItem(Item item, ContentResolver resolver) {
public void addItem(ContentResolver resolver, Item item) {
addItem(item);
if (item.getHtmlText() != null) {