From 18 Jan, 2021 0:00 UTC: All services will be temporary unavailable for maintenance
  • R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscaphegui翻訳comegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

device/generic/common


Commit MetaInfo

Revision522f707b8ea183de74660fcf888491a7fd91c68c (tree)
Time2020-07-16 02:30:37
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

Conflicts:
nativebridge/bin/enable_nativebridge

Change Summary

Incremental Difference

--- a/init.sh
+++ b/init.sh
@@ -129,6 +129,9 @@ function init_hal_bluetooth()
129129 function init_hal_camera()
130130 {
131131 case "$UEVENT" in
132+ *81EK*)
133+ set_prop_if_empty hal.camera.0 0,0
134+ ;;
132135 *e-tabPro*)
133136 set_prop_if_empty hal.camera.0 0,270
134137 set_prop_if_empty hal.camera.2 1,90
@@ -382,7 +385,7 @@ function init_tscal()
382385 *ST70416-6*)
383386 modprobe gslx680_ts_acpi
384387 ;&
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*)
386389 create_pointercal
387390 return
388391 ;;
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -15,7 +15,7 @@ urls[5]=http://goo.gl/CtKjxx
1515
1616 mount_sfs()
1717 {
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
1919 }
2020
2121 if [ -z "$1" ]; then