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

Commit 15ea2fb4 authored by Diya Bera's avatar Diya Bera Committed by Android (Google) Code Review
Browse files

Merge "Minor cleanup" into udc-dev

parents 78ad8f00 cb3008b1

core/tests/coretests/src/android/hardware/face/FaceManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public class FaceManagerTest { 
        mCaptor.getValue().onAllAuthenticatorsRegistered(mProps);

        List<FaceSensorPropertiesInternal> actual = mFaceManager.getSensorPropertiesInternal();



        assertThat(actual).isEqualTo(mProps);

        assertThat(actual).containsExactlyElementsIn(mProps);

        verify(mService, never()).getSensorPropertiesInternal(any());

    }

core/tests/coretests/src/android/hardware/fingerprint/FingerprintManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public class FingerprintManagerTest { 
        List<FingerprintSensorPropertiesInternal> actual =

                mFingerprintManager.getSensorPropertiesInternal();



        assertThat(actual).isEqualTo(mProps);

        assertThat(actual).containsExactlyElementsIn(mProps);

        verify(mService, never()).getSensorPropertiesInternal(any());

    }

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

+26 −0
Original line number Diff line number Diff line
@@ -4125,6 +4125,19 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    KeyguardFingerprintListenModel.TABLE_HEADERS,

                    mFingerprintListenBuffer.toList()

            ).printTableData(pw);

        } else if (mFpm != null && mFingerprintSensorProperties.isEmpty()) {

            final int userId = mUserTracker.getUserId();

            pw.println("  Fingerprint state (user=" + userId + ")");

            pw.println("    mFingerprintSensorProperties.isEmpty="

                    + mFingerprintSensorProperties.isEmpty());

            pw.println("    mFpm.isHardwareDetected="

                    + mFpm.isHardwareDetected());



            new DumpsysTableLogger(

                    "KeyguardFingerprintListen",

                    KeyguardFingerprintListenModel.TABLE_HEADERS,

                    mFingerprintListenBuffer.toList()

            ).printTableData(pw);

        }

        if (mFaceManager != null && !mFaceSensorProperties.isEmpty()) {

            final int userId = mUserTracker.getUserId();
@@ -4155,6 +4168,19 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    KeyguardFaceListenModel.TABLE_HEADERS,

                    mFaceListenBuffer.toList()

            ).printTableData(pw);

        } else if (mFaceManager != null && mFaceSensorProperties.isEmpty()) {

            final int userId = mUserTracker.getUserId();

            pw.println("  Face state (user=" + userId + ")");

            pw.println("    mFaceSensorProperties.isEmpty="

                    + mFaceSensorProperties.isEmpty());

            pw.println("    mFaceManager.isHardwareDetected="

                    + mFaceManager.isHardwareDetected());



            new DumpsysTableLogger(

                    "KeyguardFaceListen",

                    KeyguardFingerprintListenModel.TABLE_HEADERS,

                    mFingerprintListenBuffer.toList()

            ).printTableData(pw);

        }



        new DumpsysTableLogger(