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

Commit a68a7a3d authored by Sasha Kuznetsov's avatar Sasha Kuznetsov
Browse files

Revert^2 "Add GnssAntennaInfo framework APIs" + added fixes 

fef92475

Test: End to end test: run "atest GnssAntennaInfoRegistrationTest" on cuttlefish and watch "adb logcat | grep -i GnssAntennaInfo". Other tests:  atest GnssAntennaInfoTest, atest GnssAntennaInfoProviderTest, atest GnssManagerServiceTest, atest VtsHalGnssV2_1TargetTest, atest LocationManagerFineTest.
Bug: 124556515
Change-Id: Ie1a8a60b9d7b9b95335bc84118639e33e0784ca1
parent eb1ae5b6

api/current.txt

+65 −0
Original line number Diff line number Diff line
@@ -23477,6 +23477,69 @@ package android.location { 
    method public static boolean isPresent();

  }













  public final class GnssAntennaInfo implements android.os.Parcelable {













    ctor public GnssAntennaInfo(double, @NonNull android.location.GnssAntennaInfo.PhaseCenterOffsetCoordinates, @Nullable android.location.GnssAntennaInfo.PhaseCenterVariationCorrections, @Nullable android.location.GnssAntennaInfo.SignalGainCorrections);













    method public int describeContents();













    method public double getCarrierFrequencyMHz();













    method @NonNull public android.location.GnssAntennaInfo.PhaseCenterOffsetCoordinates getPhaseCenterOffsetCoordinates();













    method @Nullable public android.location.GnssAntennaInfo.PhaseCenterVariationCorrections getPhaseCenterVariationCorrections();













    method @Nullable public android.location.GnssAntennaInfo.SignalGainCorrections getSignalGainCorrections();













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













    field @NonNull public static final android.os.Parcelable.Creator<android.location.GnssAntennaInfo> CREATOR;













  }

























  public abstract static class GnssAntennaInfo.Callback {













    ctor public GnssAntennaInfo.Callback();













    method public void onGnssAntennaInfoReceived(@NonNull java.util.List<android.location.GnssAntennaInfo>);













    method public void onStatusChanged(int);













    field public static final int STATUS_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 final class GnssAntennaInfo.PhaseCenterOffsetCoordinates implements android.os.Parcelable {













    ctor public GnssAntennaInfo.PhaseCenterOffsetCoordinates(double, double, double, double, double, double);













    method public int describeContents();













    method public double getXCoordMillimeters();













    method public double getXCoordUncertaintyMillimeters();













    method public double getYCoordMillimeters();













    method public double getYCoordUncertaintyMillimeters();













    method public double getZCoordMillimeters();













    method public double getZCoordUncertaintyMillimeters();













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













    field @NonNull public static final android.os.Parcelable.Creator<android.location.GnssAntennaInfo.PhaseCenterOffsetCoordinates> CREATOR;













  }

























  public static final class GnssAntennaInfo.PhaseCenterVariationCorrections implements android.os.Parcelable {













    ctor public GnssAntennaInfo.PhaseCenterVariationCorrections(@NonNull double[][], @NonNull double[][]);













    method public int describeContents();













    method public double getDeltaPhi();













    method public double getDeltaTheta();













    method public int getNumColumns();













    method public int getNumRows();













    method public double getPhaseCenterVariationCorrectionMillimetersAt(int, int);













    method public double getPhaseCenterVariationCorrectionUncertaintyMillimetersAt(int, int);













    method @NonNull public double[][] getRawCorrectionUncertaintiesArray();













    method @NonNull public double[][] getRawCorrectionsArray();













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













    field @NonNull public static final android.os.Parcelable.Creator<android.location.GnssAntennaInfo.PhaseCenterVariationCorrections> CREATOR;













  }

























  public static final class GnssAntennaInfo.SignalGainCorrections implements android.os.Parcelable {













    ctor public GnssAntennaInfo.SignalGainCorrections(@NonNull double[][], @NonNull double[][]);













    method public int describeContents();













    method public double getDeltaPhi();













    method public double getDeltaTheta();













    method public int getNumColumns();













    method public int getNumRows();













    method @NonNull public double[][] getRawCorrectionUncertaintiesArray();













    method @NonNull public double[][] getRawCorrectionsArray();













    method public double getSignalGainCorrectionDbiAt(int, int);













    method public double getSignalGainCorrectionUncertaintyDbiAt(int, int);













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













    field @NonNull public static final android.os.Parcelable.Creator<android.location.GnssAntennaInfo.SignalGainCorrections> CREATOR;













  }



























  public final class GnssClock implements android.os.Parcelable {















    method public int describeContents();















    method public double getBiasNanos();










@@ -23794,6 +23857,7 @@ package android.location {













    method @NonNull public java.util.List<java.lang.String> getProviders(@NonNull android.location.Criteria, boolean);















    method public boolean isLocationEnabled();















    method public boolean isProviderEnabled(@NonNull String);













    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerAntennaInfoCallback(@NonNull java.util.concurrent.Executor, @NonNull android.location.GnssAntennaInfo.Callback);















    method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssMeasurementsCallback(@NonNull android.location.GnssMeasurementsEvent.Callback);















    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssMeasurementsCallback(@NonNull android.location.GnssMeasurementsEvent.Callback, @Nullable android.os.Handler);















    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssMeasurementsCallback(@NonNull java.util.concurrent.Executor, @NonNull android.location.GnssMeasurementsEvent.Callback);










@@ -23825,6 +23889,7 @@ package android.location {













    method public void setTestProviderEnabled(@NonNull String, boolean);















    method public void setTestProviderLocation(@NonNull String, @NonNull android.location.Location);















    method @Deprecated public void setTestProviderStatus(@NonNull String, int, @Nullable android.os.Bundle, long);













    method public void unregisterAntennaInfoCallback(@NonNull android.location.GnssAntennaInfo.Callback);















    method public void unregisterGnssMeasurementsCallback(@NonNull android.location.GnssMeasurementsEvent.Callback);















    method public void unregisterGnssNavigationMessageCallback(@NonNull android.location.GnssNavigationMessage.Callback);















    method public void unregisterGnssStatusCallback(@NonNull android.location.GnssStatus.Callback);

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -3800,6 +3800,7 @@ package android.location {



























  public final class GnssCapabilities {















    method public boolean hasGeofencing();













    method public boolean hasGnssAntennaInfo();















    method public boolean hasLowPowerMode();















    method public boolean hasMeasurementCorrections();















    method public boolean hasMeasurementCorrectionsExcessPathLength();

































location/java/android/location/GnssAntennaInfo.aidl
0 → 100644



+19
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2020, The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *     http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.location;



























parcelable GnssAntennaInfo;










 No newline at end of file
























location/java/android/location/GnssAntennaInfo.java
0 → 100644



+654
−0


























File added.
Preview size limit exceeded, changes collapsed.
























location/java/android/location/GnssCapabilities.java



+14
−0




























Original line number
Diff line number
Diff line








@@ -82,6 +82,12 @@ public final class GnssCapabilities {













     */















    public static final long MEASUREMENT_CORRECTIONS_REFLECTING_PLANE           = 1L << 8;





























    /**













     * Bit mask indicating GNSS chipset supports GNSS antenna info.













     * @hide













     */













    public static final long ANTENNA_INFO                                       = 1L << 9;





























    /** @hide */















    public static final long INVALID_CAPABILITIES = -1;


























@@ -165,6 +171,13 @@ public final class GnssCapabilities {













        return hasCapability(MEASUREMENT_CORRECTIONS_REFLECTING_PLANE);















    }





























    /**













     * Returns {@code true} if GNSS chipset supports antenna info, {@code false} otherwise.













     */













    public boolean hasGnssAntennaInfo() {













        return hasCapability(ANTENNA_INFO);













    }





























    @NonNull















    @Override















    public String toString() {









@@ -172,6 +185,7 @@ public final class GnssCapabilities {













        if (hasLowPowerMode()) sb.append("LOW_POWER_MODE ");















        if (hasSatelliteBlacklist()) sb.append("SATELLITE_BLACKLIST ");















        if (hasGeofencing()) sb.append("GEOFENCING ");













        if (hasGnssAntennaInfo()) sb.append("ANTENNA_INFO ");















        if (hasMeasurements()) sb.append("MEASUREMENTS ");















        if (hasNavMessages()) sb.append("NAV_MESSAGES ");















        if (hasMeasurementCorrections()) sb.append("MEASUREMENT_CORRECTIONS ");