Merge "Revert "[API Review] APIs in SubscriptionManager""

This commit is contained in:
Anthony Stange
2020-03-18 19:41:22 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

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

View File

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