From 88de094fe82fc7bbe1f9adbb6cbb4047f3b30d6e Mon Sep 17 00:00:00 2001 From: Anthony Stange Date: Wed, 18 Mar 2020 19:33:47 +0000 Subject: [PATCH] Revert "[API Review] APIs in SubscriptionManager" Revert submission 10700361-api-compile Reason for revert: Build breakage Reverted Changes: I06280dbb0:[API Review] APIs in SubscriptionManager I7bb9b088f:[API Review] APIs in SubscriptionManager Iefc047f1f:[API Review] APIs in SubscriptionManager I02dcb21cd:[API Review] APIs in SubscriptionManager Ibedb31825:[API Review] APIs in SubscriptionManager I77cad8f82:[API Review] APIs in SubscriptionManager I80a51d2b8:[API Review] APIs in SubscriptionManager Change-Id: I327cb795c724239316a2eaf306d983c2b896a3fe --- .../network/telephony/ContactDiscoveryPreferenceController.java | 2 +- .../telephony/ContactDiscoveryPreferenceControllerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java index 21d49d9b2b9..f3fdcc9bf1c 100644 --- a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java +++ b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java @@ -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; diff --git a/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java index 0370bfa00c6..45a4563f55e 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java @@ -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;