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

Commit 40d177b2 authored by Ling Ma's avatar Ling Ma
Browse files

Instantiate displayInfo nonNull 

TelephonyDisplayInfo is always assumed non null. This change assign it a default value.

Bug: 261356610
Test: atest
Change-Id: Ic799427f70ef8a985614159caef1462095772927
parent ab907ab0

src/java/com/android/internal/telephony/DisplayInfoController.java

+5 −2
Original line number Diff line number Diff line
@@ -65,11 +65,14 @@ public class DisplayInfoController extends Handler { 
    private final Phone mPhone;

    private final NetworkTypeController mNetworkTypeController;

    private final RegistrantList mTelephonyDisplayInfoChangedRegistrants = new RegistrantList();

    private TelephonyDisplayInfo mTelephonyDisplayInfo;

    private @NonNull TelephonyDisplayInfo mTelephonyDisplayInfo;



    public DisplayInfoController(Phone phone) {

        mPhone = phone;

        mLogTag = "DIC-" + mPhone.getPhoneId();

        mTelephonyDisplayInfo = new TelephonyDisplayInfo(

                TelephonyManager.NETWORK_TYPE_UNKNOWN,

                TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE);

        mNetworkTypeController = new NetworkTypeController(phone, this);

        mNetworkTypeController.sendMessage(NetworkTypeController.EVENT_UPDATE);

    }
@@ -77,7 +80,7 @@ public class DisplayInfoController extends Handler { 
    /**

     * @return the current TelephonyDisplayInfo

     */

    public TelephonyDisplayInfo getTelephonyDisplayInfo() {

    public @NonNull TelephonyDisplayInfo getTelephonyDisplayInfo() {

        return mTelephonyDisplayInfo;

    }