| commit | 6c95bb5cf6fe6aea221f6fe8648d2d4ad37520cb | [log] [tgz] |
|---|---|---|
| author | Peter Wang <tpwang@google.com> | Thu Mar 19 20:07:39 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 19 20:07:39 2020 +0000 |
| tree | 55c81b3f2f751d051cfab04bd335b569891992e5 | |
| parent | 13ee012dce4711c96649fa2ea8ae29d625636b92 [diff] | |
| parent | 4aeb063f75e58be4efbd838365f618be735a02de [diff] |
Merge "[API Review] APIs in SubscriptionManager" into rvc-dev
diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java index f3fdcc9..21d49d9 100644 --- a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java +++ b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
@@ -42,7 +42,7 @@ implements LifecycleObserver { private static final String TAG = "ContactDiscoveryPref"; 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 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 45a4563..0370bfa 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 @@ private static final int TEST_SUB_ID = 2; 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 ImsRcsManager mImsRcsManager;