summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-05-16 21:19:28 -0700
committerColin Cross <ccross@android.com>2014-05-16 21:19:28 -0700
commit241cdab7597c9f6f203057125c9d629c285d574d (patch)
treee61c46b726545292c6ef6bcdb1ac80b2045b9a51 /api
parente326d0fe38599c70ee18a39dd04b772d458dff30 (diff)
downloadframeworks_base-241cdab7597c9f6f203057125c9d629c285d574d.zip
frameworks_base-241cdab7597c9f6f203057125c9d629c285d574d.tar.gz
frameworks_base-241cdab7597c9f6f203057125c9d629c285d574d.tar.bz2
Fix build
Change-Id: I6afbe329773b0ec44c06148237ab9fd96aa07121
Diffstat (limited to 'api')
-rw-r--r--api/current.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt
index b03c079..68e7c71 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3555,14 +3555,14 @@ package android.app {
}
public static class ActivityManager.TaskDescription implements android.os.Parcelable {
- ctor public ActivityManager.TaskDescription(android.app.ActivityManager.TaskDescription);
- ctor public ActivityManager.TaskDescription(java.lang.CharSequence, android.graphics.Bitmap, int);
- ctor public ActivityManager.TaskDescription(java.lang.CharSequence, android.graphics.Bitmap);
- ctor public ActivityManager.TaskDescription(java.lang.CharSequence);
+ ctor public ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap, int);
+ ctor public ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap);
+ ctor public ActivityManager.TaskDescription(java.lang.String);
ctor public ActivityManager.TaskDescription();
+ ctor public ActivityManager.TaskDescription(android.app.ActivityManager.TaskDescription);
method public int describeContents();
method public android.graphics.Bitmap getIcon();
- method public java.lang.CharSequence getLabel();
+ method public java.lang.String getLabel();
method public int getPrimaryColor();
method public void readFromParcel(android.os.Parcel);
method public void writeToParcel(android.os.Parcel, int);