From 5dd2ed3773f7e532ae0f2527e16fc198a2934f87 Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Thu, 8 Oct 2020 11:13:51 +0900 Subject: Fix UTC failure Bug: 170372503 Test: atest BlockedNumberProviderTest Signed-off-by: Taesu Lee Change-Id: I0f37718145e8a60824dbc106b217c7eb32364612 --- .../providers/blockednumber/BlockedNumberProviderTest.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java index ed48070..9f9301f 100644 --- a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java +++ b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java @@ -15,6 +15,9 @@ */ package com.android.providers.blockednumber; +import static android.os.UserHandle.MIN_SECONDARY_USER_ID; +import static android.os.UserHandle.USER_SYSTEM; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -46,6 +49,7 @@ import android.telephony.CarrierConfigManager; import android.telephony.TelephonyManager; import android.test.AndroidTestCase; import android.test.MoreAsserts; +import android.text.TextUtils; import android.test.suitebuilder.annotation.MediumTest; import junit.framework.Assert; @@ -70,7 +74,7 @@ public class BlockedNumberProviderTest extends AndroidTestCase { mMockContext.initializeContext(); mResolver = mMockContext.getContentResolver(); - when(mMockContext.mUserManager.isPrimaryUser()).thenReturn(true); + doReturn(USER_SYSTEM).when(mMockContext).getUserId(); when(mMockContext.mCountryDetector.detectCountry()) .thenReturn(new Country("US", Country.COUNTRY_SOURCE_LOCATION)); when(mMockContext.mAppOpsManager.noteOp( @@ -634,7 +638,7 @@ public class BlockedNumberProviderTest extends AndroidTestCase { } public void testPrivilegedAppAccessingApisAsSecondaryUser() { - when(mMockContext.mUserManager.isPrimaryUser()).thenReturn(false); + doReturn(MIN_SECONDARY_USER_ID).when(mMockContext).getUserId(); assertFalse(BlockedNumberContract.canCurrentUserBlockNumbers(mMockContext)); @@ -671,7 +675,7 @@ public class BlockedNumberProviderTest extends AndroidTestCase { } public void testRegularAppAccessingApisAsSecondaryUser() { - when(mMockContext.mUserManager.isPrimaryUser()).thenReturn(false); + doReturn(MIN_SECONDARY_USER_ID).when(mMockContext).getUserId(); doReturn(PackageManager.PERMISSION_DENIED) .when(mMockContext).checkCallingPermission(anyString()); @@ -768,7 +772,7 @@ public class BlockedNumberProviderTest extends AndroidTestCase { private String getEmergencyNumberFromSystemPropertiesOrDefault() { String systemEmergencyNumbers = SystemProperties.get("ril.ecclist"); - if (systemEmergencyNumbers == null) { + if (TextUtils.isEmpty(systemEmergencyNumbers)) { return "911"; } else { return systemEmergencyNumbers.split(",")[0]; -- cgit v1.2.3