summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-24 21:24:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-24 21:24:53 +0000
commit1e97e64bf24f2db2292dc85135f2457ca1ef1540 (patch)
tree14864fcb200d570be73b0a474ec04bfd8b891d0d /core/java/android
parent546eaaaad8289a3426b8a56d29a14a4eb4b6f7c6 (diff)
parent89d18e94e4f42554ae5584ac76960638fd24b74d (diff)
Merge "Fix setType() return value for high angle sensor" am: 5a2d80de45 am: 89d18e94e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436893 Change-Id: I5d4a833884e9c732b9f96cd0ca6f72a889b89254
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/hardware/Sensor.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java
index cc4c45699bd4..a6e8c1395701 100644
--- a/core/java/android/hardware/Sensor.java
+++ b/core/java/android/hardware/Sensor.java
@@ -1245,6 +1245,7 @@ public final class Sensor {
return true;
case TYPE_HINGE_ANGLE:
mStringType = STRING_TYPE_HINGE_ANGLE;
+ return true;
default:
return false;
}