diff options
| author | John Stultz <john.stultz@linaro.org> | 2019-05-16 00:28:46 +0000 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2019-05-16 00:28:46 +0000 |
| commit | 2f5ac9401dea33104f27dca25f8cbb93b39c13eb (patch) | |
| tree | b52d5525dce7575b738cd0dac3a4795207053da5 | |
| parent | 3574f5ad00797adc9b15f77f5fbe6b51fb692941 (diff) | |
| download | hikey-2f5ac9401dea33104f27dca25f8cbb93b39c13eb.tar.gz | |
HiKey/HiKey960: Migrate setprop calls to PRODUCT_PRODUCT_PROPERTIES
We recently added a workaround for for an adb/ffs crash:
https://android-review.googlesource.com/c/device/linaro/hikey/+/930268
Which due to other changes is no longer sticking. Using
PRODUCT_PRODUCT_PROPERTIES is the preferred way to set properties
so switch to code to do that.
Change-Id: I330131f29c51acc6027885300bce5346053c94ca
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | device-common.mk | 6 | ||||
| -rw-r--r-- | init.common.rc | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/device-common.mk b/device-common.mk index 525ae8d9..0b53f896 100644 --- a/device-common.mk +++ b/device-common.mk @@ -49,6 +49,12 @@ ifneq (,$(filter $(TARGET_PRODUCT),hikey960_tv hikey_tv)) DEVICE_PACKAGE_OVERLAYS += device/google/atv/overlay endif +#avoid usb crash +PRODUCT_PRODUCT_PROPERTIES += \ + persist.adb.nonblocking_ffs=0 \ + ro.adb.nonblocking_ffs=0 \ + + #Force navkeys on PRODUCT_PROPERTY_OVERRIDES += qemu.hw.mainkeys=0 diff --git a/init.common.rc b/init.common.rc index d802936d..04783a8a 100644 --- a/init.common.rc +++ b/init.common.rc @@ -56,10 +56,6 @@ on post-fs # If an app forces screen rotation, revert it once the apps closes setprop persist.demo.rotationlock 1 -# avoid USB crash - setprop persist.adb.nonblocking_ffs 0 - setprop ro.adb.nonblocking_ffs 0 - # enable Google-specific location features, # like NetworkLocationProvider and LocationCollector setprop ro.com.google.locationfeatures 1 |