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

Fix Notification.Action.Builder copy constructor

Browse Source 
The copy constructor of Notification.Action.Builder did not copy
the mAllowGeneratedReplies field.

Change-Id: I40fbe8950ee2232e2589ab3930a32bfbebe9fc89
Fixes: 31766718
Test: runtest --path $T/cts/tests/app/src/android/app/cts/NotificationTest.java
This commit is contained in:
Adrian Roos
2016-10-12 13:44:05 -07:00
parent 46d1ecbc8f
commit 7af5362571
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/Notification.java
View File

@@ -1049,6 +1049,7 @@ public class Notification implements Parcelable
this(Icon.createWithResource("", icon), title, intent, new Bundle(), null, false); 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, private Action(Icon icon, CharSequence title, PendingIntent intent, Bundle extras,
RemoteInput[] remoteInputs, boolean allowGeneratedReplies) { RemoteInput[] remoteInputs, boolean allowGeneratedReplies) {
this.mIcon = icon; this.mIcon = icon;
@@ -1115,7 +1116,7 @@ public class Notification implements Parcelable
*/ */
@Deprecated @Deprecated
public Builder(int icon, CharSequence title, PendingIntent intent) { 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 * @param intent the {@link PendingIntent} to fire when users trigger this action
*/ */
public Builder(Icon icon, CharSequence title, PendingIntent intent) { 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. * @param action the action to read fields from.
*/ */
public Builder(Action action) { public Builder(Action action) {
this(action.getIcon(), action.title, action.actionIntent, new Bundle(action.mExtras), this(action.getIcon(), action.title, action.actionIntent,
action.getRemoteInputs()); new Bundle(action.mExtras), action.getRemoteInputs(),
action.getAllowGeneratedReplies());
} }
private Builder(Icon icon, CharSequence title, PendingIntent intent, Bundle extras, private Builder(Icon icon, CharSequence title, PendingIntent intent, Bundle extras,
RemoteInput[] remoteInputs) { RemoteInput[] remoteInputs, boolean allowGeneratedReplies) {
mIcon = icon; mIcon = icon;
mTitle = title; mTitle = title;
mIntent = intent; mIntent = intent;
@@ -1148,6 +1150,7 @@ public class Notification implements Parcelable
mRemoteInputs = new ArrayList<RemoteInput>(remoteInputs.length); mRemoteInputs = new ArrayList<RemoteInput>(remoteInputs.length);
Collections.addAll(mRemoteInputs, remoteInputs); Collections.addAll(mRemoteInputs, remoteInputs);
} }
mAllowGeneratedReplies = allowGeneratedReplies;
} }
/** /**