Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1b654a0 authored Mar 29, 2017 by Etan Cohen Committed by Lorenzo Colitti Apr 14, 2017

[CM] Unhide the NetworkSpecifier as object API

API visibility change: unhide allowing NetworkSpecifier
to be an arbitrary object.

Bug: 27533960
Bug: 36053921
Bug: 36275276
Test: builds and runs
Change-Id: I1d1705cca7ece077ef8d7c674c62d5369fedbb03
Merged-In: I7535495681da8f168c46d6d95e13925cffecc99b
Merged-In: I6500639ae839ee9ad5af34d1292d1539c943e2ad

parent 29fe0c99

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -25777,6 +25777,10 @@ package android.net {
		method public android.net.NetworkRequest.Builder removeCapability(int);
		method public android.net.NetworkRequest.Builder removeTransportType(int);
		method public android.net.NetworkRequest.Builder setNetworkSpecifier(java.lang.String);
		method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);
		}

		public abstract class NetworkSpecifier {
		}

		public class ParseException extends java.lang.RuntimeException {

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -27996,6 +27996,7 @@ package android.net {
		method public android.net.NetworkRequest.Builder removeCapability(int);
		method public android.net.NetworkRequest.Builder removeTransportType(int);
		method public android.net.NetworkRequest.Builder setNetworkSpecifier(java.lang.String);
		method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);
		}

		public class NetworkScoreManager {
		@@ -28014,6 +28015,9 @@ package android.net {
		field public static final java.lang.String EXTRA_PACKAGE_NAME = "packageName";
		}

		public abstract class NetworkSpecifier {
		}

		public class ParseException extends java.lang.RuntimeException {
		field public java.lang.String response;
		}

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -25884,6 +25884,10 @@ package android.net {
		method public android.net.NetworkRequest.Builder removeCapability(int);
		method public android.net.NetworkRequest.Builder removeTransportType(int);
		method public android.net.NetworkRequest.Builder setNetworkSpecifier(java.lang.String);
		method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);
		}

		public abstract class NetworkSpecifier {
		}

		public class ParseException extends java.lang.RuntimeException {

core/java/android/net/NetworkRequest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -278,7 +278,6 @@ public class NetworkRequest implements Parcelable {
		*
		* @param networkSpecifier A concrete, parcelable framework class that extends
		* NetworkSpecifier.
		* @hide
		*/
		public Builder setNetworkSpecifier(NetworkSpecifier networkSpecifier) {
		MatchAllNetworkSpecifier.checkNotMatchAllNetworkSpecifier(networkSpecifier);

core/java/android/net/NetworkSpecifier.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -21,10 +21,11 @@ package android.net;
		*
		* Applications cannot instantiate this class by themselves, but can obtain instances of
		* subclasses of this class via other APIs.
		*
		* @hide
		*/
		public abstract class NetworkSpecifier {
		/** @hide */
		public NetworkSpecifier() {}

		/**
		* Returns true if a request with this {@link NetworkSpecifier} is satisfied by a network
		* with the given NetworkSpecifier.