• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

device/generic/common


Commit MetaInfo

Revisión271176133bba4beaaf08d0f24f5389aa5e9e1b71 (tree)
Tiempo2019-06-20 18:19:23
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

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

Cambiar Resumen

Diferencia incremental

--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -17,7 +17,6 @@
1717 #ifndef _BDROID_BUILDCFG_H
1818 #define _BDROID_BUILDCFG_H
1919
20-#define BTM_DEF_LOCAL_NAME "Android-x86"
2120 // At present either USB or UART is supported
2221 #define BLUETOOTH_HCI_USE_USB TRUE
2322 // Bluetooth Low Power Mode is supported on BT4.0
--- /dev/null
+++ b/idc/Vendor_04f3_Product_261a_Version_0100.idc
@@ -0,0 +1,2 @@
1+touch.deviceType = touchScreen
2+touch.orientationAware = 1
--- a/init.sh
+++ b/init.sh
@@ -15,6 +15,13 @@ function set_prop_if_empty()
1515 [ -z "$(getprop $1)" ] && set_property "$1" "$2"
1616 }
1717
18+function rmmod_if_exist()
19+{
20+ for m in $*; do
21+ [ -d /sys/module/$m ] && rmmod $m
22+ done
23+}
24+
1825 function init_misc()
1926 {
2027 # device information
@@ -30,6 +37,27 @@ function init_misc()
3037 # enable sdcardfs if /data is not mounted on tmpfs or 9p
3138 mount | grep /data\ | grep -qE 'tmpfs|9p'
3239 [ $? -ne 0 ] && modprobe sdcardfs
40+
41+ # remove wl if it's not used
42+ local wifi
43+ if [ -d /sys/class/net/wlan0 ]; then
44+ wifi=$(basename `readlink /sys/class/net/wlan0/device/driver`)
45+ [ "$wifi" != "wl" ] && rmmod_if_exist wl
46+ fi
47+
48+ # enable virt_wifi if needed
49+ local eth=`getprop net.virt_wifi eth0`
50+ if [ -d /sys/class/net/$eth -a "$VIRT_WIFI" != "0" ]; then
51+ if [ -n "$wifi" -a "$VIRT_WIFI" = "1" ]; then
52+ rmmod_if_exist iwlmvm $wifi
53+ fi
54+ if [ ! -d /sys/class/net/wlan0 ]; then
55+ ifconfig $eth down
56+ ip link set $eth name wifi_eth
57+ ifconfig wifi_eth up
58+ ip link add link wifi_eth name wlan0 type virt_wifi
59+ fi
60+ fi
3361 }
3462
3563 function init_hal_audio()
@@ -288,7 +316,7 @@ function init_hal_sensors()
288316 *i7Stylus*|*M80TA*)
289317 set_property ro.iio.accel.x.opt_scale -1
290318 ;;
291- *ONDATablet*)
319+ *LenovoMIIX320*|*ONDATablet*)
292320 set_property ro.iio.accel.order 102
293321 set_property ro.iio.accel.x.opt_scale -1
294322 set_property ro.iio.accel.y.opt_scale -1
--- a/treble.mk
+++ b/treble.mk
@@ -48,8 +48,10 @@ PRODUCT_PACKAGES += \
4848 android.hardware.light@2.0-service
4949
5050 # Memtrack HAL
51-#PRODUCT_PACKAGES += \
52- android.hardware.memtrack@1.0-impl
51+PRODUCT_PACKAGES += \
52+ memtrack.default \
53+ android.hardware.memtrack@1.0-impl \
54+ android.hardware.memtrack@1.0-service
5355
5456 # Power HAL
5557 PRODUCT_PACKAGES += \