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

Commit 5cbff0de authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensure dumpable tag is unique" into sc-dev am: 6d9d999b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13930273

Change-Id: I28221c08e9d8e0f7c503a5cd71c29119f4dc9f48
parents 9d6fbef3 6d9d999b

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.java

+12 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView> 
        mStateListener.onStateChanged(mStatusBarStateController.getState());

        mStatusBar.addExpansionChangedListener(mStatusBarExpansionChangedListener);



        mDumpManger.registerDumpable(getTag(), this);

        mDumpManger.registerDumpable(getDumpTag(), this);

    }



    @Override
@@ -80,7 +80,17 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView> 
        mStatusBarStateController.removeCallback(mStateListener);

        mStatusBar.removeExpansionChangedListener(mStatusBarExpansionChangedListener);



        mDumpManger.unregisterDumpable(getTag());

        mDumpManger.unregisterDumpable(getDumpTag());

    }



    /**

     * in some cases, onViewAttached is called for the newly added view using an instance of

     * this controller before onViewDetached is called on the previous view, so we must have a

     * unique dump tag per instance of this class

     * @return a unique tag for this instance of this class

     */

    private String getDumpTag() {

        return getTag() + " (" + this + ")";

    }



    @Override