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

Commit d4cbb981 authored by Wyatt Riley's avatar Wyatt Riley Committed by Android (Google) Code Review
Browse files

Merge "Removing @removed methods and constants"

parents 7f6136ae a2bbfbcf

api/removed.txt

+0 −61
Original line number Diff line number Diff line
@@ -99,67 +99,6 @@ package android.graphics { 


}



package android.location {



  public final class GnssMeasurement implements android.os.Parcelable {

    field public static final int MULTIPATH_INDICATOR_NOT_USED = 2; // 0x2

  }



  public final class GnssMeasurementsEvent implements android.os.Parcelable {

    field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2

    field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0

    field public static final int STATUS_READY = 1; // 0x1

  }



  public final class GnssNavigationMessageEvent implements android.os.Parcelable {

    ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage);

    method public int describeContents();

    method public android.location.GnssNavigationMessage getNavigationMessage();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessageEvent> CREATOR;

    field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2

    field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0

    field public static final int STATUS_READY = 1; // 0x1

  }



  public static abstract class GnssNavigationMessageEvent.Callback {

    ctor public GnssNavigationMessageEvent.Callback();

    method public void onGnssNavigationMessageReceived(android.location.GnssNavigationMessageEvent);

    method public void onStatusChanged(int);

  }



  public abstract interface GnssNmeaListener {

    method public abstract void onNmeaReceived(long, java.lang.String);

  }



  public final class GnssStatus {

    method public int getNumSatellites();

    method public boolean hasAlmanac(int);

    method public boolean hasEphemeris(int);

  }



  public abstract class GnssStatusCallback {

    ctor public GnssStatusCallback();

    method public void onFirstFix(int);

    method public void onSatelliteStatusChanged(android.location.GnssStatus);

    method public void onStarted();

    method public void onStopped();

  }



  public class LocationManager {

    method public boolean addNmeaListener(android.location.GnssNmeaListener);

    method public boolean addNmeaListener(android.location.GnssNmeaListener, android.os.Handler);

    method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback);

    method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback, android.os.Handler);

    method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback);

    method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler);

    method public void removeNmeaListener(android.location.GnssNmeaListener);

    method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback);

    method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback);

  }



}



package android.media {



  public final class AudioFormat implements android.os.Parcelable {

api/system-removed.txt

+0 −61
Original line number Diff line number Diff line
@@ -97,67 +97,6 @@ package android.graphics { 


}



package android.location {



  public final class GnssMeasurement implements android.os.Parcelable {

    field public static final int MULTIPATH_INDICATOR_NOT_USED = 2; // 0x2

  }



  public final class GnssMeasurementsEvent implements android.os.Parcelable {

    field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2

    field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0

    field public static final int STATUS_READY = 1; // 0x1

  }



  public final class GnssNavigationMessageEvent implements android.os.Parcelable {

    ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage);

    method public int describeContents();

    method public android.location.GnssNavigationMessage getNavigationMessage();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessageEvent> CREATOR;

    field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2

    field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0

    field public static final int STATUS_READY = 1; // 0x1

  }



  public static abstract class GnssNavigationMessageEvent.Callback {

    ctor public GnssNavigationMessageEvent.Callback();

    method public void onGnssNavigationMessageReceived(android.location.GnssNavigationMessageEvent);

    method public void onStatusChanged(int);

  }



  public abstract interface GnssNmeaListener {

    method public abstract void onNmeaReceived(long, java.lang.String);

  }



  public final class GnssStatus {

    method public int getNumSatellites();

    method public boolean hasAlmanac(int);

    method public boolean hasEphemeris(int);

  }



  public abstract class GnssStatusCallback {

    ctor public GnssStatusCallback();

    method public void onFirstFix(int);

    method public void onSatelliteStatusChanged(android.location.GnssStatus);

    method public void onStarted();

    method public void onStopped();

  }



  public class LocationManager {

    method public boolean addNmeaListener(android.location.GnssNmeaListener);

    method public boolean addNmeaListener(android.location.GnssNmeaListener, android.os.Handler);

    method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback);

    method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback, android.os.Handler);

    method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback);

    method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler);

    method public void removeNmeaListener(android.location.GnssNmeaListener);

    method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback);

    method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback);

  }



}



