| リビジョン | 522f707b8ea183de74660fcf888491a7fd91c68c (tree) |
|---|---|
| 日時 | 2020-07-16 02:30:37 |
| 作者 | Chih-Wei Huang <cwhuang@linu...> |
| コミッター | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
Conflicts:
nativebridge/bin/enable_nativebridge
init.sh (diff)
nativebridge/bin/enable_nativebridge (diff)| @@ -129,6 +129,9 @@ function init_hal_bluetooth() | ||
| 129 | 129 | function init_hal_camera() |
| 130 | 130 | { |
| 131 | 131 | case "$UEVENT" in |
| 132 | + *81EK*) | |
| 133 | + set_prop_if_empty hal.camera.0 0,0 | |
| 134 | + ;; | |
| 132 | 135 | *e-tabPro*) |
| 133 | 136 | set_prop_if_empty hal.camera.0 0,270 |
| 134 | 137 | set_prop_if_empty hal.camera.2 1,90 |
| @@ -382,7 +385,7 @@ function init_tscal() | ||
| 382 | 385 | *ST70416-6*) |
| 383 | 386 | modprobe gslx680_ts_acpi |
| 384 | 387 | ;& |
| 385 | - *T91*|*T101*|*ET2002*|*74499FU*|*945GSE-ITE8712*|*CF-19[CDYFGKLP]*|*TECLAST:rntPAD*) | |
| 388 | + *81EK*|*T91**|*T101*|*ET2002*|*74499FU*|*945GSE-ITE8712*|*CF-19[CDYFGKLP]*|*TECLAST:rntPAD*) | |
| 386 | 389 | create_pointercal |
| 387 | 390 | return |
| 388 | 391 | ;; |
| @@ -15,7 +15,7 @@ urls[5]=http://goo.gl/CtKjxx | ||
| 15 | 15 | |
| 16 | 16 | mount_sfs() |
| 17 | 17 | { |
| 18 | - mount -o 'context="u:object_r:system_file:s0"' $1 $2 | |
| 18 | + mount -o 'ro,context="u:object_r:system_file:s0"' $1 $2 | |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | if [ -z "$1" ]; then |
Android-x86
Fork