diff options
| author | Alistair Strachan <astrachan@google.com> | 2019-05-16 14:33:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-16 14:33:52 +0000 |
| commit | c6b20e29fe8b25853271205a0004cea036d389f4 (patch) | |
| tree | b52d5525dce7575b738cd0dac3a4795207053da5 | |
| parent | f1f49571d5bc91c95c194e4d039c6b63d065a61d (diff) | |
| parent | 2f5ac9401dea33104f27dca25f8cbb93b39c13eb (diff) | |
| download | hikey-c6b20e29fe8b25853271205a0004cea036d389f4.tar.gz | |
Merge "HiKey/HiKey960: Migrate setprop calls to PRODUCT_PRODUCT_PROPERTIES"
| -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 |