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

Commit f40d9b8d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-0a134e0bcf3646c585b6c1147798cd1f" into rvc-qpr-dev-plus-aosp 

* changes:
  Merge "WifiManager.getCountryCode(): Change permission to NETWORK_SETTINGS" into rvc-dev am: 26db1f92 am: c696aca6 am: 0506cba8 am: b46d6c1c
  Merge "Revert "Shell: Grant NETWORK_STACK permission for CTS"" into rvc-dev am: 7637ab6f am: da4e47c2 am: b404ca55 am: 98e17069
parents c80c44e7 f5742f6a

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -7328,7 +7328,7 @@ package android.net.wifi { 
    method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void factoryReset();

    method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void factoryReset();

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void forget(int, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void forget(int, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>);

    method @Nullable @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public String getCountryCode();

    method @Nullable @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String getCountryCode();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.Network getCurrentNetwork();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.Network getCurrentNetwork();

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String[] getFactoryMacAddresses();

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String[] getFactoryMacAddresses();

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(@Nullable java.util.List<android.net.wifi.ScanResult>);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(@Nullable java.util.List<android.net.wifi.ScanResult>);

packages/Shell/AndroidManifest.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -204,7 +204,6 @@ 




    <!-- Permission needed to run network tests in CTS -->

    <!-- Permission needed to run network tests in CTS -->

    <uses-permission android:name="android.permission.MANAGE_TEST_NETWORKS" />

    <uses-permission android:name="android.permission.MANAGE_TEST_NETWORKS" />

    <uses-permission android:name="android.permission.NETWORK_STACK" />

    <!-- Permission needed to test tcp keepalive offload. -->

    <!-- Permission needed to test tcp keepalive offload. -->

    <uses-permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD" />

    <uses-permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD" />

wifi/java/android/net/wifi/WifiManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2826,7 +2826,7 @@ public class WifiManager { 
     */

     */

    @Nullable

    @Nullable

    @SystemApi

    @SystemApi

    @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL)

    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)

    public String getCountryCode() {

    public String getCountryCode() {

        try {

        try {

            return mService.getCountryCode();

            return mService.getCountryCode();