Merge "RebootEscrowManager: always report success metric" into rvc-dev am:... (8490c699) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/locksettings/RebootEscrowManager.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -181,16 +181,14 @@ class RebootEscrowManager {
		}

		private void onEscrowRestoreComplete(boolean success) {
		int previousBootCount = mStorage.getInt(REBOOT_ESCROW_ARMED_KEY, 0, USER_SYSTEM);
		int previousBootCount = mStorage.getInt(REBOOT_ESCROW_ARMED_KEY, -1, USER_SYSTEM);
		mStorage.removeKey(REBOOT_ESCROW_ARMED_KEY, USER_SYSTEM);

		int bootCountDelta = mInjector.getBootCount() - previousBootCount;
		if (bootCountDelta > BOOT_COUNT_TOLERANCE) {
		return;
		}

		if (success \|\| (previousBootCount != -1 && bootCountDelta <= BOOT_COUNT_TOLERANCE)) {
		mInjector.reportMetric(success);
		}
		}

		private RebootEscrowKey getAndClearRebootEscrowKey() {
		IRebootEscrow rebootEscrow = mInjector.getRebootEscrow();

services/tests/servicestests/src/com/android/server/locksettings/RebootEscrowManagerTests.java

+61 −3

Original line number	Diff line number	Diff line
		@@ -293,9 +293,8 @@ public class RebootEscrowManagerTests {

		verify(mRebootEscrow, never()).storeKey(any());

		ArgumentCaptor<byte[]> keyByteCaptor = ArgumentCaptor.forClass(byte[].class);
		assertTrue(mService.armRebootEscrowIfNeeded());
		verify(mRebootEscrow).storeKey(keyByteCaptor.capture());
		verify(mRebootEscrow).storeKey(any());

		assertTrue(mStorage.hasRebootEscrow(PRIMARY_USER_ID));
		assertFalse(mStorage.hasRebootEscrow(NONSECURE_SECONDARY_USER_ID));
		@@ -303,13 +302,72 @@ public class RebootEscrowManagerTests {
		// pretend reboot happens here

		when(mInjected.getBootCount()).thenReturn(10);
		when(mRebootEscrow.retrieveKey()).thenAnswer(invocation -> keyByteCaptor.getValue());
		when(mRebootEscrow.retrieveKey()).thenReturn(new byte[32]);

		mService.loadRebootEscrowDataIfAvailable();
		verify(mRebootEscrow).retrieveKey();
		verify(mInjected, never()).reportMetric(anyBoolean());
		}

		@Test
		public void loadRebootEscrowDataIfAvailable_ManualReboot_Failure_NoMetrics() throws Exception {
		when(mInjected.getBootCount()).thenReturn(0);

		RebootEscrowListener mockListener = mock(RebootEscrowListener.class);
		mService.setRebootEscrowListener(mockListener);
		mService.prepareRebootEscrow();

		clearInvocations(mRebootEscrow);
		mService.callToRebootEscrowIfNeeded(PRIMARY_USER_ID, FAKE_SP_VERSION, FAKE_AUTH_TOKEN);
		verify(mockListener).onPreparedForReboot(eq(true));

		verify(mRebootEscrow, never()).storeKey(any());

		assertTrue(mStorage.hasRebootEscrow(PRIMARY_USER_ID));
		assertFalse(mStorage.hasRebootEscrow(NONSECURE_SECONDARY_USER_ID));

		// pretend reboot happens here

		when(mInjected.getBootCount()).thenReturn(10);
		when(mRebootEscrow.retrieveKey()).thenReturn(new byte[32]);

		mService.loadRebootEscrowDataIfAvailable();
		verify(mInjected, never()).reportMetric(anyBoolean());
		}

		@Test
		public void loadRebootEscrowDataIfAvailable_OTAFromBeforeArmedStatus_SuccessMetrics()
		throws Exception {
		when(mInjected.getBootCount()).thenReturn(0);

		RebootEscrowListener mockListener = mock(RebootEscrowListener.class);
		mService.setRebootEscrowListener(mockListener);
		mService.prepareRebootEscrow();

		clearInvocations(mRebootEscrow);
		mService.callToRebootEscrowIfNeeded(PRIMARY_USER_ID, FAKE_SP_VERSION, FAKE_AUTH_TOKEN);
		verify(mockListener).onPreparedForReboot(eq(true));

		verify(mRebootEscrow, never()).storeKey(any());

		ArgumentCaptor<byte[]> keyByteCaptor = ArgumentCaptor.forClass(byte[].class);
		assertTrue(mService.armRebootEscrowIfNeeded());
		verify(mRebootEscrow).storeKey(keyByteCaptor.capture());

		assertTrue(mStorage.hasRebootEscrow(PRIMARY_USER_ID));
		assertFalse(mStorage.hasRebootEscrow(NONSECURE_SECONDARY_USER_ID));

		// Delete key to simulate old version that didn't have it.
		mStorage.removeKey(RebootEscrowManager.REBOOT_ESCROW_ARMED_KEY, USER_SYSTEM);

		// pretend reboot happens here

		when(mInjected.getBootCount()).thenReturn(10);
		when(mRebootEscrow.retrieveKey()).thenAnswer(invocation -> keyByteCaptor.getValue());

		mService.loadRebootEscrowDataIfAvailable();
		verify(mInjected).reportMetric(eq(true));
		}

		@Test
		public void loadRebootEscrowDataIfAvailable_RestoreUnsuccessful_Failure() throws Exception {