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

Commit 214cee0d authored by Roland Levillain's avatar Roland Levillain Committed by Android (Google) Code Review
Browse files

Merge "Revert "Disable Telephony service handle caching while testing.""

parents 004f633f cfe0e3a9

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -383,7 +383,6 @@ public abstract class TelephonyTest { 
    protected void setUp(String tag) throws Exception {

    protected void setUp(String tag) throws Exception {

        TAG = tag;

        TAG = tag;

        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);

        TelephonyManager.disableServiceHandleCaching();





        mPhones = new Phone[] {mPhone};

        mPhones = new Phone[] {mPhone};

        mImsCallProfile = new ImsCallProfile();

        mImsCallProfile = new ImsCallProfile();
@@ -646,7 +645,6 @@ public abstract class TelephonyTest { 
        sharedPreferences.edit().clear().commit();

        sharedPreferences.edit().clear().commit();





        restoreInstances();

        restoreInstances();

        TelephonyManager.enableServiceHandleCaching();

    }

    }





    protected static void logd(String s) {

    protected static void logd(String s) {