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

Commit 559d21e7 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "If device config has a NAS related message, also enable importance... 

Merge "If device config has a NAS related message, also enable importance adjustments" into qt-qpr1-dev
am: 86bd6631

Change-Id: I558b3214ba13178ab5c411587f5170d1f5999c65
parents dbefde32 86bd6631

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -1833,6 +1833,7 @@ public class NotificationManagerService extends SystemService { 
                    }

                    }

                    if (properties.getKeyset()

                    if (properties.getKeyset()

                            .contains(SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE)) {

                            .contains(SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE)) {

                        mAssistants.allowAdjustmentType(Adjustment.KEY_IMPORTANCE);

                        mAssistants.resetDefaultAssistantsIfNecessary();

                        mAssistants.resetDefaultAssistantsIfNecessary();

                    }

                    }

                });

                });