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

Merge "Fix potential NPE"

Browse Source
This commit is contained in:
Julia Reynolds
2023-01-31 16:29:47 +00:00
committed by Android (Google) Code Review
parent cd63c4fc01 45759ca54d
commit 83c4c5dab2
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3885,8 +3885,11 @@ public class Notification implements Parcelable
}
if (mN.extras.containsKey(EXTRA_PEOPLE_LIST)) {
ArrayList<Person> people = mN.extras.getParcelableArrayList(EXTRA_PEOPLE_LIST, android.app.Person.class);
mPersonList.addAll(people);
ArrayList<Person> people = mN.extras.getParcelableArrayList(EXTRA_PEOPLE_LIST,
android.app.Person.class);
if (people != null && !people.isEmpty()) {
mPersonList.addAll(people);
}
}
if (mN.getSmallIcon() == null && mN.icon != 0) {

18
core/tests/coretests/src/android/app/NotificationTest.java
View File

@@ -31,6 +31,7 @@ import static android.app.Notification.EXTRA_LARGE_ICON_BIG;
import static android.app.Notification.EXTRA_MEDIA_REMOTE_INTENT;
import static android.app.Notification.EXTRA_MEDIA_SESSION;
import static android.app.Notification.EXTRA_MESSAGING_PERSON;
import static android.app.Notification.EXTRA_PEOPLE_LIST;
import static android.app.Notification.EXTRA_PICTURE;
import static android.app.Notification.EXTRA_PICTURE_ICON;
import static android.app.Notification.MessagingStyle.Message.KEY_DATA_URI;
@@ -816,6 +817,23 @@ public class NotificationTest {
}
}
@Test
public void testRecoverBuilder_nullExtraPeopleList_noCrash() {
Bundle extras = new Bundle();
extras.putParcelable(EXTRA_PEOPLE_LIST, null);
Notification n = new Notification.Builder(mContext, "test")
.setSmallIcon(0)
.addExtras(extras)
.build();
Bundle fakeTypes = new Bundle();
fakeTypes.putParcelable(EXTRA_BUILDER_APPLICATION_INFO, new Bundle());
Notification.Builder.recoverBuilder(mContext, n);
// no crash, good
}
@Test
public void testVisitUris_invalidExtra_noCrash() {
Notification n = new Notification.Builder(mContext, "test")