am 2fbcff12: Merge "First pass on multinetwork framework" (424047ee) · Commits · e / os / android_frameworks_base

core/java/android/net/BaseNetworkStateTracker.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ public abstract class BaseNetworkStateTracker implements NetworkStateTracker {
		protected NetworkInfo mNetworkInfo;
		protected LinkProperties mLinkProperties;
		protected LinkCapabilities mLinkCapabilities;
		protected Network mNetwork = new Network(ConnectivityManager.INVALID_NET_ID);

		private AtomicBoolean mTeardownRequested = new AtomicBoolean(false);
		private AtomicBoolean mPrivateDnsRouteSet = new AtomicBoolean(false);
		@@ -201,4 +202,14 @@ public abstract class BaseNetworkStateTracker implements NetworkStateTracker {
		public void stopSampling(SamplingDataTracker.SamplingSnapshot s) {
		// nothing to do
		}

		@Override
		public void setNetId(int netId) {
		mNetwork = new Network(netId);
		}

		@Override
		public Network getNetwork() {
		return mNetwork;
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -408,6 +408,11 @@ public class ConnectivityManager {
		*/
		public static final int CONNECTIVITY_CHANGE_DELAY_DEFAULT = 3000;

		/**
		* @hide
		*/
		public final static int INVALID_NET_ID = 0;

		private final IConnectivityManager mService;

		private final String mPackageName;

0 → 100644

+20 −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 Network;

0 → 100644

+59 −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.Parcelable;
		import android.os.Parcel;


		/**
		* Identifies the Network.
		* @hide
		*/
		public class Network implements Parcelable {

		public final int netId;

		public Network(int netId) {
		this.netId = netId;
		}

		public Network(Network that) {
		this.netId = that.netId;
		}

		// implement the Parcelable interface
		public int describeContents() {
		return 0;
		}
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(netId);
		}

		public static final Creator<Network> CREATOR =
		new Creator<Network>() {
		public Network createFromParcel(Parcel in) {
		int netId = in.readInt();

		return new Network(netId);
		}

		public Network[] newArray(int size) {
		return new Network[size];
		}
		};
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -250,4 +250,14 @@ public interface NetworkStateTracker {
		*/
		public void stopSampling(SamplingDataTracker.SamplingSnapshot s);

		/*
		* Record the current netId
		*/
		public void setNetId(int netId);

		/*
		* ?
		*/
		public Network getNetwork();

		}