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

Commit a90f5361 authored by Derek Jedral's avatar Derek Jedral Committed by Automerger Merge Worker
Browse files

Merge "Report correct userId in onUserMayRequestUnlock." into udc-dev am: c0553faf 

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



Change-Id: Ic598b138d3f9d316ef4a3819dfdb6887f70bfb83
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8c110a1 c0553faf

services/core/java/com/android/server/trust/TrustManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1573,7 +1573,7 @@ public class TrustManagerService extends SystemService { 
        @Override

        public void reportUserMayRequestUnlock(int userId) throws RemoteException {

            enforceReportPermission();

            mHandler.obtainMessage(MSG_USER_MAY_REQUEST_UNLOCK, userId).sendToTarget();

            mHandler.obtainMessage(MSG_USER_MAY_REQUEST_UNLOCK, userId, /*arg2=*/ 0).sendToTarget();

        }



        @Override

tests/TrustTests/src/android/trust/test/UserUnlockRequestTest.kt

+10 −0
Original line number Diff line number Diff line
@@ -79,6 +79,16 @@ class UserUnlockRequestTest { 
            .isEqualTo(oldCount + 1)

    }



    @Test

    fun reportUserMayRequestUnlock_differentUserId_doesNotPropagateToAgent() {

        val oldCount = trustAgentRule.agent.onUserMayRequestUnlockCallCount

        trustManager.reportUserMayRequestUnlock(userId + 1)

        await()



        assertThat(trustAgentRule.agent.onUserMayRequestUnlockCallCount)

            .isEqualTo(oldCount)

    }



    companion object {

        private const val TAG = "UserUnlockRequestTest"

        private fun await() = Thread.sleep(250)