Merge "CTS: Add @hide annotations to several @IntDef elements" into nyc-dev (77e64512) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −15

Original line number	Diff line number	Diff line
		@@ -19273,9 +19273,6 @@ package android.location {
		field public static final int STATE_UNKNOWN = 0; // 0x0
		}

		public static abstract class GnssMeasurement.MultipathIndicator implements java.lang.annotation.Annotation {
		}

		public final class GnssMeasurementsEvent implements android.os.Parcelable {
		ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]);
		method public int describeContents();
		@@ -19294,9 +19291,6 @@ package android.location {
		method public void onStatusChanged(int);
		}

		public static abstract class GnssMeasurementsEvent.GnssMeasurementsStatus implements java.lang.annotation.Annotation {
		}

		public final class GnssNavigationMessage implements android.os.Parcelable {
		method public int describeContents();
		method public byte[] getData();
		@@ -19322,9 +19316,6 @@ package android.location {
		field public static final int TYPE_UNKNOWN = 0; // 0x0
		}

		public static abstract class GnssNavigationMessage.GnssNavigationMessageType implements java.lang.annotation.Annotation {
		}

		public final class GnssNavigationMessageEvent implements android.os.Parcelable {
		ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage);
		method public int describeContents();
		@@ -19342,9 +19333,6 @@ package android.location {
		method public void onStatusChanged(int);
		}

		public static abstract class GnssNavigationMessageEvent.GnssNavigationMessageStatus implements java.lang.annotation.Annotation {
		}

		public abstract interface GnssNmeaListener {
		method public abstract void onNmeaReceived(long, java.lang.String);
		}
		@@ -19368,9 +19356,6 @@ package android.location {
		field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0
		}

		public static abstract class GnssStatus.ConstellationType implements java.lang.annotation.Annotation {
		}

		public abstract class GnssStatusCallback {
		ctor public GnssStatusCallback();
		method public void onFirstFix(int);

api/system-current.txt

+0 −15

Original line number	Diff line number	Diff line
		@@ -20445,9 +20445,6 @@ package android.location {
		field public static final int STATE_UNKNOWN = 0; // 0x0
		}

		public static abstract class GnssMeasurement.MultipathIndicator implements java.lang.annotation.Annotation {
		}

		public final class GnssMeasurementsEvent implements android.os.Parcelable {
		ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]);
		method public int describeContents();
		@@ -20466,9 +20463,6 @@ package android.location {
		method public void onStatusChanged(int);
		}

		public static abstract class GnssMeasurementsEvent.GnssMeasurementsStatus implements java.lang.annotation.Annotation {
		}

		public final class GnssNavigationMessage implements android.os.Parcelable {
		method public int describeContents();
		method public byte[] getData();
		@@ -20494,9 +20488,6 @@ package android.location {
		field public static final int TYPE_UNKNOWN = 0; // 0x0
		}

		public static abstract class GnssNavigationMessage.GnssNavigationMessageType implements java.lang.annotation.Annotation {
		}

		public final class GnssNavigationMessageEvent implements android.os.Parcelable {
		ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage);
		method public int describeContents();
		@@ -20514,9 +20505,6 @@ package android.location {
		method public void onStatusChanged(int);
		}

		public static abstract class GnssNavigationMessageEvent.GnssNavigationMessageStatus implements java.lang.annotation.Annotation {
		}

		public abstract interface GnssNmeaListener {
		method public abstract void onNmeaReceived(long, java.lang.String);
		}
		@@ -20540,9 +20528,6 @@ package android.location {
		field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0
		}

		public static abstract class GnssStatus.ConstellationType implements java.lang.annotation.Annotation {
		}

		public abstract class GnssStatusCallback {
		ctor public GnssStatusCallback();
		method public void onFirstFix(int);

api/test-current.txt

+0 −15

Original line number	Diff line number	Diff line
		@@ -19328,9 +19328,6 @@ package android.location {
		field public static final int STATE_UNKNOWN = 0; // 0x0
		}

		public static abstract class GnssMeasurement.MultipathIndicator implements java.lang.annotation.Annotation {
		}

		public final class GnssMeasurementsEvent implements android.os.Parcelable {
		ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]);
		method public int describeContents();
		@@ -19349,9 +19346,6 @@ package android.location {
		method public void onStatusChanged(int);
		}

		public static abstract class GnssMeasurementsEvent.GnssMeasurementsStatus implements java.lang.annotation.Annotation {
		}

		public final class GnssNavigationMessage implements android.os.Parcelable {
		ctor public GnssNavigationMessage();
		method public int describeContents();
		@@ -19386,9 +19380,6 @@ package android.location {
		field public static final int TYPE_UNKNOWN = 0; // 0x0
		}

		public static abstract class GnssNavigationMessage.GnssNavigationMessageType implements java.lang.annotation.Annotation {
		}

		public final class GnssNavigationMessageEvent implements android.os.Parcelable {
		ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage);
		method public int describeContents();
		@@ -19406,9 +19397,6 @@ package android.location {
		method public void onStatusChanged(int);
		}

		public static abstract class GnssNavigationMessageEvent.GnssNavigationMessageStatus implements java.lang.annotation.Annotation {
		}

		public abstract interface GnssNmeaListener {
		method public abstract void onNmeaReceived(long, java.lang.String);
		}
		@@ -19432,9 +19420,6 @@ package android.location {
		field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0
		}

		public static abstract class GnssStatus.ConstellationType implements java.lang.annotation.Annotation {
		}

		public abstract class GnssStatusCallback {
		ctor public GnssStatusCallback();
		method public void onFirstFix(int);

location/java/android/location/GnssMeasurement.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,10 @@ public final class GnssMeasurement implements Parcelable {
		private static final int HAS_CARRIER_PHASE = (1<<11);
		private static final int HAS_CARRIER_PHASE_UNCERTAINTY = (1<<12);

		/** The status of multipath. */
		/**
		* The status of the multipath indicator.
		* @hide
		*/
		@Retention(RetentionPolicy.SOURCE)
		@IntDef({MULTIPATH_INDICATOR_UNKNOWN, MULTIPATH_INDICATOR_DETECTED,
		MULTIPATH_INDICATOR_NOT_USED})

location/java/android/location/GnssMeasurementsEvent.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,10 @@ import java.util.Collections;
		* Events are delivered to registered instances of {@link Callback}.
		*/
		public final class GnssMeasurementsEvent implements Parcelable {
		/** The status of GNSS measurements event. */
		/**
		* The status of the GNSS measurements event.
		* @hide
		*/
		@Retention(RetentionPolicy.SOURCE)
		@IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_GNSS_LOCATION_DISABLED})
		public @interface GnssMeasurementsStatus {}