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

Commit 4d81bbde authored by Beverly's avatar Beverly
Browse files

Only update lock icon views on the main thread 

The onAllAuthenticatorsRegistered callback may be
called on a background thread.

Test: manual
Test: LockIconViewControllerTest
Fixes: 203769116
Change-Id: I468fd6b5e06e0038766017a90a59c70b37c5c8c5
parent 9c053702

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

+5 −2
Original line number Diff line number Diff line
@@ -695,8 +695,11 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
    private final AuthController.Callback mAuthControllerCallback = new AuthController.Callback() {

        @Override

        public void onAllAuthenticatorsRegistered() {

            // must be called from the main thread since it may update the views

            mExecutor.execute(() -> {

                updateIsUdfpsEnrolled();

                updateConfiguration();

            });

        }

    };

}

packages/SystemUI/tests/src/com/android/systemui/keyguard/LockIconViewControllerTest.java

+4 −2
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.statusbar.StatusBarState;

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

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.concurrency.FakeExecutor;

import com.android.systemui.util.time.FakeSystemClock;



import com.airbnb.lottie.LottieAnimationView;
@@ -97,11 +98,11 @@ public class LockIconViewControllerTest extends SysuiTestCase { 
    private @Mock DumpManager mDumpManager;

    private @Mock AccessibilityManager mAccessibilityManager;

    private @Mock ConfigurationController mConfigurationController;

    private @Mock DelayableExecutor mDelayableExecutor;

    private @Mock Vibrator mVibrator;

    private @Mock AuthRippleController mAuthRippleController;

    private @Mock LottieAnimationView mAodFp;

    private @Mock LayoutInflater mLayoutInflater;

    private FakeExecutor mDelayableExecutor = new FakeExecutor(new FakeSystemClock());



    private LockIconViewController mLockIconViewController;
@@ -223,6 +224,7 @@ public class LockIconViewControllerTest extends SysuiTestCase { 


        // WHEN all authenticators are registered

        mAuthControllerCallback.onAllAuthenticatorsRegistered();

        mDelayableExecutor.runAllReady();



        // THEN lock icon view location is updated with the same coordinates as fpProps

        verify(mLockIconView).setCenterLocation(mPointCaptor.capture(), eq(udfps.first));