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

Merge "Further interruptiveness changes" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-06 13:46:42 +00:00
committed by Android (Google) Code Review
parent 47d9d9801b a4fb9da879
commit fe1d9dc1af
4 changed files with 71 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2676,7 +2676,8 @@ public class Notification implements Parcelable
return true;
}
for (int i = 0; i < firstAs.length; i++) {
if (!Objects.equals(firstAs[i].title, secondAs[i].title)) {
if (!Objects.equals(String.valueOf(firstAs[i].title),
String.valueOf(secondAs[i].title))) {
return true;
}
RemoteInput[] firstRs = firstAs[i].getRemoteInputs();
@@ -2691,25 +2692,10 @@ public class Notification implements Parcelable
return true;
}
for (int j = 0; j < firstRs.length; j++) {
if (!Objects.equals(firstRs[j].getLabel(), secondRs[j].getLabel())) {
if (!Objects.equals(String.valueOf(firstRs[j].getLabel()),
String.valueOf(secondRs[j].getLabel()))) {
return true;
}
CharSequence[] firstCs = firstRs[j].getChoices();
CharSequence[] secondCs = secondRs[j].getChoices();
if (firstCs == null) {
firstCs = new CharSequence[0];
}
if (secondCs == null) {
secondCs = new CharSequence[0];
}
if (firstCs.length != secondCs.length) {
return true;
}
for (int k = 0; k < firstCs.length; k++) {
if (!Objects.equals(firstCs[k], secondCs[k])) {
return true;
}
}
}
}
}