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

Commit d9bb9a82 authored by David Su's avatar David Su
Browse files

SettingsLib: convert raw fields to getters 

Exposing getters as @SystemApi, migrate direct raw field
access to getters.

Bug: 144311098
Test: atest SettingsLibTests
Test: make RunSettingsLibRoboTests -j40
Change-Id: I3bcfd58661b5e28a3829e0f15bed384c4c08d7af
parent 1cdbf62f

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −1
Original line number Diff line number Diff line
@@ -1066,7 +1066,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 
            } else {

                summary.append(getSummary(mContext, /* ssid */ null, getDetailedState(),

                        mInfo != null && mInfo.isEphemeral(),

                        mInfo != null ? mInfo.getNetworkSuggestionOrSpecifierPackageName() : null));

                        mInfo != null ? mInfo.getAppPackageName() : null));

            }

        } else { // not active

            if (mConfig != null && mConfig.hasNoInternetAccess()) {

packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.net.wifi.WifiConfiguration; 
import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;

import android.net.wifi.WifiNetworkScoreCache;

import android.net.wifi.WifiSsid;

import android.os.Handler;

import android.os.Looper;

import android.provider.Settings;
@@ -189,7 +188,7 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback { 


    private String getValidSsid(WifiInfo info) {

        String ssid = info.getSSID();

        if (ssid != null && !WifiSsid.NONE.equals(ssid)) {

        if (ssid != null && !WifiManager.UNKNOWN_SSID.equals(ssid)) {

            return ssid;

        }

        // OK, it's not in the connectionInfo; we have to go hunting for it

packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java

+5 −5
Original line number Diff line number Diff line
@@ -96,14 +96,14 @@ public class WifiUtils { 
            visibility.append(" standard = ").append(info.getWifiStandard());

            visibility.append(" rssi=").append(info.getRssi());

            visibility.append(" ");

            visibility.append(" score=").append(info.score);

            visibility.append(" score=").append(info.getScore());

            if (accessPoint.getSpeed() != AccessPoint.Speed.NONE) {

                visibility.append(" speed=").append(accessPoint.getSpeedLabel());

            }

            visibility.append(String.format(" tx=%.1f,", info.txSuccessRate));

            visibility.append(String.format("%.1f,", info.txRetriesRate));

            visibility.append(String.format("%.1f ", info.txBadRate));

            visibility.append(String.format("rx=%.1f", info.rxSuccessRate));

            visibility.append(String.format(" tx=%.1f,", info.getTxSuccessRate()));

            visibility.append(String.format("%.1f,", info.getTxRetriesRate()));

            visibility.append(String.format("%.1f ", info.getTxBadRate()));

            visibility.append(String.format("rx=%.1f", info.getRxSuccessRate()));

        }



        int maxRssi5 = WifiConfiguration.INVALID_RSSI;

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class AccessPointTest { 
    private OsuProvider createOsuProvider() {

        Map<String, String> friendlyNames = new HashMap<>();

        friendlyNames.put("en", OSU_FRIENDLY_NAME);

        return new OsuProvider(null, friendlyNames, null, null, null, null, null);

        return new OsuProvider((WifiSsid) null, friendlyNames, null, null, null, null, null);

    }



    @Before
@@ -549,7 +549,7 @@ public class AccessPointTest { 
        WifiInfo wifiInfo = new WifiInfo();

        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_SSID));

        wifiInfo.setEphemeral(true);

        wifiInfo.setNetworkSuggestionOrSpecifierPackageName(appPackageName);

        wifiInfo.setAppPackageName(appPackageName);

        wifiInfo.setRssi(rssi);



        Context context = mock(Context.class);

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ public class WifiTrackerTest { 
    private static OsuProvider buildOsuProvider(String friendlyName) {

        Map<String, String> friendlyNames = new HashMap<>();

        friendlyNames.put("en", friendlyName);

        return new OsuProvider(null, friendlyNames, null, null, null, null, null);

        return new OsuProvider((WifiSsid) null, friendlyNames, null, null, null, null, null);

    }



    private WifiTracker createTrackerWithImmediateBroadcastsAndInjectInitialScanResults(