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

Commit 49470fb0 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Remove unused code. 

Test: none
Bug: 64131518
Change-Id: I06663e6aa415cb15e35399596433e1d9d5ba7c3f
parent 1c57fc96

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

+0 −12
Original line number Diff line number Diff line
@@ -54,24 +54,12 @@ public interface IccCard { 
     */

    public IccFileHandler getIccFileHandler();



    /**

     * Notifies handler of any transition into IccCardConstants.State.ABSENT

     */

    public void registerForAbsent(Handler h, int what, Object obj);

    public void unregisterForAbsent(Handler h);



    /**

     * Notifies handler of any transition into IccCardConstants.State.NETWORK_LOCKED

     */

    public void registerForNetworkLocked(Handler h, int what, Object obj);

    public void unregisterForNetworkLocked(Handler h);



    /**

     * Notifies handler of any transition into IccCardConstants.State.isPinLocked()

     */

    public void registerForLocked(Handler h, int what, Object obj);

    public void unregisterForLocked(Handler h);



    /**

     * Supply the ICC PIN to the ICC

     *

src/java/com/android/internal/telephony/uicc/IccCardProxy.java

+0 −71
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ public class IccCardProxy extends Handler implements IccCard { 
    private CommandsInterface mCi;

    private TelephonyManager mTelephonyManager;



    private RegistrantList mAbsentRegistrants = new RegistrantList();

    private RegistrantList mPinLockedRegistrants = new RegistrantList();

    private RegistrantList mNetworkLockedRegistrants = new RegistrantList();



    private int mCurrentAppType = UiccController.APP_FAM_3GPP; //default to 3gpp?
@@ -244,7 +242,6 @@ public class IccCardProxy extends Handler implements IccCard { 
                }

                break;

            case EVENT_ICC_ABSENT:

                mAbsentRegistrants.notifyRegistrants();

                setExternalState(State.ABSENT);

                break;

            case EVENT_ICC_LOCKED:
@@ -570,10 +567,6 @@ public class IccCardProxy extends Handler implements IccCard { 
                broadcastIccStateChangedIntent(getIccStateIntentString(mExternalState),

                        getIccStateReason(mExternalState));

            }

            // TODO: Need to notify registrants for other states as well.

            if ( State.ABSENT == mExternalState) {

                mAbsentRegistrants.notifyRegistrants();

            }

        }

    }
@@ -592,7 +585,6 @@ public class IccCardProxy extends Handler implements IccCard { 
            AppState appState = mUiccApplication.getState();

            switch (appState) {

                case APPSTATE_PIN:

                    mPinLockedRegistrants.notifyRegistrants();

                    setExternalState(State.PIN_REQUIRED);

                    break;

                case APPSTATE_PUK:
@@ -677,29 +669,6 @@ public class IccCardProxy extends Handler implements IccCard { 
        }

    }



    /**

     * Notifies handler of any transition into State.ABSENT

     */

    @Override

    public void registerForAbsent(Handler h, int what, Object obj) {

        synchronized (mLock) {

            Registrant r = new Registrant (h, what, obj);



            mAbsentRegistrants.add(r);



            if (getState() == State.ABSENT) {

                r.notifyRegistrant();

            }

        }

    }



    @Override

    public void unregisterForAbsent(Handler h) {

        synchronized (mLock) {

            mAbsentRegistrants.remove(h);

        }

    }



    /**

     * Notifies handler of any transition into State.NETWORK_LOCKED

     */
@@ -723,29 +692,6 @@ public class IccCardProxy extends Handler implements IccCard { 
        }

    }



    /**

     * Notifies handler of any transition into State.isPinLocked()

     */

    @Override

    public void registerForLocked(Handler h, int what, Object obj) {

        synchronized (mLock) {

            Registrant r = new Registrant (h, what, obj);



            mPinLockedRegistrants.add(r);



            if (getState().isPinLocked()) {

                r.notifyRegistrant();

            }

        }

    }



    @Override

    public void unregisterForLocked(Handler h) {

        synchronized (mLock) {

            mPinLockedRegistrants.remove(h);

        }

    }



    @Override

    public void supplyPin(String pin, Message onComplete) {

        synchronized (mLock) {
@@ -936,13 +882,6 @@ public class IccCardProxy extends Handler implements IccCard { 
        }

    }



    private void setSystemProperty(String property, String value) {

        TelephonyManager.setTelephonyProperty(mPhoneId, property, value);

    }



    public IccRecords getIccRecord() {

        return mIccRecords;

    }

    private void log(String s) {

        Rlog.d(LOG_TAG, s);

    }
@@ -955,16 +894,6 @@ public class IccCardProxy extends Handler implements IccCard { 
        pw.println("IccCardProxy: " + this);

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

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

        pw.println(" mAbsentRegistrants: size=" + mAbsentRegistrants.size());

        for (int i = 0; i < mAbsentRegistrants.size(); i++) {

            pw.println("  mAbsentRegistrants[" + i + "]="

                    + ((Registrant)mAbsentRegistrants.get(i)).getHandler());

        }

        pw.println(" mPinLockedRegistrants: size=" + mPinLockedRegistrants.size());

        for (int i = 0; i < mPinLockedRegistrants.size(); i++) {

            pw.println("  mPinLockedRegistrants[" + i + "]="

                    + ((Registrant)mPinLockedRegistrants.get(i)).getHandler());

        }

        pw.println(" mNetworkLockedRegistrants: size=" + mNetworkLockedRegistrants.size());

        for (int i = 0; i < mNetworkLockedRegistrants.size(); i++) {

            pw.println("  mNetworkLockedRegistrants[" + i + "]="