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

Commit e98c0a5d authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Replace ConnectivityManager hidden symbols on Telephony" am: 45afd727 am: 83c4da5b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1608056

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide784d1a880e4d4b0d98aaa7f5319b88752ca866
parents ed9c76d7 83c4da5b

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

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ public class DeviceStateMonitor extends Handler { 
        filter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);

        filter.addAction(BatteryManager.ACTION_CHARGING);

        filter.addAction(BatteryManager.ACTION_DISCHARGING);

        filter.addAction(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);

        filter.addAction(TetheringManager.ACTION_TETHER_STATE_CHANGED);

        filter.addAction(UiModeManager.ACTION_ENTER_CAR_MODE_PRIORITIZED);

        filter.addAction(UiModeManager.ACTION_EXIT_CAR_MODE_PRIORITIZED);

        mPhone.getContext().registerReceiver(mBroadcastReceiver, filter, null, mPhone);

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

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.annotation.IntDef; 
import android.content.Intent;

import android.hardware.radio.V1_5.IndicationFilter;

import android.net.ConnectivityManager;

import android.net.TetheringManager;

import android.os.BatteryManager;

import android.os.Message;

import android.test.suitebuilder.annotation.MediumTest;
@@ -241,7 +242,7 @@ public class DeviceStateMonitorTest extends TelephonyTest { 
    @Test

    public void testTethering() {

        // Turn tethering on

        Intent intent = new Intent(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);

        Intent intent = new Intent(TetheringManager.ACTION_TETHER_STATE_CHANGED);

        intent.putExtra(ConnectivityManager.EXTRA_ACTIVE_TETHER, new ArrayList<>(asList("abc")));

        mContext.sendBroadcast(intent);

        processAllMessages();