Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev

am: d06520a488

Change-Id: I127501113d4e290a1e8d0b3a44ba779ec36cdc1d
This commit is contained in:
Gina Dimino
2016-06-16 21:08:15 +00:00
committed by android-build-merger
5 changed files with 8 additions and 5 deletions

View File

@@ -1120,6 +1120,9 @@ LOCAL_DROIDDOC_OPTIONS:= \
-showAnnotation android.annotation.SystemApi \ -showAnnotation android.annotation.SystemApi \
-title "Android SDK - Including system APIs." \ -title "Android SDK - Including system APIs." \
-toroot / \ -toroot / \
-hide 101 \
-hide 104 \
-hide 108 \
-hdf android.whichdoc online \ -hdf android.whichdoc online \
$(sample_groups) \ $(sample_groups) \
-hdf android.hasSamples true \ -hdf android.hasSamples true \

View File

@@ -1556,7 +1556,7 @@ public class Intent implements Parcelable, Cloneable {
/** /**
* Used as an int extra field with {@link #ACTION_INSTALL_PACKAGE} and * Used as an int extra field with {@link #ACTION_INSTALL_PACKAGE} and
* {@link} #ACTION_VIEW} to indicate the uid of the package that initiated the install * {@link #ACTION_VIEW} to indicate the uid of the package that initiated the install
* @hide * @hide
*/ */
@SystemApi @SystemApi

View File

@@ -2008,7 +2008,7 @@ public class LocationManager {
* No-op method to keep backward-compatibility. * No-op method to keep backward-compatibility.
* Don't use it. Use {@link #registerGnssMeasurementsCallback} instead. * Don't use it. Use {@link #registerGnssMeasurementsCallback} instead.
* @hide * @hide
* @deprecated * @deprecated Not supported anymore.
*/ */
@Deprecated @Deprecated
@SystemApi @SystemApi
@@ -2065,7 +2065,7 @@ public class LocationManager {
* No-op method to keep backward-compatibility. * No-op method to keep backward-compatibility.
* Don't use it. Use {@link #registerGnssNavigationMessageCallback} instead. * Don't use it. Use {@link #registerGnssNavigationMessageCallback} instead.
* @hide * @hide
* @deprecated * @deprecated Not supported anymore.
*/ */
@Deprecated @Deprecated
@SystemApi @SystemApi

View File

@@ -691,7 +691,7 @@ public class RttManager {
/** /**
* spread (i.e. max - min) distance * spread (i.e. max - min) distance
* @deprecate Use {@link android.net.wifi.RttManager.RttResult#distanceSpread} API. * @deprecated Use {@link android.net.wifi.RttManager.RttResult#distanceSpread} API.
*/ */
@Deprecated @Deprecated
public int distance_spread_cm; public int distance_spread_cm;

View File

@@ -141,7 +141,7 @@ public class WifiScanner {
/** /**
* reports {@link ScanListener#onResults} when underlying buffers are full * reports {@link ScanListener#onResults} when underlying buffers are full
* this is simply the lack of the {@link #REPORT_EVENT_AFTER_EACH_SCAN} flag * this is simply the lack of the {@link #REPORT_EVENT_AFTER_EACH_SCAN} flag
* @deprecated * @deprecated It is not supported anymore.
*/ */
@Deprecated @Deprecated
public static final int REPORT_EVENT_AFTER_BUFFER_FULL = 0; public static final int REPORT_EVENT_AFTER_BUFFER_FULL = 0;