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

Merge "Fix unstyled Notification RemoteViews inflation logic for apps targeting API 23 and lower." into sc-qpr1-dev am: 86536be56b am: 28d37ec3ee

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15861704

Change-Id: I00f2f20c57970ffc4319a3abf2e76056ff88bf19
This commit is contained in:
TreeHugger Robot
2021-09-20 20:55:42 +00:00
committed by Automerger Merge Worker
parent 0c0cf88818 28d37ec3ee
commit 317b824ade
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6506,25 +6506,34 @@ public class Notification implements Parcelable
if (mContext.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N
&& !styleDisplaysCustomViewInline()) {
if (mN.contentView == null) {
mN.contentView = createContentView();
RemoteViews newContentView = mN.contentView;
RemoteViews newBigContentView = mN.bigContentView;
RemoteViews newHeadsUpContentView = mN.headsUpContentView;
if (newContentView == null) {
newContentView = createContentView();
mN.extras.putInt(EXTRA_REBUILD_CONTENT_VIEW_ACTION_COUNT,
mN.contentView.getSequenceNumber());
newContentView.getSequenceNumber());
}
if (mN.bigContentView == null) {
mN.bigContentView = createBigContentView();
if (mN.bigContentView != null) {
if (newBigContentView == null) {
newBigContentView = createBigContentView();
if (newBigContentView != null) {
mN.extras.putInt(EXTRA_REBUILD_BIG_CONTENT_VIEW_ACTION_COUNT,
mN.bigContentView.getSequenceNumber());
newBigContentView.getSequenceNumber());
}
}
if (mN.headsUpContentView == null) {
mN.headsUpContentView = createHeadsUpContentView();
if (mN.headsUpContentView != null) {
if (newHeadsUpContentView == null) {
newHeadsUpContentView = createHeadsUpContentView();
if (newHeadsUpContentView != null) {
mN.extras.putInt(EXTRA_REBUILD_HEADS_UP_CONTENT_VIEW_ACTION_COUNT,
mN.headsUpContentView.getSequenceNumber());
newHeadsUpContentView.getSequenceNumber());
}
}
// Don't set any of the content views until after they have all been generated,
// to avoid the generated .contentView triggering the logic which skips generating
// the .bigContentView.
mN.contentView = newContentView;
mN.bigContentView = newBigContentView;
mN.headsUpContentView = newHeadsUpContentView;
}
if ((mN.defaults & DEFAULT_LIGHTS) != 0) {