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

Commit f62145a4 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a bug where systemui could crash while cloning" into oc-dev 

am: b9eb205b

Change-Id: I6cd3b23a9adcb20a93b112204154f1e42a7a3c21
parents 9f236081 b9eb205b

core/java/android/widget/RemoteViews.java

+1 −1
Original line number Diff line number Diff line
@@ -2418,7 +2418,7 @@ public class RemoteViews implements Parcelable, Filter { 
    }





    public RemoteViews clone() {

    public synchronized RemoteViews clone() {

        Preconditions.checkState(mIsRoot, "RemoteView has been attached to another RemoteView. "

                + "May only clone the root of a RemoteView hierarchy.");

packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ public class NotificationData { 
                final int N = mEntries.size();

                for (int i = 0; i < N; i++) {

                    Entry entry = mEntries.valueAt(i);

                    final StatusBarNotification oldSbn = entry.notification.clone();

                    final StatusBarNotification oldSbn = entry.notification.cloneLight();

                    final String overrideGroupKey = getOverrideGroupKey(entry.key);

                    if (!Objects.equals(oldSbn.getOverrideGroupKey(), overrideGroupKey)) {

                        entry.notification.setOverrideGroupKey(overrideGroupKey);