Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from topic "rm-vibrator-1-4"

Browse Source 
* changes:
  vibrator@1.4: remove from current.txt
  Remove vibrator@1.4 from VNDK.
  Restore vibrator@1.3 example service.
This commit is contained in:
Steven Moreland
2019-11-12 21:39:26 +00:00
committed by Gerrit Code Review
parent 460be58661 5bd756e62e
commit 5aca9f6f40
11 changed files with 23 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compatibility_matrices/compatibility_matrix.current.xml
View File

@@ -476,7 +476,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.vibrator</name>
<version>1.0-4</version>
<version>1.0-3</version>
<interface>
<name>IVibrator</name>
<instance>default</instance>

3
current.txt
View File

@@ -591,9 +591,6 @@ ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardwar
db47f4ceceb1f06c656f39caa70c557b0f8471ef59fd58611bea667ffca20101 android.hardware.health@2.1::types
34515afa2bb792d3c6d8495a5f5d907d179c8507ca5e55c10050d02ae1d516ef android.hardware.neuralnetworks@1.3::IDevice
b74fe72cfe438f50e772e6a307657ff449d5bde83c15dd1f140ff2edbe73499c android.hardware.neuralnetworks@1.3::types
544049dcda3f943ad67d83d5277f06681a3782982a9af5a78b5d4e8d295d061a android.hardware.vibrator@1.4::IVibrator
5e1c12efbbba89c9143d10b1b90eceff8bc79aa079f5106215b528e104fef101 android.hardware.vibrator@1.4::IVibratorCallback
033eae03c09ebc75e82db37bc39995dfaa9086745577b44d9e14e9ccb48bd8cc android.hardware.vibrator@1.4::types
41c602462ccd1b19cfd645994be4de4c07fc197ff58a54e84476b31908e61e21 android.hardware.radio@1.5::types
a8691c71747c3f14f7a043598e856425077f755e55990507a9132ad62f8ab3f7 android.hardware.radio@1.5::IRadio
a62a93faf173b14a6175b683ebf61ffa568dc61f81e369d2dce7b1265e86cf2f android.hardware.radio@1.5::IRadioIndication

7
vibrator/1.x/example/Android.bp → vibrator/1.3/example/Android.bp
View File

