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

Commit 11910065 authored by paulhu's avatar paulhu
Browse files

Replace ConnectivityManager hidden symbols on SettingsLib 

Connectivity is becoming a mainline module in S, so
ConnectivityManager hidden symbols can not be used for outside
components. Besides, most Tethering relevant methods or variables
on CM are migrated to TetheringManager. So replace all these
methods or variables from ConnectivityManager to TetheringManager
on SettingsLib.

Bug: 180693313
Test: atest SettingsLibRoboTests
Change-Id: I11e317ed0d3aab2628082bbe6b8292fec82109a9
parent a954e2dc

packages/SettingsLib/src/com/android/settingslib/Utils.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import android.location.LocationManager; 
import android.media.AudioManager;

import android.media.AudioManager;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;

import android.net.TetheringManager;

import android.net.vcn.VcnTransportInfo;

import android.net.vcn.VcnTransportInfo;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiInfo;

import android.os.BatteryManager;

import android.os.BatteryManager;
@@ -90,10 +91,10 @@ public class Utils { 
     * Return string resource that best describes combination of tethering

     * Return string resource that best describes combination of tethering

     * options available on this device.

     * options available on this device.

     */

     */

    public static int getTetheringLabel(ConnectivityManager cm) {

    public static int getTetheringLabel(TetheringManager tm) {

        String[] usbRegexs = cm.getTetherableUsbRegexs();

        String[] usbRegexs = tm.getTetherableUsbRegexs();

        String[] wifiRegexs = cm.getTetherableWifiRegexs();

        String[] wifiRegexs = tm.getTetherableWifiRegexs();

        String[] bluetoothRegexs = cm.getTetherableBluetoothRegexs();

        String[] bluetoothRegexs = tm.getTetherableBluetoothRegexs();





        boolean usbAvailable = usbRegexs.length != 0;

        boolean usbAvailable = usbRegexs.length != 0;

        boolean wifiAvailable = wifiRegexs.length != 0;

        boolean wifiAvailable = wifiRegexs.length != 0;

packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.content.pm.UserInfo;

import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.net.ConnectivityManager;

import android.net.TetheringManager;

import android.net.TrafficStats;

import android.net.TrafficStats;

import android.os.Process;

import android.os.Process;

import android.os.RemoteException;

import android.os.RemoteException;
@@ -123,9 +123,8 @@ public class UidDetailProvider { 
                detail.icon = pm.getDefaultActivityIcon();

                detail.icon = pm.getDefaultActivityIcon();

                return detail;

                return detail;

            case TrafficStats.UID_TETHERING:

            case TrafficStats.UID_TETHERING:

                final ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(

                final TetheringManager tm = mContext.getSystemService(TetheringManager.class);

                        Context.CONNECTIVITY_SERVICE);

                detail.label = res.getString(Utils.getTetheringLabel(tm));

                detail.label = res.getString(Utils.getTetheringLabel(cm));

                detail.icon = pm.getDefaultActivityIcon();

                detail.icon = pm.getDefaultActivityIcon();

                return detail;

                return detail;

            case Process.OTA_UPDATE_UID:

            case Process.OTA_UPDATE_UID: