Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add NetworkFactory support.

Browse Source 
This is a protocol allowing transports to dynamically register with CS for
Handler to Handler communications.

bug:13885501
Change-Id: Ic7275e3724a15efc7e5f80981560c4cb3106007b
This commit is contained in:
Robert Greenwalt
2014-04-11 15:53:27 -07:00
parent 0191c33539
commit e049c23980
5 changed files with 111 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/net/ConnectivityManager.java
View File

@@ -1587,4 +1587,11 @@ public class ConnectivityManager {
} catch (RemoteException e) {
}
}
/** {@hide} */
public void registerNetworkFactory(Messenger messenger) {
try {
mService.registerNetworkFactory(messenger);
} catch (RemoteException e) { }
}
}

48
core/java/android/net/ConnectivityServiceProtocol.java Normal file
View File

@@ -0,0 +1,48 @@
/*
* Copyright (C) 2014 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 android.net;
import static com.android.internal.util.Protocol.BASE_CONNECTIVITY_SERVICE;
/**
* Describes the Internal protocols used to communicate with ConnectivityService.
* @hide
*/
public class ConnectivityServiceProtocol {
private ConnectivityServiceProtocol() {}
private static final int BASE = BASE_CONNECTIVITY_SERVICE;
public static class NetworkFactoryProtocol {
private NetworkFactoryProtocol() {}
/**
* Pass a network request to the transport
* msg.obj = NetworkRequest
*/
public static final int CMD_REQUEST_NETWORK = BASE;
/**
* Cancel a network request
* msg.obj = NetworkRequest
*/
public static final int CMD_CANCEL_REQUEST = BASE + 1;
}
public static class NetworkAgentProtocol {
private NetworkAgentProtocol() {}
}
}

2
core/java/android/net/IConnectivityManager.aidl
View File

@@ -150,4 +150,6 @@ interface IConnectivityManager
void setProvisioningNotificationVisible(boolean visible, int networkType, in String extraInfo, in String url);
void setAirplaneMode(boolean enable);
void registerNetworkFactory(in Messenger messenger);
}

1
core/java/com/android/internal/util/Protocol.java
View File

@@ -55,5 +55,6 @@ public class Protocol {
public static final int BASE_DNS_PINGER = 0x00050000;
public static final int BASE_NSD_MANAGER = 0x00060000;
public static final int BASE_NETWORK_STATE_TRACKER = 0x00070000;
public static final int BASE_CONNECTIVITY_SERVICE = 0x00080000;
//TODO: define all used protocols
}

53
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -29,6 +29,7 @@ import static android.net.ConnectivityManager.TYPE_WIMAX;
import static android.net.ConnectivityManager.TYPE_PROXY;
import static android.net.ConnectivityManager.getNetworkTypeName;
import static android.net.ConnectivityManager.isNetworkTypeValid;
import static android.net.ConnectivityServiceProtocol.NetworkFactoryProtocol;
import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;
@@ -66,10 +67,12 @@ import android.net.LinkProperties.CompareResult;
import android.net.LinkQualityInfo;
import android.net.MobileDataStateTracker;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkConfig;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.NetworkQuotaInfo;
import android.net.NetworkRequest;
import android.net.NetworkState;
import android.net.NetworkStateTracker;
import android.net.NetworkUtils;
@@ -119,6 +122,7 @@ import com.android.internal.telephony.DctConstants;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.util.AsyncChannel;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.XmlUtils;
import com.android.server.am.BatteryStatsService;
@@ -372,6 +376,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
*/
private static final int EVENT_PROXY_HAS_CHANGED = 16;
/**
* used internally when registering NetworkFactories
* obj = Messenger
*/
private static final int EVENT_REGISTER_NETWORK_FACTORY = 17;
/** Handler used for internal events. */
private InternalHandler mHandler;
/** Handler used for incoming {@link NetworkStateTracker} events. */
@@ -461,6 +471,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
NetworkFactory netFactory) {
if (DBG) log("ConnectivityService starting up");
NetworkCapabilities netCap = new NetworkCapabilities();
netCap.addNetworkCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
netCap.addNetworkCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
NetworkRequest netRequest = new NetworkRequest(netCap);
mNetworkRequests.append(netRequest.requestId, netRequest);
HandlerThread handlerThread = new HandlerThread("ConnectivityServiceThread");
handlerThread.start();
mHandler = new InternalHandler(handlerThread.getLooper());
@@ -3048,6 +3064,22 @@ public class ConnectivityService extends IConnectivityManager.Stub {
public void handleMessage(Message msg) {
NetworkInfo info;
switch (msg.what) {
case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED: {
AsyncChannel ac = (AsyncChannel) msg.obj;
if (mNetworkFactories.contains(ac)) {
if (msg.arg1 == AsyncChannel.STATUS_SUCCESSFUL) {
if (VDBG) log("NetworkFactory connected");
for (int i = 0; i < mNetworkRequests.size(); i++) {
ac.sendMessage(NetworkFactoryProtocol.CMD_REQUEST_NETWORK,
mNetworkRequests.valueAt(i));
}
} else {
loge("Error connecting NetworkFactory");
mNetworkFactories.remove((AsyncChannel) msg.obj);
}
}
break;
}
case NetworkStateTracker.EVENT_STATE_CHANGED: {
info = (NetworkInfo) msg.obj;
NetworkInfo.State state = info.getState();
@@ -3241,6 +3273,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
handleApplyDefaultProxy((ProxyInfo)msg.obj);
break;
}
case EVENT_REGISTER_NETWORK_FACTORY: {
handleRegisterNetworkFactory((Messenger)msg.obj);
break;
}
}
}
}
@@ -5081,4 +5117,21 @@ public class ConnectivityService extends IConnectivityManager.Stub {
long wakeupTime = SystemClock.elapsedRealtime() + timeoutInMilliseconds;
mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, wakeupTime, intent);
}
private final ArrayList<AsyncChannel> mNetworkFactories = new ArrayList<AsyncChannel>();
public void registerNetworkFactory(Messenger messenger) {
enforceConnectivityInternalPermission();
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_FACTORY, messenger));
}
private void handleRegisterNetworkFactory(Messenger messenger) {
if (VDBG) log("Got NetworkFactory Messenger");
AsyncChannel ac = new AsyncChannel();
mNetworkFactories.add(ac);
ac.connect(mContext, mTrackerHandler, messenger);
}
private final SparseArray<NetworkRequest> mNetworkRequests = new SparseArray<NetworkRequest>();
}