commit 11033db806e3d26071ca65a1a9097fd22ad8da50
author Po-Chun Lee <pochunlee@google.com> Tue Nov 15 10:21:03 2022 +0000
committer Po-Chun Lee <pochunlee@google.com> Wed Nov 16 18:03:55 2022 +0000
tree eeac2cb0f1304530c00800d5bccedbffe985c424
parent 267f5ad8ae1657a68dce412366eba3f37ef26207

Request CONNECTIVITY_USE_RESTRICTED_NETWORKS permission

After Android U, Iwlan runs with non-privileged permission.
Iwlan requires CONNECTIVITY_USE_RESTRICTED_NETWORKS permission for
registerSystemDefaultNetworkCallback() instead of NETWORK_SETTINGS
because NETWORK_SETTINGS can only be granted to a very limited set of UIDs.

Bug: 259216046
Test: VoWiFi on-device regression
Change-Id: I60fdb25b3df4616130ba102484379b105f0ca29a

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d6db694..22bff6a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -8,7 +8,7 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.MANAGE_IPSEC_TUNNELS" />
-  <uses-permission android:name="android.permission.NETWORK_SETTINGS"/>
+  <uses-permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
   <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
   <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

com.google.android.iwlan.xml

diff --git a/com.google.android.iwlan.xml b/com.google.android.iwlan.xml
index 467a2c9..f37b7c8 100644
--- a/com.google.android.iwlan.xml
+++ b/com.google.android.iwlan.xml
@@ -2,5 +2,6 @@
 <permissions>
     <privapp-permissions package="com.google.android.iwlan">
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
     </privapp-permissions>
 </permissions>