DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f'... (722de5f9) · Commits · e / os / android_frameworks_base

Android.mk

+4 −6

Original line number	Diff line number	Diff line
		@@ -452,9 +452,9 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
		telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
		wifi/java/android/net/wifi/IWifiManager.aidl \
		wifi/java/android/net/wifi/nan/IWifiNanEventListener.aidl \
		wifi/java/android/net/wifi/nan/IWifiNanEventCallback.aidl \
		wifi/java/android/net/wifi/nan/IWifiNanManager.aidl \
		wifi/java/android/net/wifi/nan/IWifiNanSessionListener.aidl \
		wifi/java/android/net/wifi/nan/IWifiNanSessionCallback.aidl \
		wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
		wifi/java/android/net/wifi/IWifiScanner.aidl \
		wifi/java/android/net/wifi/IRttManager.aidl \
		@@ -546,10 +546,8 @@ aidl_files := \
		frameworks/base/media/java/android/media/browse/MediaBrowser.aidl \
		frameworks/base/wifi/java/android/net/wifi/ScanSettings.aidl \
		frameworks/base/wifi/java/android/net/wifi/nan/ConfigRequest.aidl \
		frameworks/base/wifi/java/android/net/wifi/nan/PublishData.aidl \
		frameworks/base/wifi/java/android/net/wifi/nan/SubscribeData.aidl \
		frameworks/base/wifi/java/android/net/wifi/nan/PublishSettings.aidl \
		frameworks/base/wifi/java/android/net/wifi/nan/SubscribeSettings.aidl \
		frameworks/base/wifi/java/android/net/wifi/nan/PublishConfig.aidl \
		frameworks/base/wifi/java/android/net/wifi/nan/SubscribeConfig.aidl \
		frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pInfo.aidl \
		frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.aidl \
		frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pConfig.aidl \

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/java/android/app/SystemServiceRegistry.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -515,15 +515,15 @@ final class SystemServiceRegistry {
		}});

		registerService(Context.WIFI_NAN_SERVICE, WifiNanManager.class,
		new StaticServiceFetcher<WifiNanManager>() {
		new CachedServiceFetcher<WifiNanManager>() {
		@Override
		public WifiNanManager createService() {
		public WifiNanManager createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(Context.WIFI_NAN_SERVICE);
		IWifiNanManager service = IWifiNanManager.Stub.asInterface(b);
		if (service == null) {
		return null;
		}
		return new WifiNanManager(service);
		return new WifiNanManager(ctx.getOuterContext(), service);
		}});

		registerService(Context.WIFI_SCANNING_SERVICE, WifiScanner.class,

core/java/android/content/Context.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3137,7 +3137,7 @@ public abstract class Context {
		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.net.wifi.nan.WifiNanManager} for handling management of
		* Wi-Fi NAN discovery and connections.
		* Wi-Fi NAN.
		*
		* @see #getSystemService
		* @see android.net.wifi.nan.WifiNanManager

core/java/android/content/pm/PackageManager.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -2040,8 +2040,7 @@ public abstract class PackageManager {

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device supports Wi-Fi Aware (NAN)
		* networking.
		* {@link #hasSystemFeature}: The device supports Wi-Fi NAN.
		*
		* @hide PROPOSED_NAN_API
		*/