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

Commit 52ee97e8 authored by Collin Fijalkovich's avatar Collin Fijalkovich Committed by Android (Google) Code Review
Browse files

Merge "Disable Telephony service handle caching while testing."

parents 567f1fb0 8e5ca43a

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -383,6 +383,7 @@ 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();
@@ -645,6 +646,7 @@ 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) {