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

Commit 42197c1b authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Add @UnsupportedAppUsage annotations" am: fd07385f 

am: d1299b89

Change-Id: I6409a83bb9223930eaa2bfbd51e54bc354411f7f
parents e79e4518 d1299b89

config/hiddenapi-light-greylist.txt

+0 −31
Original line number Diff line number Diff line
@@ -1822,18 +1822,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
@@ -1852,25 +1840,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;

config/hiddenapi-vendor-list.txt

+0 −1
Original line number Diff line number Diff line
@@ -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

location/java/android/location/Country.java

+4 −0
Original line number Diff line number Diff line
@@ -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;

    }

location/java/android/location/CountryDetector.java

+5 −0
Original line number Diff line number Diff line
@@ -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);

location/java/android/location/CountryListener.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

}