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

Merge "Hide unnecessary extra name constants in ClipDescription" into nyc-dev

Browse Source
This commit is contained in:
Vladislav Kaznacheev
2016-04-07 22:21:44 +00:00
committed by Android (Google) Code Review
parent 7233ef22ef 5d196673b8
commit e1efbceeb7
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -7703,8 +7703,6 @@ package android.content {
method public void setExtras(android.os.PersistableBundle); method public void setExtras(android.os.PersistableBundle);
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR; field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR;
field public static final java.lang.String EXTRA_TARGET_COMPONENT_NAME = "android.content.extra.TARGET_COMPONENT_NAME";
field public static final java.lang.String EXTRA_USER_SERIAL_NUMBER = "android.content.extra.USER_SERIAL_NUMBER";
field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html"; field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html";
field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent"; field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";
field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain"; field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain";

2
api/system-current.txt
View File

@@ -8001,8 +8001,6 @@ package android.content {
method public void setExtras(android.os.PersistableBundle); method public void setExtras(android.os.PersistableBundle);
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR; field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR;
field public static final java.lang.String EXTRA_TARGET_COMPONENT_NAME = "android.content.extra.TARGET_COMPONENT_NAME";
field public static final java.lang.String EXTRA_USER_SERIAL_NUMBER = "android.content.extra.USER_SERIAL_NUMBER";
field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html"; field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html";
field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent"; field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";
field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain"; field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain";

2
api/test-current.txt
View File

@@ -7707,8 +7707,6 @@ package android.content {
method public void setExtras(android.os.PersistableBundle); method public void setExtras(android.os.PersistableBundle);
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR; field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR;
field public static final java.lang.String EXTRA_TARGET_COMPONENT_NAME = "android.content.extra.TARGET_COMPONENT_NAME";
field public static final java.lang.String EXTRA_USER_SERIAL_NUMBER = "android.content.extra.USER_SERIAL_NUMBER";
field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html"; field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html";
field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent"; field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";
field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain"; field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain";

2
core/java/android/content/ClipDescription.java
View File

@@ -71,6 +71,7 @@ public class ClipDescription implements Parcelable {
* and {@link ComponentName#flattenToString()} to convert the extra value * and {@link ComponentName#flattenToString()} to convert the extra value
* to/from {@link ComponentName}. * to/from {@link ComponentName}.
* </p> * </p>
* @hide
*/ */
public static final String EXTRA_TARGET_COMPONENT_NAME = public static final String EXTRA_TARGET_COMPONENT_NAME =
"android.content.extra.TARGET_COMPONENT_NAME"; "android.content.extra.TARGET_COMPONENT_NAME";
@@ -81,6 +82,7 @@ public class ClipDescription implements Parcelable {
* <p> * <p>
* Type: long * Type: long
* </p> * </p>
* @hide
*/ */
public static final String EXTRA_USER_SERIAL_NUMBER = public static final String EXTRA_USER_SERIAL_NUMBER =
"android.content.extra.USER_SERIAL_NUMBER"; "android.content.extra.USER_SERIAL_NUMBER";