summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorkopriva <kopriva@google.com>2018-10-01 11:58:15 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-01 11:58:15 -0700
commit3bc799f6dcaf927c4bf0565e6c236ad1377d6033 (patch)
tree70543f5512573a4cb553a982abca82ec859ac45b /core/java
parentbfa9ed00e047c1cb150a40e649e85fc5b98f3126 (diff)
parent21155ef8bcc86adcb0708941b5e2625c41d634a7 (diff)
Merge "docs: bug 72929620, nonoteslas typo" into pi-dev
am: 21155ef8bc Change-Id: I3db7fd7f549e0ca4fba7434cfbb6cb529ab9ca1e
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/hardware/GeomagneticField.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/GeomagneticField.java b/core/java/android/hardware/GeomagneticField.java
index 94f2ac085965..0d7b695d7f1d 100644
--- a/core/java/android/hardware/GeomagneticField.java
+++ b/core/java/android/hardware/GeomagneticField.java
@@ -31,7 +31,7 @@ import java.util.GregorianCalendar;
* Android may use a newer version of the model.
*/
public class GeomagneticField {
- // The magnetic field at a given point, in nonoteslas in geodetic
+ // The magnetic field at a given point, in nanoteslas in geodetic
// coordinates.
private float mX;
private float mY;
@@ -278,7 +278,7 @@ public class GeomagneticField {
}
/**
- * @return Horizontal component of the field strength in nonoteslas.
+ * @return Horizontal component of the field strength in nanoteslas.
*/
public float getHorizontalStrength() {
return (float) Math.hypot(mX, mY);