diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2020-06-16 20:35:24 -0700 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2020-06-16 20:35:24 -0700 |
commit | bb3de347de452825bf4363a235b39b1c2e47d0bb (patch) | |
tree | 61ffe798933dab8f225ef96d6e00b0f544943138 | |
parent | f4346624da8f6679b494e1fec67d8e8245227ae1 (diff) | |
parent | 5d179ffc66f293f1f123d229d8bcc8bf8997faff (diff) |
Merge 5d179ffc66f293f1f123d229d8bcc8bf8997faff on remote branch
Change-Id: Icd675b4fdbd5530f47f462c50578c9be6afe576c
-rw-r--r-- | 1.2/Vibrator.cpp | 2 | ||||
-rw-r--r-- | 1.3/Android.bp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/1.2/Vibrator.cpp b/1.2/Vibrator.cpp index b699704..faff619 100644 --- a/1.2/Vibrator.cpp +++ b/1.2/Vibrator.cpp @@ -286,7 +286,7 @@ Return<Status> InputFFDevice::playEffect(int effectId, EffectStrength es, long * mCurrMagnitude = STRONG_MAGNITUDE; break; default: - break; + return Status::UNSUPPORTED_OPERATION; } return play(effectId, INVALID_VALUE, playLengthMs); diff --git a/1.3/Android.bp b/1.3/Android.bp index 73878e6..82b12ca 100644 --- a/1.3/Android.bp +++ b/1.3/Android.bp @@ -17,6 +17,9 @@ cc_binary { "liblog", "libutils", "libhardware", + "android.hardware.vibrator@1.0", + "android.hardware.vibrator@1.1", + "android.hardware.vibrator@1.2", "android.hardware.vibrator@1.3", "vendor.qti.hardware.vibrator@1.2-impl", ], |