From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Wed, 19 Sep 2018 02:32:21 +0000 (+0800)
Subject: Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
X-Git-Tag: android-x86-8.1-r1~13
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=d84a37332060abdaf6ab5523840a897a70e96067;hp=-c

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

d84a37332060abdaf6ab5523840a897a70e96067
diff --combined init.sh
index 5f367db,f617ade..76b16ac
--- a/init.sh
+++ b/init.sh
@@@ -118,10 -118,8 +118,8 @@@ function set_drm_mode(
  		ET1602*)
  			drm_mode=1366x768
  			;;
- 		VMware*)
- 			[ -n "$video" ] && drm_mode=$video
- 			;;
  		*)
+ 			[ -n "$video" ] && drm_mode=$video
  			;;
  	esac
  
@@@ -148,6 -146,7 +146,7 @@@ function init_hal_gralloc(
  			if [ "$HWACCEL" != "0" ]; then
  				set_property ro.hardware.hwcomposer drm
  				set_property ro.hardware.gralloc gbm
+ 				set_property debug.drm.mode.force ${video:-1280x800}
  			fi
  			set_prop_if_empty sleep.state none
  			;;
@@@ -420,9 -419,6 +419,9 @@@ function do_bootcomplete(
  			setkeycodes 0x66 172
  			setkeycodes 0x6b 127
  			;;
 +		VMware*)
 +			pm disable com.android.bluetooth
 +			;;
  		*)
  			;;
  	esac