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

Commit 4d4bf61c authored by Chloris Kuo's avatar Chloris Kuo Committed by Android (Google) Code Review
Browse files

Merge "Fix settings crash when enhanced notification shown in search results" into tm-qpr-dev

parents dbaa4192 35992973

src/com/android/settings/notification/ConfigureNotificationSettings.java

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ public class ConfigureNotificationSettings extends DashboardFragment implements 
        mNotificationAssistantPreferenceController =

                use(NotificationAssistantPreferenceController.class);

        mNotificationAssistantPreferenceController.setFragment(this);

        mNotificationAssistantPreferenceController.setBackend(new NotificationBackend());

    }



    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

src/com/android/settings/notification/NotificationAssistantPreferenceController.java

+7 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public class NotificationAssistantPreferenceController extends TogglePreferenceC 
    public NotificationAssistantPreferenceController(Context context) {

        super(context, KEY_NAS);

        mUserManager = UserManager.get(context);

        mNotificationBackend = new NotificationBackend();

    }



    @Override
@@ -101,4 +102,9 @@ public class NotificationAssistantPreferenceController extends TogglePreferenceC 
    void setBackend(NotificationBackend backend) {

        mNotificationBackend = backend;

    }



    @Override

    public boolean isSliceable() {

        return (mFragment != null && mFragment instanceof ConfigureNotificationSettings);

    }

}