Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "vibrator: reflect CAP_EXTERNAL_AMPLITUDE_CONTROL"

Browse Source
This commit is contained in:
Steven Moreland
2019-11-07 19:18:08 +00:00
committed by Gerrit Code Review
parent c26568d8a7 3c5a3af3de
commit fb95396170
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/jni/com_android_server_VibratorService.cpp
View File

@@ -67,7 +67,11 @@ class VibratorShim : public V1_4::IVibrator {
Return<bool> supportsAmplitudeControl() override {
int32_t cap = 0;
if (!mVib->getCapabilities(&cap).isOk()) return false;
return (cap & aidl::IVibrator::CAP_AMPLITUDE_CONTROL) > 0;
if (mUnderExternalControl) {
return (cap & aidl::IVibrator::CAP_EXTERNAL_AMPLITUDE_CONTROL) > 0;
} else {
return (cap & aidl::IVibrator::CAP_AMPLITUDE_CONTROL) > 0;
}
}
Return<V1_0::Status> setAmplitude(uint8_t amplitude) override {
@@ -96,7 +100,11 @@ class VibratorShim : public V1_4::IVibrator {
}
Return<V1_0::Status> setExternalControl(bool enabled) override {
return toHidlStatus(mVib->setExternalControl(enabled));
Return<V1_0::Status> status = toHidlStatus(mVib->setExternalControl(enabled));
if (status.isOk() && status == V1_0::Status::OK) {
mUnderExternalControl = enabled;
}
return status;
}
Return<void> perform_1_3(V1_3::Effect effect, V1_0::EffectStrength strength,
@@ -167,6 +175,7 @@ class VibratorShim : public V1_4::IVibrator {
}
private:
sp<aidl::IVibrator> mVib;
bool mUnderExternalControl = false;
Return<V1_0::Status> toHidlStatus(const android::binder::Status& status) {
switch(status.exceptionCode()) {