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

Commit 64efbe12 authored by Hunter Knepshield's avatar Hunter Knepshield Committed by Gerrit Code Review
Browse files

Merge "Synced the code from master branch"

parents 2b7c8937 f3865e92

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

+2 −4
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import android.content.Context; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;

import android.widget.Toast;
@@ -159,10 +157,10 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 


    @VisibleForTesting

    CharSequence getFormattedPhoneNumber(SubscriptionInfo subscriptionInfo) {

        final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,

        final String phoneNumber = DeviceInfoUtils.getBidiFormattedPhoneNumber(mContext,

                subscriptionInfo);

        return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)

                : BidiFormatter.getInstance().unicodeWrap(phoneNumber, TextDirectionHeuristics.LTR);

                : phoneNumber;

    }



    @VisibleForTesting

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+2 −9
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ import android.telephony.SubscriptionManager; 
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.telephony.TelephonyManager;

import android.telephony.euicc.EuiccManager;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;



import androidx.annotation.NonNull;
@@ -224,8 +222,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 


    private void updatePhoneNumber() {

        // If formattedNumber is null or empty, it'll display as "Unknown".

        mDialog.setText(PHONE_NUMBER_VALUE_ID, BidiFormatter.getInstance().unicodeWrap(

                getPhoneNumber(), TextDirectionHeuristics.LTR));

        mDialog.setText(PHONE_NUMBER_VALUE_ID,

                DeviceInfoUtils.getBidiFormattedPhoneNumber(mContext, mSubscriptionInfo));

    }



    private void updateDataState(int state) {
@@ -461,11 +459,6 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        };

    }



    @VisibleForTesting

    String getPhoneNumber() {

        return DeviceInfoUtils.getFormattedPhoneNumber(mContext, mSubscriptionInfo);

    }



    @VisibleForTesting

    SignalStrength getSignalStrength() {

        return mTelephonyManager.getSignalStrength();

src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java

+2 −4
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.content.Intent; 
import android.net.Uri;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;



import androidx.annotation.VisibleForTesting;
@@ -100,10 +98,10 @@ public class DeviceInfoSlice implements CustomSliceable { 
        if (subscriptionInfo == null) {

            return mContext.getString(R.string.device_info_default);

        }

        final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,

        final String phoneNumber = DeviceInfoUtils.getBidiFormattedPhoneNumber(mContext,

                subscriptionInfo);

        return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)

                : BidiFormatter.getInstance().unicodeWrap(phoneNumber, TextDirectionHeuristics.LTR);

                : phoneNumber;

    }



    private CharSequence getDeviceModel() {

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

+1 −6
Original line number Diff line number Diff line
@@ -28,14 +28,11 @@ import android.telephony.ServiceState; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.AdapterView;

import android.widget.ArrayAdapter;

import android.widget.EditText;

import android.widget.ImageView;
@@ -159,9 +156,7 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen 
        phoneTitle.setVisibility(info.isOpportunistic() ? View.GONE : View.VISIBLE);



        final TextView phoneNumber = view.findViewById(R.id.number_value);

        final String formattedNumber = DeviceInfoUtils.getFormattedPhoneNumber(getContext(), info);

        phoneNumber.setText(BidiFormatter.getInstance().unicodeWrap(formattedNumber,

                TextDirectionHeuristics.LTR));

        phoneNumber.setText(DeviceInfoUtils.getBidiFormattedPhoneNumber(getContext(), info));

    }



    @Override

tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java

+15 −3
Original line number Diff line number Diff line
@@ -70,8 +70,11 @@ import android.telephony.euicc.EuiccManager; 
import androidx.lifecycle.LifecycleOwner;



import com.android.settings.R;

import com.android.settings.testutils.shadow.ShadowDeviceInfoUtils;

import com.android.settingslib.DeviceInfoUtils;

import com.android.settingslib.core.lifecycle.Lifecycle;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -80,10 +83,12 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.Shadows;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowPackageManager;

import org.robolectric.util.ReflectionHelpers;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowDeviceInfoUtils.class})

public class SimStatusDialogControllerTest {



    @Mock
@@ -120,11 +125,11 @@ public class SimStatusDialogControllerTest { 
        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

        mController = spy(new SimStatusDialogController(mDialog, mLifecycle, 0 /* phone id */));

        ShadowDeviceInfoUtils.setPhoneNumber("");

        doReturn(mServiceState).when(mController).getCurrentServiceState();

        doReturn(0).when(mSignalStrength).getDbm();

        doReturn(0).when(mSignalStrength).getAsuLevel();

        doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();

        doReturn("").when(mController).getPhoneNumber();

        doReturn(mSignalStrength).when(mController).getSignalStrength();

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
@@ -147,6 +152,11 @@ public class SimStatusDialogControllerTest { 
        shadowPackageManager.addPackage(sysUIPackageInfo);

    }



    @After

    public void tearDown() {

        ShadowDeviceInfoUtils.reset();

    }



    @Test

    public void initialize_updateNetworkProviderWithFoobarCarrier_shouldUpdateCarrierWithFoobar() {

        final CharSequence carrierName = "foobar";
@@ -159,8 +169,10 @@ public class SimStatusDialogControllerTest { 


    @Test

    public void initialize_updatePhoneNumberWith1111111111_shouldUpdatePhoneNumber() {

        final String phoneNumber = "1111111111";

        doReturn(phoneNumber).when(mController).getPhoneNumber();

        ShadowDeviceInfoUtils.setPhoneNumber("1111111111");



        final String phoneNumber = DeviceInfoUtils.getBidiFormattedPhoneNumber(mContext,

                mSubscriptionInfo);



        mController.initialize();