Merge changes from topic "wifi-manager-constructors" (3a9a1fb8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -4853,6 +4853,10 @@ package android.net.wifi {
		field @Deprecated public static final int WPA2_PSK = 4; // 0x4
		}

		public class WifiFrameworkInitializer {
		method public static void registerServiceWrappers();
		}

		public class WifiInfo implements android.os.Parcelable {
		method @Nullable public String getAppPackageName();
		method public double getRxSuccessRate();

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ public class Svc {
		COMMAND_HELP,
		new PowerCommand(),
		new DataCommand(),
		new WifiCommand(),
		// `svc wifi` has been migrated to WifiShellCommand
		new UsbCommand(),
		new NfcCommand(),
		new BluetoothCommand(),

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

deleted100644 → 0

+0 −69

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.commands.svc;

		import android.os.ServiceManager;
		import android.os.RemoteException;
		import android.net.wifi.IWifiManager;
		import android.content.Context;

		public class WifiCommand extends Svc.Command {
		public WifiCommand() {
		super("wifi");
		}

		public String shortHelp() {
		return "Control the Wi-Fi manager";
		}

		public String longHelp() {
		return shortHelp() + "\n"
		+ "\n"
		+ "usage: svc wifi [enable\|disable]\n"
		+ " Turn Wi-Fi on or off.\n\n";
		}

		public void run(String[] args) {
		boolean validCommand = false;
		if (args.length >= 2) {
		boolean flag = false;
		if ("enable".equals(args[1])) {
		flag = true;
		validCommand = true;
		} else if ("disable".equals(args[1])) {
		flag = false;
		validCommand = true;
		}
		if (validCommand) {
		IWifiManager wifiMgr
		= IWifiManager.Stub.asInterface(ServiceManager.getService(Context.WIFI_SERVICE));
		if (wifiMgr == null) {
		System.err.println("Wi-Fi service is not ready");
		return;
		}
		try {
		wifiMgr.setWifiEnabled("com.android.shell", flag);
		}
		catch (RemoteException e) {
		System.err.println("Wi-Fi operation failed: " + e);
		}
		return;
		}
		}
		System.err.println(longHelp());
		}
		}

cmds/svc/svc

+21 −0

Original line number	Diff line number	Diff line
		#!/system/bin/sh

		# `svc wifi` has been migrated to WifiShellCommand,
		# simply perform translation to `cmd wifi set-wifi-enabled` here.
		if [ "x$1" == "xwifi" ]; then
		# `cmd wifi` by convention uses enabled/disabled
		# instead of enable/disable
		if [ "x$2" == "xenable" ]; then
		exec cmd wifi set-wifi-enabled enabled
		elif [ "x$2" == "xdisable" ]; then
		exec cmd wifi set-wifi-enabled disabled
		else
		echo "Control the Wi-Fi manager"
		echo ""
		echo "usage: svc wifi [enable\|disable]"
		echo " Turn Wi-Fi on or off."
		echo ""
		fi
		exit 1
		fi

		export CLASSPATH=/system/framework/svc.jar
		exec app_process /system/bin com.android.commands.svc.Svc "$@"

core/java/android/app/SystemServiceRegistry.java

+2 −70

Original line number	Diff line number	Diff line
		@@ -116,16 +116,7 @@ import android.net.lowpan.ILowpanManager;
		import android.net.lowpan.LowpanManager;
		import android.net.nsd.INsdManager;
		import android.net.nsd.NsdManager;
		import android.net.wifi.IWifiScanner;
		import android.net.wifi.RttManager;
		import android.net.wifi.WifiManager;
		import android.net.wifi.WifiScanner;
		import android.net.wifi.aware.IWifiAwareManager;
		import android.net.wifi.aware.WifiAwareManager;
		import android.net.wifi.p2p.IWifiP2pManager;
		import android.net.wifi.p2p.WifiP2pManager;
		import android.net.wifi.rtt.IWifiRttManager;
		import android.net.wifi.rtt.WifiRttManager;
		import android.net.wifi.WifiFrameworkInitializer;
		import android.nfc.NfcManager;
		import android.os.BatteryManager;
		import android.os.BatteryStats;
		@@ -691,66 +682,6 @@ public final class SystemServiceRegistry {
		ConnectivityThread.getInstanceLooper());
		}});

		registerService(Context.WIFI_SERVICE, WifiManager.class,
		new CachedServiceFetcher<WifiManager>() {
		@Override
		public WifiManager createService(ContextImpl ctx) {
		return new WifiManager(ctx.getOuterContext(),
		ConnectivityThread.getInstanceLooper());
		}});

		registerService(Context.WIFI_P2P_SERVICE, WifiP2pManager.class,
		new StaticServiceFetcher<WifiP2pManager>() {
		@Override
		public WifiP2pManager createService() throws ServiceNotFoundException {
		IBinder b = ServiceManager.getServiceOrThrow(Context.WIFI_P2P_SERVICE);
		IWifiP2pManager service = IWifiP2pManager.Stub.asInterface(b);
		return new WifiP2pManager(service);
		}});

		registerService(Context.WIFI_AWARE_SERVICE, WifiAwareManager.class,
		new CachedServiceFetcher<WifiAwareManager>() {
		@Override
		public WifiAwareManager createService(ContextImpl ctx) throws ServiceNotFoundException {
		IBinder b = ServiceManager.getServiceOrThrow(Context.WIFI_AWARE_SERVICE);
		IWifiAwareManager service = IWifiAwareManager.Stub.asInterface(b);
		if (service == null) {
		return null;
		}
		return new WifiAwareManager(ctx.getOuterContext(), service);
		}});

		registerService(Context.WIFI_SCANNING_SERVICE, WifiScanner.class,
		new CachedServiceFetcher<WifiScanner>() {
		@Override
		public WifiScanner createService(ContextImpl ctx) throws ServiceNotFoundException {
		IBinder b = ServiceManager.getServiceOrThrow(Context.WIFI_SCANNING_SERVICE);
		IWifiScanner service = IWifiScanner.Stub.asInterface(b);
		return new WifiScanner(ctx.getOuterContext(), service,
		ConnectivityThread.getInstanceLooper());
		}});

		registerService(Context.WIFI_RTT_SERVICE, RttManager.class,
		new CachedServiceFetcher<RttManager>() {
		@Override
		public RttManager createService(ContextImpl ctx) throws ServiceNotFoundException {
		IBinder b = ServiceManager.getServiceOrThrow(Context.WIFI_RTT_RANGING_SERVICE);
		IWifiRttManager service = IWifiRttManager.Stub.asInterface(b);
		return new RttManager(ctx.getOuterContext(),
		new WifiRttManager(ctx.getOuterContext(), service));
		}});

		registerService(Context.WIFI_RTT_RANGING_SERVICE, WifiRttManager.class,
		new CachedServiceFetcher<WifiRttManager>() {
		@Override
		public WifiRttManager createService(ContextImpl ctx)
		throws ServiceNotFoundException {
		IBinder b = ServiceManager.getServiceOrThrow(
		Context.WIFI_RTT_RANGING_SERVICE);
		IWifiRttManager service = IWifiRttManager.Stub.asInterface(b);
		return new WifiRttManager(ctx.getOuterContext(), service);
		}});

		registerService(Context.ETHERNET_SERVICE, EthernetManager.class,
		new CachedServiceFetcher<EthernetManager>() {
		@Override
		@@ -1265,6 +1196,7 @@ public final class SystemServiceRegistry {
		BlobStoreManagerFrameworkInitializer.initialize();
		TelephonyFrameworkInitializer.registerServiceWrappers();
		AppSearchManagerFrameworkInitializer.initialize();
		WifiFrameworkInitializer.registerServiceWrappers();
		} finally {
		// If any of the above code throws, we're in a pretty bad shape and the process
		// will likely crash, but we'll reset it just in case there's an exception handler...