Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up RLog usage"

Browse Source
This commit is contained in:
Treehugger Robot
2019-11-23 02:12:07 +00:00
committed by Gerrit Code Review
parent 35cf55c4eb c742cb04d3
commit 3d0a47e717
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/CarrierDefaultReceiverTest.java
View File

@@ -21,7 +21,6 @@ import android.app.PendingIntent;
import android.content.Intent; import android.content.Intent;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.Rlog;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;
@@ -90,12 +89,10 @@ public class CarrierDefaultReceiverTest extends InstrumentationTestCase {
Intent intent = new Intent(TelephonyIntents.ACTION_CARRIER_SIGNAL_REDIRECTED); Intent intent = new Intent(TelephonyIntents.ACTION_CARRIER_SIGNAL_REDIRECTED);
intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId); intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
Rlog.d(TAG, "OnReceive redirection intent");
mReceiver.onReceive(mContext, intent); mReceiver.onReceive(mContext, intent);
mContext.waitForMs(100); mContext.waitForMs(100);
Rlog.d(TAG, "verify carrier action: showPortalNotification");
verify(mNotificationMgr, times(1)).notify(mString.capture(), mInt.capture(), verify(mNotificationMgr, times(1)).notify(mString.capture(), mInt.capture(),
mNotification.capture()); mNotification.capture());
assertEquals(PORTAL_NOTIFICATION_ID, (int) mInt.getValue()); assertEquals(PORTAL_NOTIFICATION_ID, (int) mInt.getValue());
@@ -103,7 +100,6 @@ public class CarrierDefaultReceiverTest extends InstrumentationTestCase {
PendingIntent pendingIntent = mNotification.getValue().contentIntent; PendingIntent pendingIntent = mNotification.getValue().contentIntent;
assertNotNull(pendingIntent); assertNotNull(pendingIntent);
Rlog.d(TAG, "verify carrier action: disable all metered apns");
verify(mTelephonyMgr).setCarrierDataEnabled(eq(false)); verify(mTelephonyMgr).setCarrierDataEnabled(eq(false));
} }
} }