package android.media {



  public final class AudioFormat implements android.os.Parcelable {

api/test-removed.txt

+0 −61
Original line number Diff line number Diff line
@@ -99,67 +99,6 @@ package android.graphics { 


}



package android.location {



  public final class GnssMeasurement implements android.os.Parcelable {

    field public static final int MULTIPATH_INDICATOR_NOT_USED = 2; // 0x2

  }



  public final class GnssMeasurementsEvent implements android.os.Parcelable {

    field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2

    field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0

    field public static final int STATUS_READY = 1; // 0x1

  }



  public final class GnssNavigationMessageEvent implements android.os.Parcelable {

    ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage);

    method public int describeContents();

    method public android.location.GnssNavigationMessage getNavigationMessage();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessageEvent> CREATOR;

    field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2

    field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0

    field public static final int STATUS_READY = 1; // 0x1

  }



  public static abstract class GnssNavigationMessageEvent.Callback {

    ctor public GnssNavigationMessageEvent.Callback();

    method public void onGnssNavigationMessageReceived(android.location.GnssNavigationMessageEvent);

    method public void onStatusChanged(int);

  }



  public abstract interface GnssNmeaListener {

    method public abstract void onNmeaReceived(long, java.lang.String);

  }



  public final class GnssStatus {

    method public int getNumSatellites();

    method public boolean hasAlmanac(int);

    method public boolean hasEphemeris(int);

  }



  public abstract class GnssStatusCallback {

    ctor public GnssStatusCallback();

    method public void onFirstFix(int);

    method public void onSatelliteStatusChanged(android.location.GnssStatus);

    method public void onStarted();

    method public void onStopped();

  }



  public class LocationManager {

    method public boolean addNmeaListener(android.location.GnssNmeaListener);

    method public boolean addNmeaListener(android.location.GnssNmeaListener, android.os.Handler);

    method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback);

    method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback, android.os.Handler);

    method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback);

    method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler);

    method public void removeNmeaListener(android.location.GnssNmeaListener);

    method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback);

    method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback);

  }



}



package android.media {



  public final class AudioFormat implements android.os.Parcelable {

location/java/android/location/GnssMeasurement.java

+3 −6
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public final class GnssMeasurement implements Parcelable { 
     */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef({MULTIPATH_INDICATOR_UNKNOWN, MULTIPATH_INDICATOR_DETECTED,

        MULTIPATH_INDICATOR_NOT_USED})

            MULTIPATH_INDICATOR_NOT_DETECTED})

    public @interface MultipathIndicator {}



    /**
@@ -81,9 +81,6 @@ public final class GnssMeasurement implements Parcelable { 
     */

    public static final int MULTIPATH_INDICATOR_NOT_DETECTED = 2;



    /** @removed */

    public static final int MULTIPATH_INDICATOR_NOT_USED = 2;



    /** This GNSS measurement's tracking state is invalid or unknown. */

    public static final int STATE_UNKNOWN = 0;

    /** This GNSS measurement's tracking state has code lock. */
@@ -803,8 +800,8 @@ public final class GnssMeasurement implements Parcelable { 
                return "Unknown";

            case MULTIPATH_INDICATOR_DETECTED:

                return "Detected";

            case MULTIPATH_INDICATOR_NOT_USED:

                return "NotUsed";

            case MULTIPATH_INDICATOR_NOT_DETECTED:

                return "NotDetected";

            default:

                return "<Invalid:" + mMultipathIndicator + ">";

        }

location/java/android/location/GnssMeasurementsEvent.java

+0 −7
Original line number Diff line number Diff line
@@ -34,13 +34,6 @@ import java.util.Collections; 
 * Events are delivered to registered instances of {@link Callback}.

 */

public final class GnssMeasurementsEvent implements Parcelable {

    /** @removed */

    public static final int STATUS_NOT_SUPPORTED = 0;

    /** @removed */

    public static final int STATUS_READY = 1;

    /** @removed */

    public static final int STATUS_GNSS_LOCATION_DISABLED = 2;



    private final GnssClock mClock;

    private final Collection<GnssMeasurement> mReadOnlyMeasurements;