diff options
| author | Adrian Roos <roosa@google.com> | 2016-10-12 23:25:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-12 23:25:20 +0000 |
| commit | 7bc84b803dd4a0a26418662e9802a67a2d8f35ca (patch) | |
| tree | 1e4cf4f64362b14b5b9849dde4d44023e607a941 /core/java | |
| parent | baee508ba94d8a6c6683b91c93d2af7a93a57d62 (diff) | |
| parent | 342bc437bf60969a45d3fc28d58ce8d0f7cc6112 (diff) | |
Fix Notification.Action.Builder copy constructor am: 7af5362571
am: 342bc437bf
Change-Id: I0387ab66ec3d44e34a884fb2f92f32af35e2883c
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Notification.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 1103d9e900c1..0dd9c63c40c5 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1049,6 +1049,7 @@ public class Notification implements Parcelable this(Icon.createWithResource("", icon), title, intent, new Bundle(), null, false); } + /** Keep in sync with {@link Notification.Action.Builder#Builder(Action)}! */ private Action(Icon icon, CharSequence title, PendingIntent intent, Bundle extras, RemoteInput[] remoteInputs, boolean allowGeneratedReplies) { this.mIcon = icon; @@ -1115,7 +1116,7 @@ public class Notification implements Parcelable */ @Deprecated public Builder(int icon, CharSequence title, PendingIntent intent) { - this(Icon.createWithResource("", icon), title, intent, new Bundle(), null); + this(Icon.createWithResource("", icon), title, intent); } /** @@ -1125,7 +1126,7 @@ public class Notification implements Parcelable * @param intent the {@link PendingIntent} to fire when users trigger this action */ public Builder(Icon icon, CharSequence title, PendingIntent intent) { - this(icon, title, intent, new Bundle(), null); + this(icon, title, intent, new Bundle(), null, false); } /** @@ -1134,12 +1135,13 @@ public class Notification implements Parcelable * @param action the action to read fields from. */ public Builder(Action action) { - this(action.getIcon(), action.title, action.actionIntent, new Bundle(action.mExtras), - action.getRemoteInputs()); + this(action.getIcon(), action.title, action.actionIntent, + new Bundle(action.mExtras), action.getRemoteInputs(), + action.getAllowGeneratedReplies()); } private Builder(Icon icon, CharSequence title, PendingIntent intent, Bundle extras, - RemoteInput[] remoteInputs) { + RemoteInput[] remoteInputs, boolean allowGeneratedReplies) { mIcon = icon; mTitle = title; mIntent = intent; @@ -1148,6 +1150,7 @@ public class Notification implements Parcelable mRemoteInputs = new ArrayList<RemoteInput>(remoteInputs.length); Collections.addAll(mRemoteInputs, remoteInputs); } + mAllowGeneratedReplies = allowGeneratedReplies; } /** |