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

Commit cacb0bf1 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Add more DND state logging for debugging" into main

parents b62a954d 1f178825

packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ public class ZenModeControllerImpl implements ZenModeController, Dumpable { 
    @Override

    public void addCallback(@NonNull Callback callback) {

        synchronized (mCallbacksLock) {

            Log.d(TAG, "Added callback " + callback.getClass());

            mCallbacks.add(callback);

        }

    }
@@ -176,6 +177,7 @@ public class ZenModeControllerImpl implements ZenModeController, Dumpable { 
    @Override

    public void removeCallback(@NonNull Callback callback) {

        synchronized (mCallbacksLock) {

            Log.d(TAG, "Removed callback " + callback.getClass());

            mCallbacks.remove(callback);

        }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ZenModeControllerImplTest.java

+0 −6
Original line number Diff line number Diff line
@@ -131,12 +131,6 @@ public class ZenModeControllerImplTest extends SysuiTestCase { 
        assertTrue(mController.areNotificationsHiddenInShade());

    }



    @Test

    public void testAddNullCallback() {

        mController.addCallback(null);

        mController.fireConfigChanged(null);

    }



    @Test

    public void testModeChange() {

        List<Integer> states = List.of(

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

+2 −0
Original line number Diff line number Diff line
@@ -1022,6 +1022,8 @@ public class ZenModeHelper { 
    @VisibleForTesting

    protected void setZenModeSetting(int zen) {

        Global.putInt(mContext.getContentResolver(), Global.ZEN_MODE, zen);

        ZenLog.traceSetZenMode(Global.getInt(mContext.getContentResolver(), Global.ZEN_MODE, -1),

                "updated setting");

        showZenUpgradeNotification(zen);

    }