Merge commit 'accde60f09508f9543a094247ed95ce2ae605912' into nyc-mr1-dev-plus-aosp

Change-Id: I732a9b0bb6e569be342a6df3640f4e539f9ccce0

cmds/svc/src/com/android/commands/svc/WifiCommand.java

@@ -52,7 +52,7 @@ public class WifiCommand extends Svc.Command {
                 IWifiManager wifiMgr
                         = IWifiManager.Stub.asInterface(ServiceManager.getService(Context.WIFI_SERVICE));
                 try {
-                    wifiMgr.setWifiEnabled("com.android.shell", flag);
+                    wifiMgr.setWifiEnabled(flag);
                 }
                 catch (RemoteException e) {
                     System.err.println("Wi-Fi operation failed: " + e);

core/res/res/values/config.xml

@@ -2582,13 +2582,6 @@
     <string-array translatable="false" name="config_defaultFirstUserRestrictions">
     </string-array>
 
-    <!-- Specifies whether the permissions needed by a legacy app should be
-         reviewed before any of its components can run. A legacy app is one
-         with targetSdkVersion < 23, i.e apps using the old permission model.
-         If review is not required, permissions are reviewed before the app
-         is installed. -->
-    <bool name="config_permissionReviewRequired">false</bool>
-
     <!-- Default value for android:focusableInTouchMode for some framework scrolling containers.
          ListView/GridView are notably absent since this is their default anyway.
          Set to true for watch devices. -->

core/res/res/values/symbols.xml

@@ -2703,9 +2703,6 @@
   <!-- Default first user restrictions -->
   <java-symbol type="array" name="config_defaultFirstUserRestrictions" />
 
-  <java-symbol type="bool" name="config_permissionReviewRequired" />
-
-
   <java-symbol type="drawable" name="ic_restart" />
 
 </resources>

wifi/java/android/net/wifi/IWifiManager.aidl

@@ -89,7 +89,7 @@ interface IWifiManager
 
     WifiInfo getConnectionInfo();
 
-    boolean setWifiEnabled(String packageName, boolean enable);
+    boolean setWifiEnabled(boolean enable);
 
     int getWifiEnabledState();
 

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

@@ -19,7 +19,6 @@ package android.net.wifi;
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
 import android.annotation.SystemApi;
-import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.DhcpInfo;
@@ -563,28 +562,6 @@ public class WifiManager {
     @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
     public static final String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";
 
-    /**
-     * Activity Action: Show UI to get user approval to enable WiFi.
-     * <p>Input: {@link android.content.Intent#EXTRA_PACKAGE_NAME} string extra with
-     *           the name of the app requesting the action.
-     * <p>Output: Nothing.
-     *
-     * @hide
-     */
-    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
-    public static final String ACTION_REQUEST_ENABLE = "android.net.wifi.action.REQUEST_ENABLE";
-
-    /**
-     * Activity Action: Show UI to get user approval to disable WiFi.
-     * <p>Input: {@link android.content.Intent#EXTRA_PACKAGE_NAME} string extra with
-     *           the name of the app requesting the action.
-     * <p>Output: Nothing.
-     *
-     * @hide
-     */
-    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
-    public static final String ACTION_REQUEST_DISABLE = "android.net.wifi.action.REQUEST_DISABLE";
-
     /**
      * Internally used Wi-Fi lock mode representing the case were no locks are held.
      * @hide
@@ -1468,7 +1445,7 @@ public class WifiManager {
      */
     public boolean setWifiEnabled(boolean enabled) {
         try {
-            return mService.setWifiEnabled(mContext.getOpPackageName(), enabled);
+            return mService.setWifiEnabled(enabled);
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }