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

Commit 2216d824 authored Jan 25, 2016 by Felipe Leme Committed by Android (Google) Code Review Jan 25, 2016

Merge "Fixed RestrictBackgroundStatus signature by adding @hide."

parents 2790a37e ecfcceae

api/current.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -22863,9 +22863,6 @@ package android.net {
		method public abstract void onNetworkActive();
		}

		public static abstract class ConnectivityManager.RestrictBackgroundStatus implements java.lang.annotation.Annotation {
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();

api/system-current.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -24459,9 +24459,6 @@ package android.net {
		method public abstract void onNetworkActive();
		}

		public static abstract class ConnectivityManager.RestrictBackgroundStatus implements java.lang.annotation.Annotation {
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();

api/test-current.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -22871,9 +22871,6 @@ package android.net {
		method public abstract void onNetworkActive();
		}

		public static abstract class ConnectivityManager.RestrictBackgroundStatus implements java.lang.annotation.Annotation {
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();

core/java/android/net/ConnectivityManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -3051,12 +3051,13 @@ public class ConnectivityManager {
		*/
		public static final int RESTRICT_BACKGROUND_STATUS_ENABLED = 3;

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(flag = false, value = {
		RESTRICT_BACKGROUND_STATUS_DISABLED,
		RESTRICT_BACKGROUND_STATUS_WHITELISTED,
		RESTRICT_BACKGROUND_STATUS_ENABLED,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface RestrictBackgroundStatus {
		}