PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: e85186f38e am: b3bf9454eb

Browse Source 
Change-Id: I3d7b3e535c496673cc63ccc528e6be3bcb308b71
This commit is contained in:
Peter Wang
2020-03-19 20:32:09 +00:00
committed by Automerger Merge Worker
parent 2ea07e582f b3bf9454eb
commit 0e48aeb71d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
View File

@@ -42,7 +42,7 @@ public class ContactDiscoveryPreferenceController extends TelephonyTogglePrefere
implements LifecycleObserver { implements LifecycleObserver {
private static final String TAG = "ContactDiscoveryPref"; private static final String TAG = "ContactDiscoveryPref";
private static final Uri UCE_URI = Uri.withAppendedPath(Telephony.SimInfo.CONTENT_URI, private static final Uri UCE_URI = Uri.withAppendedPath(Telephony.SimInfo.CONTENT_URI,
Telephony.SimInfo.IMS_RCS_UCE_ENABLED); Telephony.SimInfo.COLUMN_IMS_RCS_UCE_ENABLED);
private ImsManager mImsManager; private ImsManager mImsManager;
private CarrierConfigManager mCarrierConfigManager; private CarrierConfigManager mCarrierConfigManager;

2
tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java
View File

@@ -64,7 +64,7 @@ public class ContactDiscoveryPreferenceControllerTest {
private static final int TEST_SUB_ID = 2; private static final int TEST_SUB_ID = 2;
private static final Uri UCE_URI = Uri.withAppendedPath(Telephony.SimInfo.CONTENT_URI, private static final Uri UCE_URI = Uri.withAppendedPath(Telephony.SimInfo.CONTENT_URI,
Telephony.SimInfo.IMS_RCS_UCE_ENABLED); Telephony.SimInfo.COLUMN_IMS_RCS_UCE_ENABLED);
@Mock private ImsManager mImsManager; @Mock private ImsManager mImsManager;
@Mock private ImsRcsManager mImsRcsManager; @Mock private ImsRcsManager mImsRcsManager;