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>
diff --git a/device-common.mk b/device-common.mk
index 525ae8d..0b53f89 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -49,6 +49,12 @@
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 d802936..04783a8 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -56,10 +56,6 @@
# 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
