From ea8a2145c915d9597f0f0db9f1f94cd3797efe9f Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Thu, 30 Apr 2020 23:45:15 -0700
Subject: Revert an API breaking changes

bug:150281259

Test: N/A

Change-Id: Ie30286456af15dd7b81bceb0547ffe8bfac422d2
---
 .../java/android/location/GnssAntennaInfo.java     | 41 +++++-----------------
 1 file changed, 8 insertions(+), 33 deletions(-)

(limited to 'location/java')

diff --git a/location/java/android/location/GnssAntennaInfo.java b/location/java/android/location/GnssAntennaInfo.java
index 88bf36879262..b2f9a0f41b7e 100644
--- a/location/java/android/location/GnssAntennaInfo.java
+++ b/location/java/android/location/GnssAntennaInfo.java
@@ -95,55 +95,31 @@ public final class GnssAntennaInfo implements Parcelable {
                     }
                 };
 
-        /**
-         * Returns the x-axis offset of the phase center from the origin of the Android sensor
-         * coordinate system, in millimeters.
-         */
         @FloatRange()
         public double getXOffsetMm() {
             return mOffsetXMm;
         }
 
-        /**
-         * Returns the 1-sigma uncertainty of the x-axis offset of the phase center from the origin
-         * of the Android sensor coordinate system, in millimeters.
-         */
         @FloatRange()
         public double getXOffsetUncertaintyMm() {
             return mOffsetXUncertaintyMm;
         }
 
-        /**
-         * Returns the y-axis offset of the phase center from the origin of the Android sensor
-         * coordinate system, in millimeters.
-         */
         @FloatRange()
         public double getYOffsetMm() {
             return mOffsetYMm;
         }
 
-        /**
-         * Returns the 1-sigma uncertainty of the y-axis offset of the phase center from the origin
-         * of the Android sensor coordinate system, in millimeters.
-         */
         @FloatRange()
         public double getYOffsetUncertaintyMm() {
             return mOffsetYUncertaintyMm;
         }
 
-        /**
-         * Returns the z-axis offset of the phase center from the origin of the Android sensor
-         * coordinate system, in millimeters.
-         */
         @FloatRange()
         public double getZOffsetMm() {
             return mOffsetZMm;
         }
 
-        /**
-         * Returns the 1-sigma uncertainty of the z-axis offset of the phase center from the origin
-         * of the Android sensor coordinate system, in millimeters.
-         */
         @FloatRange()
         public double getZOffsetUncertaintyMm() {
             return mOffsetZUncertaintyMm;
@@ -178,8 +154,7 @@ public final class GnssAntennaInfo implements Parcelable {
      * Represents corrections on a spherical mapping. Corrections are added to measurements to
      * obtain the corrected values.
      *
-     * The corrections and associated (1-sigma) uncertainties are represented by respective 2D
-     * matrices.
+     * The corrections and associated (1-sigma) uncertainties are represented by respect 2D arrays.
      *
      * Each row (major indices) represents a fixed theta. The first row corresponds to a
      * theta angle of 0 degrees. The last row corresponds to a theta angle of (360 - deltaTheta)
@@ -202,18 +177,18 @@ public final class GnssAntennaInfo implements Parcelable {
                 @NonNull double[][] correctionUncertainties) {
             if (corrections.length != correctionUncertainties.length
                     || corrections[0].length != correctionUncertainties[0].length) {
-                throw new IllegalArgumentException("Correction and correction uncertainty matrices "
+                throw new IllegalArgumentException("Correction and correction uncertainty arrays "
                         + "must have the same dimensions.");
             }
 
             mNumRows = corrections.length;
             if (mNumRows < 1) {
-                throw new IllegalArgumentException("Matrix must have at least one row.");
+                throw new IllegalArgumentException("Arrays must have at least one row.");
             }
 
             mNumColumns = corrections[0].length;
             if (mNumColumns < 2) {
-                throw new IllegalArgumentException("Matrix must have at least two columns.");
+                throw new IllegalArgumentException("Arrays must have at least two columns.");
             }
 
             mCorrections = corrections;
@@ -248,7 +223,7 @@ public final class GnssAntennaInfo implements Parcelable {
         }
 
         /**
-         * Matrix representing corrections on a spherical mapping. Corrections are added to
+         * Array representing corrections on a spherical mapping. Corrections are added to
          * measurements to obtain the corrected values.
          *
          * Each row (major indices) represents a fixed theta. The first row corresponds to a
@@ -261,12 +236,12 @@ public final class GnssAntennaInfo implements Parcelable {
          * angles, i.e., deltaPhi = 180 / (number of columns - 1).
          */
         @NonNull
-        public double[][] getCorrectionsMatrix() {
+        public double[][] getCorrectionsArray() {
             return mCorrections;
         }
 
         /**
-         * Matrix representing uncertainty on corrections on a spherical mapping.
+         * Array representing uncertainty on corrections on a spherical mapping.
          *
          * Each row (major indices) represents a fixed theta. The first row corresponds to a
          * theta angle of 0 degrees. The last row corresponds to a theta angle of (360 - deltaTheta)
@@ -278,7 +253,7 @@ public final class GnssAntennaInfo implements Parcelable {
          * angles, i.e., deltaPhi = 180 / (number of columns - 1).
          */
         @NonNull
-        public double[][] getCorrectionUncertaintiesMatrix() {
+        public double[][] getCorrectionUncertaintiesArray() {
             return mCorrectionUncertainties;
         }
 
-- 
cgit v1.2.3-59-g8ed1b