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

Commit 62df4927 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin Committed by Ale Nijamkin
Browse files

Moves dump one level up for ClockEventController. 

We need that because registering it as a dumpable is not allowed after a
separate instance of the same class has already been registered. We
register a second instance when we set up the clock for the lock screen
preview.

Bug: 202758428
Test: manually verified that the associated CL for the same bug works
now

Change-Id: I7568f0c096e0f3759b3ee82347cfbda2f4d66132
parent 4c71a784

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+0 −10
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import kotlinx.coroutines.Job 
import kotlinx.coroutines.flow.combine

import kotlinx.coroutines.flow.filter

import kotlinx.coroutines.launch

import java.io.PrintWriter

import java.util.Locale

import java.util.TimeZone

import java.util.concurrent.Executor
@@ -309,15 +308,6 @@ open class ClockEventController @Inject constructor( 
            resources.getDimensionPixelSize(R.dimen.large_clock_text_size).toFloat())

    }



    /**

     * Dump information for debugging

     */

    fun dump(pw: PrintWriter) {

        pw.println(this)

        clock?.dump(pw)

        regionSampler?.dump(pw)

    }



    @VisibleForTesting

    internal fun listenForDozeAmount(scope: CoroutineScope): Job {

        return scope.launch {

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.systemui.plugins.log.LogBuffer; 
import com.android.systemui.plugins.log.LogLevel;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.shared.clocks.ClockRegistry;

import com.android.systemui.shared.regionsampling.RegionSampler;

import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController;

import com.android.systemui.statusbar.notification.AnimatableProperty;

import com.android.systemui.statusbar.notification.PropertyAnimator;
@@ -424,6 +425,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        if (clock != null) {

            clock.dump(pw);

        }

        final RegionSampler regionSampler = mClockEventController.getRegionSampler();

        if (regionSampler != null) {

            regionSampler.dump(pw);

        }

    }



    /** Gets the animations for the current clock. */

packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.keyguard



import com.android.systemui.statusbar.CommandQueue

import android.content.BroadcastReceiver

import android.testing.AndroidTestingRunner

import android.view.View
@@ -34,6 +33,7 @@ import com.android.systemui.plugins.ClockEvents 
import com.android.systemui.plugins.ClockFaceController

import com.android.systemui.plugins.ClockFaceEvents

import com.android.systemui.plugins.log.LogBuffer

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.policy.BatteryController

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.util.mockito.any
@@ -41,8 +41,6 @@ import com.android.systemui.util.mockito.argumentCaptor 
import com.android.systemui.util.mockito.capture

import com.android.systemui.util.mockito.eq

import com.android.systemui.util.mockito.mock

import java.util.TimeZone

import java.util.concurrent.Executor

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.runBlocking

import kotlinx.coroutines.yield
@@ -57,8 +55,10 @@ import org.mockito.Mock 
import org.mockito.Mockito.never

import org.mockito.Mockito.times

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when` as whenever

import org.mockito.junit.MockitoJUnit

import java.util.*

import java.util.concurrent.Executor

import org.mockito.Mockito.`when` as whenever



@RunWith(AndroidTestingRunner::class)

@SmallTest