commit 85eca488e562275de3f5395fb5ad58d3bd8218bd
author Lorenzo Colitti <lorenzo@google.com> Tue Oct 09 18:50:32 2018 +0900
committer Lorenzo Colitti <lorenzo@google.com> Wed Oct 10 17:50:05 2018 +0900
tree 006813524466c90261eaadb8085520d3067dd282
parent a788eabd7231ce2ab88a37b7762d20bcb81600ab

Make setAirplaneMode @SystemApi for SetupWizard.

Expose ConnectivityManager#setAirplaneMode and the
NETWORK_SETUP_WIZARD permission so that SetupWizard can call
setAirplaneMode.

Delete setAirplaneMode from the greylist because the permissions
checks on it, since at least 2013, have been for a privileged
permission (CONNECTIVITY_INTERNAL) that normal apps don't have.

Test: m
Bug: 115302596
Change-Id: I28f24d32c4b4b386407e9e0e3514ea9f8854f4a8

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 8333b81..ee38612 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -2728,7 +2728,7 @@
      * @hide
      */
     @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL)
-    @UnsupportedAppUsage
+    @SystemApi
     public void setAirplaneMode(boolean enable) {
         try {
             mService.setAirplaneMode(enable);