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

Commit 0ab209c7 authored by Mitchell Wills's avatar Mitchell Wills Committed by Android (Google) Code Review
Browse files

Merge changes I21fc6802,I8839c6cc 

* changes:
  Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
  Revert "DO NOT MERGE Revert "Add WiFi toggle prompts - framework""
parents 2c0a2111 b3802812

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class WifiCommand extends Svc.Command { 
                IWifiManager wifiMgr

                        = IWifiManager.Stub.asInterface(ServiceManager.getService(Context.WIFI_SERVICE));

                try {

                    wifiMgr.setWifiEnabled(flag);

                    wifiMgr.setWifiEnabled("com.android.shell", flag);

                }

                catch (RemoteException e) {

                    System.err.println("Wi-Fi operation failed: " + e);

core/res/res/values/config.xml

+7 −0
Original line number Diff line number Diff line
@@ -2595,6 +2595,13 @@ 
    <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

+3 −0
Original line number Diff line number Diff line
@@ -2707,6 +2707,9 @@ 
  <!-- 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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ interface IWifiManager 


    WifiInfo getConnectionInfo();



    boolean setWifiEnabled(boolean enable);

    boolean setWifiEnabled(String packageName, boolean enable);



    int getWifiEnabledState();

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

+24 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 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;
@@ -562,6 +563,28 @@ 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
@@ -1445,7 +1468,7 @@ public class WifiManager { 
     */

    public boolean setWifiEnabled(boolean enabled) {

        try {

            return mService.setWifiEnabled(enabled);

            return mService.setWifiEnabled(mContext.getOpPackageName(), enabled);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }