commit eb718138146afe858d840e6801f703c950bc6b28
author Neil Fuller <nfuller@google.com> Thu Dec 12 07:06:40 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 12 07:06:40 2019 -0800
tree e2867e081f00881e6fb57195559dfd0709194fd2
parent 7c073693c08a009092b030c790f0580fb7da1170
parent 91270ddb559dc28b1a491131c2c8ed89929c73e9

Merge "Fix TimeDetectorServiceTest permissions"
am: 91270ddb55

Change-Id: I15dc9480414491e7e9cf809507218e80f20f8846

services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java

diff --git a/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java b/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java
index 0202e71..72a7f50 100644
--- a/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java
@@ -95,13 +95,13 @@
 
     @Test
     public void testSuggestManualTime() throws Exception {
-        doNothing().when(mMockContext).enforceCallingPermission(anyString(), any());
+        doNothing().when(mMockContext).enforceCallingOrSelfPermission(anyString(), any());
 
         ManualTimeSuggestion manualTimeSuggestion = createManualTimeSuggestion();
         mTimeDetectorService.suggestManualTime(manualTimeSuggestion);
         mTestHandler.assertTotalMessagesEnqueued(1);
 
-        verify(mMockContext).enforceCallingPermission(
+        verify(mMockContext).enforceCallingOrSelfPermission(
                 eq(android.Manifest.permission.SET_TIME),
                 anyString());