Merge "Improve Wi-Fi hand-off"

This commit is contained in:
Irfan Sheriff
2012-02-29 19:33:06 -08:00
committed by Android (Google) Code Review
11 changed files with 703 additions and 847 deletions

View File

@ -914,7 +914,7 @@ public class WifiService extends IWifiManager.Stub {
* Get a reference to handler. This is used by a client to establish
* an AsyncChannel communication with WifiService
*/
public Messenger getMessenger() {
public Messenger getWifiServiceMessenger() {
/* Enforce the highest permissions
TODO: when we consider exposing the asynchronous API, think about
how to provide both access and change permissions seperately
@ -924,6 +924,13 @@ public class WifiService extends IWifiManager.Stub {
return new Messenger(mAsyncServiceHandler);
}
/** Get a reference to WifiStateMachine handler for AsyncChannel communication */
public Messenger getWifiStateMachineMessenger() {
enforceAccessPermission();
enforceChangePermission();
return mWifiStateMachine.getMessenger();
}
/**
* Get the IP and proxy configuration file
*/