Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c95bb5c authored by Peter Wang's avatar Peter Wang Committed by Android (Google) Code Review
Browse files

Merge "[API Review] APIs in SubscriptionManager" into rvc-dev

parents 13ee012d 4aeb063f

src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;