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

Commit 504c50bb authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add assert to TelephonyTest#setup" am: d06f5439 

am: baa22421

Change-Id: Id2637aa249db636c086db4225daa88720a003a18
parents 094f647b baa22421

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

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.internal.telephony;



import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;

import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Matchers.anyLong;
@@ -499,6 +500,8 @@ public abstract class TelephonyTest { 
        replaceInstance(PhoneFactory.class, "sSubInfoRecordUpdater", null, mSubInfoRecordUpdater);

        replaceInstance(RadioConfig.class, "sRadioConfig", null, mMockRadioConfig);



        assertNotNull("Failed to set up SubscriptionController singleton",

                SubscriptionController.getInstance());

        setReady(false);

    }