Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add @UnsupportedAppUsage annotations"

Browse Source
This commit is contained in:
Treehugger Robot
2018-08-15 10:11:01 +00:00
committed by Gerrit Code Review
parent 72982a5404 8eb07d9011
commit fd07385fea
11 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
config/hiddenapi-light-greylist.txt
View File

@@ -1820,18 +1820,6 @@ Landroid/icu/util/UResourceBundle;->getString()Ljava/lang/String;
Landroid/icu/util/UResourceBundle;->getType()I
Landroid/icu/util/UResourceBundleIterator;->hasNext()Z
Landroid/icu/util/UResourceBundleIterator;->next()Landroid/icu/util/UResourceBundle;
Landroid/location/Country;-><init>(Ljava/lang/String;I)V
Landroid/location/Country;->getCountryIso()Ljava/lang/String;
Landroid/location/Country;->getSource()I
Landroid/location/CountryDetector;-><init>(Landroid/location/ICountryDetector;)V
Landroid/location/CountryDetector;->addCountryListener(Landroid/location/CountryListener;Landroid/os/Looper;)V
Landroid/location/CountryDetector;->detectCountry()Landroid/location/Country;
Landroid/location/CountryDetector;->removeCountryListener(Landroid/location/CountryListener;)V
Landroid/location/CountryListener;->onCountryDetected(Landroid/location/Country;)V
Landroid/location/GeocoderParams;->getClientPackage()Ljava/lang/String;
Landroid/location/GeocoderParams;->getLocale()Ljava/util/Locale;
Landroid/location/Geofence;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/location/GpsStatus;->setTimeToFirstFix(I)V
Landroid/location/ICountryDetector$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/ICountryDetector;
Landroid/location/ICountryListener$Stub;-><init>()V
Landroid/location/IGeocodeProvider$Stub;-><init>()V
@@ -1850,25 +1838,6 @@ Landroid/location/ILocationManager$Stub;-><init>()V
Landroid/location/ILocationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/ILocationManager;
Landroid/location/ILocationManager$Stub;->TRANSACTION_getAllProviders:I
Landroid/location/ILocationManager;->getAllProviders()Ljava/util/List;
Landroid/location/Location;->mElapsedRealtimeNanos:J
Landroid/location/Location;->mProvider:Ljava/lang/String;
Landroid/location/LocationManager;->mService:Landroid/location/ILocationManager;
Landroid/location/LocationManager;->requestLocationUpdates(Landroid/location/LocationRequest;Landroid/location/LocationListener;Landroid/os/Looper;Landroid/app/PendingIntent;)V
Landroid/location/LocationManager;->sendNiResponse(II)Z
Landroid/location/LocationRequest;->checkDisplacement(F)V
Landroid/location/LocationRequest;->checkInterval(J)V
Landroid/location/LocationRequest;->checkProvider(Ljava/lang/String;)V
Landroid/location/LocationRequest;->checkQuality(I)V
Landroid/location/LocationRequest;->mExpireAt:J
Landroid/location/LocationRequest;->mExplicitFastestInterval:Z
Landroid/location/LocationRequest;->mFastestInterval:J
Landroid/location/LocationRequest;->mHideFromAppOps:Z
Landroid/location/LocationRequest;->mInterval:J
Landroid/location/LocationRequest;->mNumUpdates:I
Landroid/location/LocationRequest;->mProvider:Ljava/lang/String;
Landroid/location/LocationRequest;->mQuality:I
Landroid/location/LocationRequest;->mSmallestDisplacement:F
Landroid/location/LocationRequest;->mWorkSource:Landroid/os/WorkSource;
Landroid/media/AmrInputStream;-><init>(Ljava/io/InputStream;)V
Landroid/media/AsyncPlayer;->setUsesWakeLock(Landroid/content/Context;)V
Landroid/media/AudioAttributes$Builder;->addTag(Ljava/lang/String;)Landroid/media/AudioAttributes$Builder;

1
config/hiddenapi-vendor-list.txt
View File

