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

Commit 71c6c3e5 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge changes I96574a79,I74681222 into main 

* changes:
  Fix the testcase failed
  Add the log for SidecarFragment
parents 3b856490 c9a3eeb7

src/com/android/settings/network/SwitchSlotSidecar.java

+2 −0
Original line number Diff line number Diff line
@@ -130,11 +130,13 @@ public class SwitchSlotSidecar 
        } catch (UiccSlotsException e) {

            result.exception = e;

        }

        Log.i(TAG, "return command.");

        return result;

    }



    @Override

    protected void onPostExecute(Result result) {

        Log.i(TAG, "onPostExecute: get result");

        if (result.exception == null) {

            setState(State.SUCCESS, Substate.UNUSED);

        } else {

tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ public class MobileNetworkPreferenceControllerTest { 
        mContext = spy(ApplicationProvider.getApplicationContext());

        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);

        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);

        when(mSubscriptionManager.createForAllUserProfiles()).thenReturn(mSubscriptionManager);

        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);

        if (Looper.myLooper() == null) {

            Looper.prepare();