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

Commit e09dc560 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Use simple class names for Dumpables 

Some Dumpables are registered with their fully-qualified class names,
which makes the list of views in Android Bug Tool harder to use.

This change switches those dumpable registrations to use the simple name
(just the class name, without the package name) instead.

Bug: 283097421
Test: presubmit
Change-Id: I7d04157784c0becbb2e0eadedf278c6ddcad0baf
parent f7caea5b

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -188,8 +188,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        mSmallClockFrame = mView.findViewById(R.id.lockscreen_clock_view);

        mSmallClockFrame = mView.findViewById(R.id.lockscreen_clock_view);

        mLargeClockFrame = mView.findViewById(R.id.lockscreen_clock_view_large);

        mLargeClockFrame = mView.findViewById(R.id.lockscreen_clock_view_large);





        mDumpManager.unregisterDumpable(getClass().toString()); // unregister previous clocks

        mDumpManager.unregisterDumpable(getClass().getSimpleName()); // unregister previous clocks

        mDumpManager.registerDumpable(getClass().toString(), this);

        mDumpManager.registerDumpable(getClass().getSimpleName(), this);

    }

    }





    @Override

    @Override

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2304,7 +2304,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        mLockPatternUtils = lockPatternUtils;

        mLockPatternUtils = lockPatternUtils;

        mAuthController = authController;

        mAuthController = authController;

        mSecureSettings = secureSettings;

        mSecureSettings = secureSettings;

        dumpManager.registerDumpable(getClass().getName(), this);

        dumpManager.registerDumpable(this);

        mSensorPrivacyManager = sensorPrivacyManager;

        mSensorPrivacyManager = sensorPrivacyManager;

        mActiveUnlockConfig = activeUnlockConfiguration;

        mActiveUnlockConfig = activeUnlockConfiguration;

        mLogger = logger;

        mLogger = logger;

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -258,7 +258,7 @@ public class SystemUIApplication extends Application implements 
                notifyBootCompleted(mServices[i]);

                notifyBootCompleted(mServices[i]);

            }

            }





            dumpManager.registerDumpable(mServices[i].getClass().getName(), mServices[i]);

            dumpManager.registerDumpable(mServices[i].getClass().getSimpleName(), mServices[i]);

        }

        }

        mSysUIComponent.getInitController().executePostInitTasks();

        mSysUIComponent.getInitController().executePostInitTasks();

        log.traceEnd();

        log.traceEnd();

packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ open class BroadcastDispatcher @Inject constructor( 
    private val receiversByUser = SparseArray<UserBroadcastDispatcher>(20)

    private val receiversByUser = SparseArray<UserBroadcastDispatcher>(20)





    fun initialize() {

    fun initialize() {

        dumpManager.registerDumpable(javaClass.name, this)

        dumpManager.registerDumpable(this)

    }

    }





    /**

    /**

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsControllerImpl.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -227,7 +227,7 @@ class ControlsControllerImpl @Inject constructor ( 
    }

    }





    init {

    init {

        dumpManager.registerDumpable(javaClass.name, this)

        dumpManager.registerDumpable(this)

        resetFavorites()

        resetFavorites()

        userChanging = false

        userChanging = false

        context.registerReceiver(

        context.registerReceiver(