Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbcf4ee2 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into... 

Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc-dev am: 47c3afa1 am: 9b36b6d3
am: b1c898ed

Change-Id: I8b53612e8716233b444a28882028cfb94cb56e0a
parents 694d8a97 b1c898ed

services/core/java/com/android/server/notification/NotificationManagerService.java

+10 −9
Original line number Diff line number Diff line
@@ -2614,17 +2614,18 @@ public class NotificationManagerService extends SystemService { 
    private static void setPendingIntentWhitelistDuration(ActivityManagerInternal am, long duration,

            Bundle extras) {

        for (String key : extras.keySet()) {

            setPendingIntentWhitelistDuration(am, duration, extras.getParcelable(key));

            final Parcelable[] parcelableArray = extras.getParcelableArray(key);

            if (parcelableArray != null) {

                for (Parcelable parcelable: parcelableArray) {

            final Object value = extras.get(key);

            if (value instanceof Parcelable) {

                setPendingIntentWhitelistDuration(am, duration, (Parcelable) value);

            } else if (value instanceof Parcelable[]) {

                for (Parcelable parcelable : (Parcelable[]) value) {

                    setPendingIntentWhitelistDuration(am, duration, parcelable);

                }

            } else if (value instanceof List) {

                for (Object element : (List <?>) value) {

                    if (element instanceof Parcelable) {

                        setPendingIntentWhitelistDuration(am, duration, (Parcelable) element);

                    }

            final ArrayList<Parcelable> parcelableList = extras.getParcelableArrayList(key);

            if (parcelableList != null) {

                for (Parcelable parcelable: parcelableList) {

                    setPendingIntentWhitelistDuration(am, duration, parcelable);

                }

            }

        }