Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I7e29504f607d0b9114b63df9d96bd546294d8631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Derek Jedral
2023-05-05 20:35:43 +00:00
committed by Automerger Merge Worker
parent c3a282b05d c0553faff4
commit 5ac2375c4e
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/trust/TrustManagerService.java
View File

@@ -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

10
tests/TrustTests/src/android/trust/test/UserUnlockRequestTest.kt
View File

@@ -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)