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

Fix unsafe calls to Bundle.getParcelable.

Browse Source 
The recommended approach is to pass the class as a parameter.

Bug: 281549104
Test: atest NotificationManagerServiceTest
Change-Id: Ib363110fd2bdcf4d9974fde5f78df926940785bf
This commit is contained in:
Ioana Alexandru
2023-05-08 18:39:35 +00:00
parent b26be926b0
commit a95dca8df2
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2887,8 +2887,9 @@ public class Notification implements Parcelable
visitor.accept(person.getIconUri()); visitor.accept(person.getIconUri());
} }
final RemoteInputHistoryItem[] history = (RemoteInputHistoryItem[]) final RemoteInputHistoryItem[] history = extras.getParcelableArray(
extras.getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS); Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS,
RemoteInputHistoryItem.class);
if (history != null) { if (history != null) {
for (int i = 0; i < history.length; i++) { for (int i = 0; i < history.length; i++) {
RemoteInputHistoryItem item = history[i]; RemoteInputHistoryItem item = history[i];
@@ -2900,7 +2901,8 @@ public class Notification implements Parcelable
} }
if (isStyle(MessagingStyle.class) && extras != null) { if (isStyle(MessagingStyle.class) && extras != null) {
final Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES); final Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES,
Parcelable.class);
if (!ArrayUtils.isEmpty(messages)) { if (!ArrayUtils.isEmpty(messages)) {
for (MessagingStyle.Message message : MessagingStyle.Message for (MessagingStyle.Message message : MessagingStyle.Message
.getMessagesFromBundleArray(messages)) { .getMessagesFromBundleArray(messages)) {
@@ -2913,7 +2915,8 @@ public class Notification implements Parcelable
} }
} }
final Parcelable[] historic = extras.getParcelableArray(EXTRA_HISTORIC_MESSAGES); final Parcelable[] historic = extras.getParcelableArray(EXTRA_HISTORIC_MESSAGES,
Parcelable.class);
if (!ArrayUtils.isEmpty(historic)) { if (!ArrayUtils.isEmpty(historic)) {
for (MessagingStyle.Message message : MessagingStyle.Message for (MessagingStyle.Message message : MessagingStyle.Message
.getMessagesFromBundleArray(historic)) { .getMessagesFromBundleArray(historic)) {
@@ -2928,11 +2931,11 @@ public class Notification implements Parcelable
} }
if (isStyle(CallStyle.class) & extras != null) { if (isStyle(CallStyle.class) & extras != null) {
Person callPerson = extras.getParcelable(EXTRA_CALL_PERSON); Person callPerson = extras.getParcelable(EXTRA_CALL_PERSON, Person.class);
if (callPerson != null) { if (callPerson != null) {
visitor.accept(callPerson.getIconUri()); visitor.accept(callPerson.getIconUri());
} }
visitIconUri(visitor, extras.getParcelable(EXTRA_VERIFICATION_ICON)); visitIconUri(visitor, extras.getParcelable(EXTRA_VERIFICATION_ICON, Icon.class));
} }
if (mBubbleMetadata != null) { if (mBubbleMetadata != null) {
@@ -3407,7 +3410,7 @@ public class Notification implements Parcelable
* separate object, replace it with the field's version to avoid holding duplicate copies. * separate object, replace it with the field's version to avoid holding duplicate copies.
*/ */
private void fixDuplicateExtra(@Nullable Parcelable original, @NonNull String extraName) { private void fixDuplicateExtra(@Nullable Parcelable original, @NonNull String extraName) {
if (original != null && extras.getParcelable(extraName) != null) { if (original != null && extras.getParcelable(extraName, Parcelable.class) != null) {
extras.putParcelable(extraName, original); extras.putParcelable(extraName, original);
} }
} }
@@ -7084,7 +7087,8 @@ public class Notification implements Parcelable
*/ */
public boolean hasImage() { public boolean hasImage() {
if (isStyle(MessagingStyle.class) && extras != null) { if (isStyle(MessagingStyle.class) && extras != null) {
final Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES); final Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES,
Parcelable.class);
if (!ArrayUtils.isEmpty(messages)) { if (!ArrayUtils.isEmpty(messages)) {
for (MessagingStyle.Message m : MessagingStyle.Message for (MessagingStyle.Message m : MessagingStyle.Message
.getMessagesFromBundleArray(messages)) { .getMessagesFromBundleArray(messages)) {
@@ -8286,15 +8290,18 @@ public class Notification implements Parcelable
protected void restoreFromExtras(Bundle extras) { protected void restoreFromExtras(Bundle extras) {
super.restoreFromExtras(extras); super.restoreFromExtras(extras);
mUser = extras.getParcelable(EXTRA_MESSAGING_PERSON, Person.class); Person user = extras.getParcelable(EXTRA_MESSAGING_PERSON, Person.class);
if (mUser == null) { if (user == null) {
CharSequence displayName = extras.getCharSequence(EXTRA_SELF_DISPLAY_NAME); CharSequence displayName = extras.getCharSequence(EXTRA_SELF_DISPLAY_NAME);
mUser = new Person.Builder().setName(displayName).build(); mUser = new Person.Builder().setName(displayName).build();
} else {
mUser = user;
} }
mConversationTitle = extras.getCharSequence(EXTRA_CONVERSATION_TITLE); mConversationTitle = extras.getCharSequence(EXTRA_CONVERSATION_TITLE);
Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES); Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES, Parcelable.class);
mMessages = Message.getMessagesFromBundleArray(messages); mMessages = Message.getMessagesFromBundleArray(messages);
Parcelable[] histMessages = extras.getParcelableArray(EXTRA_HISTORIC_MESSAGES); Parcelable[] histMessages = extras.getParcelableArray(EXTRA_HISTORIC_MESSAGES,
Parcelable.class);
mHistoricMessages = Message.getMessagesFromBundleArray(histMessages); mHistoricMessages = Message.getMessagesFromBundleArray(histMessages);
mIsGroupConversation = extras.getBoolean(EXTRA_IS_GROUP_CONVERSATION); mIsGroupConversation = extras.getBoolean(EXTRA_IS_GROUP_CONVERSATION);
mUnreadMessageCount = extras.getInt(EXTRA_CONVERSATION_UNREAD_MESSAGE_COUNT); mUnreadMessageCount = extras.getInt(EXTRA_CONVERSATION_UNREAD_MESSAGE_COUNT);
@@ -11962,7 +11969,8 @@ public class Notification implements Parcelable
if (b == null) { if (b == null) {
return null; return null;
} }
Parcelable[] parcelableMessages = b.getParcelableArray(KEY_MESSAGES); Parcelable[] parcelableMessages = b.getParcelableArray(KEY_MESSAGES,
Parcelable.class);
String[] messages = null; String[] messages = null;
if (parcelableMessages != null) { if (parcelableMessages != null) {
String[] tmp = new String[parcelableMessages.length]; String[] tmp = new String[parcelableMessages.length];
@@ -12299,7 +12307,7 @@ public class Notification implements Parcelable
@Nullable @Nullable
private static <T extends Parcelable> T[] getParcelableArrayFromBundle( private static <T extends Parcelable> T[] getParcelableArrayFromBundle(
Bundle bundle, String key, Class<T> itemClass) { Bundle bundle, String key, Class<T> itemClass) {
final Parcelable[] array = bundle.getParcelableArray(key); final Parcelable[] array = bundle.getParcelableArray(key, Parcelable.class);
final Class<?> arrayClass = Array.newInstance(itemClass, 0).getClass(); final Class<?> arrayClass = Array.newInstance(itemClass, 0).getClass();
if (arrayClass.isInstance(array) || array == null) { if (arrayClass.isInstance(array) || array == null) {
return (T[]) array; return (T[]) array;