Merge "Implement support for bypassable VPNs." into lmp-dev (eb527ef7) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2068,9 +2068,9 @@ public class ConnectivityManager {

		/** {@hide} */
		public void registerNetworkAgent(Messenger messenger, NetworkInfo ni, LinkProperties lp,
		NetworkCapabilities nc, int score) {
		NetworkCapabilities nc, int score, NetworkMisc misc) {
		try {
		mService.registerNetworkAgent(messenger, ni, lp, nc, score);
		mService.registerNetworkAgent(messenger, ni, lp, nc, score, misc);
		} catch (RemoteException e) { }
		}

core/java/android/net/IConnectivityManager.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.net.LinkProperties;
		import android.net.Network;
		import android.net.NetworkCapabilities;
		import android.net.NetworkInfo;
		import android.net.NetworkMisc;
		import android.net.NetworkQuotaInfo;
		import android.net.NetworkRequest;
		import android.net.NetworkState;
		@@ -150,7 +151,7 @@ interface IConnectivityManager
		void unregisterNetworkFactory(in Messenger messenger);

		void registerNetworkAgent(in Messenger messenger, in NetworkInfo ni, in LinkProperties lp,
		in NetworkCapabilities nc, int score);
		in NetworkCapabilities nc, int score, in NetworkMisc misc);

		NetworkRequest requestNetwork(in NetworkCapabilities networkCapabilities,
		in Messenger messenger, int timeoutSec, in IBinder binder, int legacy);

core/java/android/net/NetworkAgent.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -108,6 +108,11 @@ public abstract class NetworkAgent extends Handler {

		public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,
		NetworkCapabilities nc, LinkProperties lp, int score) {
		this(looper, context, logTag, ni, nc, lp, score, null);
		}

		public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,
		NetworkCapabilities nc, LinkProperties lp, int score, NetworkMisc misc) {
		super(looper);
		LOG_TAG = logTag;
		mContext = context;
		@@ -119,7 +124,7 @@ public abstract class NetworkAgent extends Handler {
		ConnectivityManager cm = (ConnectivityManager)mContext.getSystemService(
		Context.CONNECTIVITY_SERVICE);
		cm.registerNetworkAgent(new Messenger(this), new NetworkInfo(ni),
		new LinkProperties(lp), new NetworkCapabilities(nc), score);
		new LinkProperties(lp), new NetworkCapabilities(nc), score, misc);
		}

		@Override

core/java/android/net/NetworkMisc.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* 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;

		parcelable NetworkMisc;

core/java/android/net/NetworkMisc.java

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* 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 android.os.Parcel;
		import android.os.Parcelable;

		/**
		* A grab-bag of information (metadata, policies, properties, etc) about a {@link Network}.
		*
		* @hide
		*/
		public class NetworkMisc implements Parcelable {
		/**
		* If the {@link Network} is a VPN, whether apps are allowed to bypass the VPN. This is set by
		* a {@link VpnService} and used by {@link ConnectivityService} when creating a VPN.
		*/
		public boolean allowBypass;

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(allowBypass ? 1 : 0);
		}

		public static final Creator<NetworkMisc> CREATOR = new Creator<NetworkMisc>() {
		@Override
		public NetworkMisc createFromParcel(Parcel in) {
		NetworkMisc networkMisc = new NetworkMisc();
		networkMisc.allowBypass = in.readInt() != 0;
		return networkMisc;
		}

		@Override
		public NetworkMisc[] newArray(int size) {
		return new NetworkMisc[size];
		}
		};
		}