diff options
author | Yongqin Liu <yongqin.liu@linaro.org> | 2017-03-28 20:37:04 +0800 |
---|---|---|
committer | Yongqin Liu <yongqin.liu@linaro.org> | 2017-03-28 20:37:04 +0800 |
commit | 3b619fcdf5c05a37bec05f49e3b0f270f6251b78 (patch) | |
tree | b82cb6baac5b7efdfb33d958f7c2c4235ebe78c5 | |
parent | 81d632f47f3125d564068f4bb473eaecaa250a10 (diff) | |
download | android-patchsets-3b619fcdf5c05a37bec05f49e3b0f270f6251b78.tar.gz |
hikey: patches for fix wifi problem
and update the patch in hikey-optee-n, so that no merge conflict
Change-Id: Ief80ddfc609b529dcb47ffee764f50385ac14d8c
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rwxr-xr-x | hikey-n-workarounds | 10 | ||||
-rwxr-xr-x | hikey-optee-n | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/hikey-n-workarounds b/hikey-n-workarounds index 526340c..501e6fd 100755 --- a/hikey-n-workarounds +++ b/hikey-n-workarounds @@ -47,17 +47,19 @@ cherrypick frameworks/base a0126e0857481866dab5060384d611c83ca53d0e ####################################################### ## workaround for using master device for nougat ###### ####################################################### +## revert hikey: Move wpa_supplicant to vendor partition +revert device/linaro/hikey 17ea3f3016b967ddcca535acb90dc1c3f8d98ec2 + ## update sepolicy rules on bluetooth ## http://android-review.linaro.org/17563 apply --linaro device/linaro/hikey 17563/1 -####################################################### -## workaround for linaro work ###### -####################################################### ## disable bluetooth ## https://android-review.linaro.org/#/c/17621/ apply --linaro device/linaro/hikey 17621/1 - +####################################################### +## workaround for linaro work ###### +####################################################### ## integrated tests ## http://android-review.linaro.org/17155 apply --linaro device/linaro/hikey 17155/4 diff --git a/hikey-optee-n b/hikey-optee-n index 2005de2..56ca5f2 100755 --- a/hikey-optee-n +++ b/hikey-optee-n @@ -20,7 +20,7 @@ fi ################################################## ## Integrate OP-TEE components ## http://android-review.linaro.org/16991 -apply --linaro device/linaro/hikey 16991/6 +apply --linaro device/linaro/hikey 16991/9 ## OP-TEE SELinux ## https://android-review.linaro.org/#/c/17177/ |