@@ -95,7 +95,6 @@ Landroid/location/ILocationManager;->getNetworkProviderPackage()Ljava/lang/Strin
Landroid/location/ILocationManager;->reportLocation(Landroid/location/Location;Z)V
Landroid/location/INetInitiatedListener$Stub;-><init>()V
Landroid/location/INetInitiatedListener;->sendNiResponse(II)Z
Landroid/location/Location;->setExtraLocation(Ljava/lang/String;Landroid/location/Location;)V
Landroid/media/AudioManager;->registerAudioPortUpdateListener(Landroid/media/AudioManager$OnAudioPortUpdateListener;)V
Landroid/media/AudioManager;->unregisterAudioPortUpdateListener(Landroid/media/AudioManager$OnAudioPortUpdateListener;)V
Landroid/media/AudioSystem;->checkAudioFlinger()I

4
location/java/android/location/Country.java
View File

@@ -16,6 +16,7 @@
package android.location;
import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
@@ -78,6 +79,7 @@ public class Country implements Parcelable {
* <li>{@link #COUNTRY_SOURCE_LOCALE}</li>
* </ul>
*/
@UnsupportedAppUsage
public Country(final String countryIso, final int source) {
if (countryIso == null || source < COUNTRY_SOURCE_NETWORK
|| source > COUNTRY_SOURCE_LOCALE) {
@@ -107,6 +109,7 @@ public class Country implements Parcelable {
/**
* @return the ISO 3166-1 two letters country code
*/
@UnsupportedAppUsage
public final String getCountryIso() {
return mCountryIso;
}
@@ -121,6 +124,7 @@ public class Country implements Parcelable {
* <li>{@link #COUNTRY_SOURCE_LOCALE}</li>
* </ul>
*/
@UnsupportedAppUsage
public final int getSource() {
return mSource;
}

5
location/java/android/location/CountryDetector.java
View File

@@ -19,6 +19,7 @@ package android.location;
import java.util.HashMap;
import android.annotation.SystemService;
import android.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
@@ -87,6 +88,7 @@ public class CountryDetector {
* create an instance of this class is using the factory
* Context.getSystemService.
*/
@UnsupportedAppUsage
public CountryDetector(ICountryDetector service) {
mService = service;
mListeners = new HashMap<CountryListener, ListenerTransport>();
@@ -98,6 +100,7 @@ public class CountryDetector {
* @return the country if it is available immediately, otherwise null will
* be returned.
*/
@UnsupportedAppUsage
public Country detectCountry() {
try {
return mService.detectCountry();
@@ -116,6 +119,7 @@ public class CountryDetector {
* implement the callback mechanism. If looper is null then the
* callbacks will be called on the main thread.
*/
@UnsupportedAppUsage
public void addCountryListener(CountryListener listener, Looper looper) {
synchronized (mListeners) {
if (!mListeners.containsKey(listener)) {
@@ -133,6 +137,7 @@ public class CountryDetector {
/**
* Remove the listener
*/
@UnsupportedAppUsage
public void removeCountryListener(CountryListener listener) {
synchronized (mListeners) {
ListenerTransport transport = mListeners.get(listener);

3
location/java/android/location/CountryListener.java
View File

@@ -16,6 +16,8 @@
package android.location;
import android.annotation.UnsupportedAppUsage;
/**
* The listener for receiving the notification when the country is detected or
* changed
@@ -26,5 +28,6 @@ public interface CountryListener {
/**
* @param country the changed or detected country.
*/
@UnsupportedAppUsage
void onCountryDetected(Country country);
}

3
location/java/android/location/GeocoderParams.java
View File

@@ -16,6 +16,7 @@
package android.location;
import android.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
@@ -53,6 +54,7 @@ public class GeocoderParams implements Parcelable {
/**
* returns the Geocoder's locale
*/
@UnsupportedAppUsage
public Locale getLocale() {
return mLocale;
}
@@ -60,6 +62,7 @@ public class GeocoderParams implements Parcelable {
/**
* returns the package name of the Geocoder's client
*/
@UnsupportedAppUsage
public String getClientPackage() {
return mPackageName;
}

2
location/java/android/location/Geofence.java
View File

@@ -16,6 +16,7 @@
package android.location;
import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
@@ -98,6 +99,7 @@ public final class Geofence implements Parcelable {
}
}
@UnsupportedAppUsage
public static final Parcelable.Creator<Geofence> CREATOR = new Parcelable.Creator<Geofence>() {
@Override
public Geofence createFromParcel(Parcel in) {

2
location/java/android/location/GpsStatus.java
View File

@@ -16,6 +16,7 @@
package android.location;
import android.annotation.UnsupportedAppUsage;
import android.util.SparseArray;
import java.util.Iterator;
@@ -206,6 +207,7 @@ public final class GpsStatus {
status.mAzimuths);
}
@UnsupportedAppUsage
void setTimeToFirstFix(int ttff) {
mTimeToFirstFix = ttff;
}

4
location/java/android/location/Location.java
View File

@@ -17,6 +17,7 @@
package android.location;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
@@ -122,8 +123,10 @@ public class Location implements Parcelable {
}
};
@UnsupportedAppUsage
private String mProvider;
private long mTime = 0;
@UnsupportedAppUsage
private long mElapsedRealtimeNanos = 0;
private double mLatitude = 0.0;
private double mLongitude = 0.0;
@@ -1151,6 +1154,7 @@ public class Location implements Parcelable {
* @param value the Location to attach
* @hide
*/
@UnsupportedAppUsage
public void setExtraLocation(String key, Location value) {
if (mExtras == null) {
mExtras = new Bundle();

4
location/java/android/location/LocationManager.java
View File

@@ -30,6 +30,7 @@ import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
@@ -74,6 +75,7 @@ public class LocationManager {
private static final String TAG = "LocationManager";
private final Context mContext;
@UnsupportedAppUsage
private final ILocationManager mService;
private final GnssMeasurementCallbackTransport mGnssMeasurementCallbackTransport;
private final GnssNavigationMessageCallbackTransport mGnssNavigationMessageCallbackTransport;
@@ -995,6 +997,7 @@ public class LocationManager {
}
}
@UnsupportedAppUsage
private void requestLocationUpdates(LocationRequest request, LocationListener listener,
Looper looper, PendingIntent intent) {
@@ -2319,6 +2322,7 @@ public class LocationManager {
*
* @hide
*/
@UnsupportedAppUsage
public boolean sendNiResponse(int notifId, int userResponse) {
try {
return mService.sendNiResponse(notifId, userResponse);

15
location/java/android/location/LocationRequest.java
View File

@@ -17,6 +17,7 @@
package android.location;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
@@ -141,16 +142,26 @@ public final class LocationRequest implements Parcelable {
*/
private static final double FASTEST_INTERVAL_FACTOR = 6.0; // 6x
@UnsupportedAppUsage
private int mQuality = POWER_LOW;
@UnsupportedAppUsage
private long mInterval = 60 * 60 * 1000; // 60 minutes
@UnsupportedAppUsage
private long mFastestInterval = (long) (mInterval / FASTEST_INTERVAL_FACTOR); // 10 minutes
@UnsupportedAppUsage
private boolean mExplicitFastestInterval = false;
@UnsupportedAppUsage
private long mExpireAt = Long.MAX_VALUE; // no expiry
@UnsupportedAppUsage
private int mNumUpdates = Integer.MAX_VALUE; // no expiry
@UnsupportedAppUsage
private float mSmallestDisplacement = 0.0f; // meters
@UnsupportedAppUsage
private WorkSource mWorkSource = null;
@UnsupportedAppUsage
private boolean mHideFromAppOps = false; // True if this request shouldn't be counted by AppOps
@UnsupportedAppUsage
private String mProvider = LocationManager.FUSED_PROVIDER;
// for deprecated APIs that explicitly request a provider
@@ -592,12 +603,14 @@ public final class LocationRequest implements Parcelable {
return mHideFromAppOps;
}
@UnsupportedAppUsage
private static void checkInterval(long millis) {
if (millis < 0) {
throw new IllegalArgumentException("invalid interval: " + millis);
}
}
@UnsupportedAppUsage
private static void checkQuality(int quality) {
switch (quality) {
case ACCURACY_FINE:
@@ -612,12 +625,14 @@ public final class LocationRequest implements Parcelable {
}
}
@UnsupportedAppUsage
private static void checkDisplacement(float meters) {
if (meters < 0.0f) {
throw new IllegalArgumentException("invalid displacement: " + meters);
}
}
@UnsupportedAppUsage
private static void checkProvider(String name) {
if (name == null) {
throw new IllegalArgumentException("invalid provider: " + name);