@@ -14,11 +14,11 @@
// limitations under the License.
cc_binary {
name: "android.hardware.vibrator@1.x-service.example",
name: "android.hardware.vibrator@1.3-service.example",
vendor: true,
relative_install_path: "hw",
init_rc: ["android.hardware.vibrator@1.x-service.example.rc"],
vintf_fragments: ["android.hardware.vibrator@1.x-service.example.xml"],
init_rc: ["android.hardware.vibrator@1.3-service.example.rc"],
vintf_fragments: ["android.hardware.vibrator@1.3-service.example.xml"],
srcs: ["service.cpp", "Vibrator.cpp"],
cflags: ["-Wall", "-Werror"],
shared_libs: [
@@ -29,6 +29,5 @@ cc_binary {
"android.hardware.vibrator@1.1",
"android.hardware.vibrator@1.2",
"android.hardware.vibrator@1.3",
"android.hardware.vibrator@1.4",
],
}

0
vibrator/1.x/example/OWNERS → vibrator/1.3/example/OWNERS
View File

32
vibrator/1.x/example/Vibrator.cpp → vibrator/1.3/example/Vibrator.cpp
View File

@@ -23,7 +23,7 @@
namespace android {
namespace hardware {
namespace vibrator {
namespace V1_4 {
namespace V1_3 {
namespace implementation {
static constexpr uint32_t MS_PER_S = 1000;
@@ -100,25 +100,7 @@ Return<Status> Vibrator::setExternalControl(bool enabled) {
}
}
Return<void> Vibrator::perform_1_3(V1_3::Effect effect, EffectStrength strength,
perform_cb _hidl_cb) {
return perform<decltype(effect)>(effect, strength, _hidl_cb);
}
// Methods from ::android::hardware::vibrator::V1_4::IVibrator follow.
Return<hidl_bitfield<Capabilities>> Vibrator::getCapabilities() {
return Capabilities::ON_COMPLETION_CALLBACK | Capabilities::PERFORM_COMPLETION_CALLBACK;
}
Return<Status> Vibrator::on_1_4(uint32_t timeoutMs, const sp<IVibratorCallback>& callback) {
mCallback = callback;
return on(timeoutMs);
}
Return<void> Vibrator::perform_1_4(V1_3::Effect effect, EffectStrength strength,
const sp<IVibratorCallback>& callback, perform_cb _hidl_cb) {
mCallback = callback;
Return<void> Vibrator::perform_1_3(Effect effect, EffectStrength strength, perform_cb _hidl_cb) {
return perform<decltype(effect)>(effect, strength, _hidl_cb);
}
@@ -166,14 +148,6 @@ Status Vibrator::enable(bool enabled) {
return Status::UNSUPPORTED_OPERATION;
} else {
ALOGI("Enabled: %s -> %s\n", mEnabled ? "true" : "false", enabled ? "true" : "false");
if (mEnabled && !enabled) {
if (auto callback = mCallback) {
mCallback = nullptr;
if (auto ret = callback->onComplete(); !ret.isOk()) {
ALOGE("Failed completion callback: %s", ret.description().c_str());
}
}
}
mEnabled = enabled;
return Status::OK;
}
@@ -297,7 +271,7 @@ uint8_t Vibrator::strengthToAmplitude(EffectStrength strength, Status* status) {
}
} // namespace implementation
} // namespace V1_4
} // namespace V1_3
} // namespace vibrator
} // namespace hardware
} // namespace android

23
vibrator/1.x/example/Vibrator.h → vibrator/1.3/example/Vibrator.h
View File

@@ -13,21 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ANDROID_HARDWARE_VIBRATOR_V1_x_VIBRATOR_H
#define ANDROID_HARDWARE_VIBRATOR_V1_x_VIBRATOR_H
#ifndef ANDROID_HARDWARE_VIBRATOR_V1_3_VIBRATOR_H
#define ANDROID_HARDWARE_VIBRATOR_V1_3_VIBRATOR_H
#include <android/hardware/vibrator/1.4/IVibrator.h>
#include <android/hardware/vibrator/1.3/IVibrator.h>
#include <hidl/Status.h>
namespace android {
namespace hardware {
namespace vibrator {
namespace V1_4 {
namespace V1_3 {
namespace implementation {
using android::hardware::vibrator::V1_0::EffectStrength;
using android::hardware::vibrator::V1_0::Status;
using android::hardware::vibrator::V1_3::Effect;
class Vibrator : public IVibrator {
public:
@@ -52,14 +51,7 @@ class Vibrator : public IVibrator {
// Methods from ::android::hardware::vibrator::V1_3::IVibrator follow.
Return<bool> supportsExternalControl() override;
Return<Status> setExternalControl(bool enabled) override;
Return<void> perform_1_3(V1_3::Effect effect, EffectStrength strength,
perform_cb _hidl_cb) override;
// Methods from ::android::hardware::vibrator::V1_4::IVibrator follow.
Return<hidl_bitfield<Capabilities>> getCapabilities() override;
Return<Status> on_1_4(uint32_t timeoutMs, const sp<IVibratorCallback>& callback) override;
Return<void> perform_1_4(V1_3::Effect effect, EffectStrength strength,
const sp<IVibratorCallback>& callback, perform_cb _hidl_cb) override;
Return<void> perform_1_3(Effect effect, EffectStrength strength, perform_cb _hidl_cb) override;
private:
Return<void> perform(Effect effect, EffectStrength strength, perform_cb _hidl_cb);
@@ -80,12 +72,11 @@ class Vibrator : public IVibrator {
bool mExternalControl{false};
std::mutex mMutex;
timer_t mTimer{nullptr};
sp<IVibratorCallback> mCallback{nullptr};
};
} // namespace implementation
} // namespace V1_4
} // namespace V1_3
} // namespace vibrator
} // namespace hardware
} // namespace android
#endif // ANDROID_HARDWARE_VIBRATOR_V1_x_VIBRATOR_H
#endif // ANDROID_HARDWARE_VIBRATOR_V1_3_VIBRATOR_H

4
vibrator/1.3/example/android.hardware.vibrator@1.3-service.example.rc Normal file
View File

@@ -0,0 +1,4 @@
service vendor.vibrator-1-3 /vendor/bin/hw/android.hardware.vibrator@1.3-service.example
class hal
user system
group system

2
vibrator/1.x/example/android.hardware.vibrator@1.x-service.example.xml → vibrator/1.3/example/android.hardware.vibrator@1.3-service.example.xml
View File

@@ -2,7 +2,7 @@
<hal format="hidl">
<name>android.hardware.vibrator</name>
<transport>hwbinder</transport>
<version>1.4</version>
<version>1.3</version>
<interface>
<name>IVibrator</name>
<instance>default</instance>

8
vibrator/1.x/example/service.cpp → vibrator/1.3/example/service.cpp
View File

@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#define LOG_TAG "android.hardware.vibrator@1.x-service.example"
#define LOG_TAG "android.hardware.vibrator@1.3-service.example"
#include <android/hardware/vibrator/1.4/IVibrator.h>
#include <android/hardware/vibrator/1.3/IVibrator.h>
#include <hidl/HidlTransportSupport.h>
#include "Vibrator.h"
using android::hardware::configureRpcThreadpool;
using android::hardware::joinRpcThreadpool;
using android::hardware::vibrator::V1_4::IVibrator;
using android::hardware::vibrator::V1_4::implementation::Vibrator;
using android::hardware::vibrator::V1_3::IVibrator;
using android::hardware::vibrator::V1_3::implementation::Vibrator;
using namespace android;
status_t registerVibratorService() {

3
vibrator/1.4/Android.bp
View File

@@ -3,9 +3,6 @@
hidl_interface {
name: "android.hardware.vibrator@1.4",
root: "android.hardware",
vndk: {
enabled: true,
},
srcs: [
"types.hal",
"IVibrator.hal",

4
vibrator/1.x/example/android.hardware.vibrator@1.x-service.example.rc
View File

@@ -1,4 +0,0 @@
service vendor.vibrator-1-x /vendor/bin/hw/android.hardware.vibrator@1.x-service.example
class hal
user system
group system