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

Commit 42503c2b authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Removed dead code" into main

parents e8495069 811d8ef9

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

+0 −27
Original line number Diff line number Diff line
@@ -281,9 +281,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    // Key used to read/write the ID for storing the call forwarding status

    public static final String CF_ID = "cf_id_key";



    // Key used to read/write "disable DNS server check" pref (used for testing)

    private static final String DNS_SERVER_CHECK_DISABLED_KEY = "dns_server_check_disabled_key";



    // Integer used to let the calling application know that the we are ignoring auto mode switch.

    private static final int ALREADY_IN_AUTO_SELECTION = 1;
@@ -334,7 +331,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public CommandsInterface mCi;

    protected int mVmCount = 0;

    private boolean mDnsCheckDisabled;

    protected DataNetworkController mDataNetworkController;

    /* Used for dispatching signals to configured carrier apps */

    protected CarrierSignalAgent mCarrierSignalAgent;
@@ -616,7 +612,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        setUnitTestMode(unitTestMode);



        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);

        mDnsCheckDisabled = sp.getBoolean(DNS_SERVER_CHECK_DISABLED_KEY, false);

        mCi.setOnCallRing(this, EVENT_CALL_RING, null);



        /* "Voice capable" means that this device supports circuit-switched
@@ -984,26 +979,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    // Will be called when icc changed

    protected abstract void onUpdateIccAvailability();



    /**

     * Disables the DNS check (i.e., allows "0.0.0.0").

     * Useful for lab testing environment.

     * @param b true disables the check, false enables.

     */

    public void disableDnsCheck(boolean b) {

        mDnsCheckDisabled = b;

        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());

        SharedPreferences.Editor editor = sp.edit();

        editor.putBoolean(DNS_SERVER_CHECK_DISABLED_KEY, b);

        editor.apply();

    }



    /**

     * Returns true if the DNS check is currently disabled.

     */

    public boolean isDnsCheckDisabled() {

        return mDnsCheckDisabled;

    }



    /**

     * Register for getting notifications for change in the Call State {@link Call.State}

     * This is called PreciseCallState because the call state is more precise than the
@@ -5364,7 +5339,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        pw.println("Phone: subId=" + getSubId());

        pw.println(" mPhoneId=" + mPhoneId);

        pw.println(" mCi=" + mCi);

        pw.println(" mDnsCheckDisabled=" + mDnsCheckDisabled);

        pw.println(" mDoesRilSendMultipleCallRing=" + mDoesRilSendMultipleCallRing);

        pw.println(" mCallRingContinueToken=" + mCallRingContinueToken);

        pw.println(" mCallRingDelay=" + mCallRingDelay);
@@ -5379,7 +5353,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        pw.println(" mNotifier=" + mNotifier);

        pw.println(" mSimulatedRadioControl=" + mSimulatedRadioControl);

        pw.println(" mUnitTestMode=" + mUnitTestMode);

        pw.println(" isDnsCheckDisabled()=" + isDnsCheckDisabled());

        pw.println(" getUnitTestMode()=" + getUnitTestMode());

        pw.println(" getState()=" + getState());

        pw.println(" getIccSerialNumber()=" + Rlog.pii(mLogTag, getIccSerialNumber()));