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

Merge "Fix crash with decorated custom notifications" into nyc-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-02-27 02:29:14 +00:00
committed by Android (Google) Code Review
parent 988a430793 5081c0de54
commit 7006b01f5d
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3556,7 +3556,8 @@ public class Notification implements Parcelable
mStyle.buildStyled(mN);
}
if (mContext.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N) {
if (mContext.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N
&& (mStyle == null || !mStyle.displayCustomViewInline())) {
if (mN.contentView == null) {
mN.contentView = createContentView();
mN.extras.putInt(EXTRA_REBUILD_CONTENT_VIEW_ACTION_COUNT,
@@ -4570,6 +4571,11 @@ public class Notification implements Parcelable
private void buildIntoRemoteViewContent(RemoteViews remoteViews,
RemoteViews customContent) {
remoteViews.removeAllViews(R.id.notification_main_column);
// Need to clone customContent before adding, because otherwise it can no longer be
// parceled independently of remoteViews.
if (customContent != null) {
customContent = customContent.clone();
}
remoteViews.addView(R.id.notification_main_column, customContent);
// also update the end margin if there is an image
int endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
@@ -4674,6 +4680,11 @@ public class Notification implements Parcelable
private RemoteViews buildIntoRemoteView(RemoteViews remoteViews, int id,
RemoteViews customContent) {
remoteViews.removeAllViews(id);
// Need to clone customContent before adding, because otherwise it can no longer be
// parceled independently of remoteViews.
if (customContent != null) {
customContent = customContent.clone();
}
remoteViews.addView(id, customContent);
return remoteViews;
}

14
core/java/android/service/notification/NotificationListenerService.java
View File

@@ -42,6 +42,7 @@ import android.os.ServiceManager;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log;
import android.widget.RemoteViews;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -754,9 +755,16 @@ public abstract class NotificationListenerService extends Service {
private void maybePopulateRemoteViews(Notification notification) {
if (getContext().getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N) {
Builder builder = Builder.recoverBuilder(getContext(), notification);
notification.contentView = builder.createContentView();
notification.bigContentView = builder.createBigContentView();
notification.headsUpContentView = builder.createHeadsUpContentView();
// Some styles wrap Notification's contentView, bigContentView and headsUpContentView.
// First inflate them all, only then set them to avoid recursive wrapping.
RemoteViews content = builder.createContentView();
RemoteViews big = builder.createBigContentView();
RemoteViews headsUp = builder.createHeadsUpContentView();
notification.contentView = content;
notification.bigContentView = big;
notification.headsUpContentView = headsUp;
}
}