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

Commit 41bb2cb6 authored by Lei Yu's avatar Lei Yu
Browse files

Handle null intent in WifiCallingPreferenceController 

When intent is null, we will hide wifi calling preference however
its listener might still triggered with null intent.

This CL update controller so it can handle this event inside listener
callback.

Fixes: 135095929
Test: RunSettingsRoboTests
Change-Id: I4c5aba03871f11a2d9f9b4da329c2c2655ff9adb
parent 78ef02eb

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

+4 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont 
        if (mSimCallManager != null) {

            Intent intent = MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,

                    mSimCallManager);

            if (intent == null) {

                // Do nothing in this case since preference is invisible

                return;

            }

            final PackageManager pm = mContext.getPackageManager();

            List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);

            preference.setTitle(resolutions.get(0).loadLabel(pm));

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

+9 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.Context; 
import android.content.Intent;

import android.os.PersistableBundle;

import android.provider.Settings;

import android.telecom.PhoneAccountHandle;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -117,6 +118,14 @@ public class WifiCallingPreferenceControllerTest { 
        assertThat(mPreference.isEnabled()).isFalse();

    }



    @Test

    public void updateState_invalidPhoneAccountHandle_shouldNotCrash() {

        mController.mSimCallManager = new PhoneAccountHandle(null /* invalid */, "");



        //Should not crash

        mController.updateState(mPreference);

    }



    @Test

    public void updateState_wfcNonRoaming() {

        assertNull(mController.mSimCallManager);