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

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

Merge "Replace ConnectivityManager hidden symbols on Telephony" into sc-dev am: 2899b78c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52722368b17959b80956124106a7560884c00619
parents 1451d91b 2899b78c

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

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,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);

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



        mPhone.mCi.registerForRilConnected(this, EVENT_RIL_CONNECTED, null);

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

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.content.Context; 
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;
@@ -250,7 +251,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();