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

Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev

Browse Source
This commit is contained in:
Ian Pedowitz
2015-12-12 01:06:43 +00:00
committed by Android (Google) Code Review
parent a89f9d93cb ddb52fb1f5
commit cf07154e71
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ import android.os.UserHandle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.util.MathUtils; import android.util.MathUtils;
import android.util.SparseArray;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
@@ -62,6 +63,8 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Set;
/** /**
* A class that represents how a persistent notification is to be presented to * A class that represents how a persistent notification is to be presented to
@@ -1603,13 +1606,23 @@ public class Notification implements Parcelable
bigContentView = null; bigContentView = null;
headsUpContentView = null; headsUpContentView = null;
mLargeIcon = null; mLargeIcon = null;
if (extras != null) { if (extras != null && !extras.isEmpty()) {
extras.remove(Notification.EXTRA_LARGE_ICON);
extras.remove(Notification.EXTRA_LARGE_ICON_BIG);
extras.remove(Notification.EXTRA_PICTURE);
extras.remove(Notification.EXTRA_BIG_TEXT);
// Prevent light notifications from being rebuilt. // Prevent light notifications from being rebuilt.
extras.remove(Builder.EXTRA_NEEDS_REBUILD); extras.remove(Builder.EXTRA_NEEDS_REBUILD);
final Set<String> keyset = extras.keySet();
final int N = keyset.size();
final String[] keys = keyset.toArray(new String[N]);
for (int i=0; i<N; i++) {
final String key = keys[i];
final Object obj = extras.get(key);
if (obj != null &&
( obj instanceof Parcelable
|| obj instanceof Parcelable[]
|| obj instanceof SparseArray
|| obj instanceof ArrayList)) {
extras.remove(key);
}
}
} }
} }