summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-25 05:24:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-25 05:24:31 +0000
commitcec2a6d20fbee7726cdc4fbb211d54111b9e6fcb (patch)
tree705bbb15a660f73678c196dbd1e3e1624ff5eb8d /core/java/android
parent70bfab0dd212b74fc32e4264482eae1bc1547cf2 (diff)
parenta57b4b75c56f447553220cf6239bf381c0f9e8ba (diff)
Merge "Fix setType() return value for high angle sensor" am: 5a2d80de45 am: 89d18e94e4 am: 1e97e64bf2 am: a57b4b75c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436893 Change-Id: I4a6974cab2f97b5c9f2a550c99857788592f3db1
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;
}