Android-x86 7.1-r1 release (20180206)

[android-x86/device-generic-common.git] / init.sh

diff --git a/init.sh b/init.sh
index a4dd6f7..cde8a7c 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2013-2015 The Android-x86 Open Source Project
+# Copyright (C) 2013-2018 The Android-x86 Open Source Project

 #
 # License: GNU Public License v2 or later
 #
 #
 # License: GNU Public License v2 or later
 #


@@ -10,6 +10,11 @@ function set_property()
        [ -n "$DEBUG" ] && echo "$1"="$2" >> /dev/x86.prop
 }
 
        [ -n "$DEBUG" ] && echo "$1"="$2" >> /dev/x86.prop
 }
 

+function set_prop_if_empty()
+{
+       [ -z "$(getprop $1)" ] && set_property "$1" "$2"
+}
+

 function init_misc()
 {
        # device information
 function init_misc()
 {
        # device information


@@ -53,7 +58,6 @@ function init_hal_bluetooth()
                T10*TA|HP*Omni*)
                        BTUART_PORT=/dev/ttyS1
                        set_property hal.bluetooth.uart.proto bcm
                T10*TA|HP*Omni*)
                        BTUART_PORT=/dev/ttyS1
                        set_property hal.bluetooth.uart.proto bcm

-                       [ -z "$(getprop sleep.state)" ] && set_property sleep.state none

                        ;;
                MacBookPro8*)
                        rmmod b43
                        ;;
                MacBookPro8*)
                        rmmod b43


@@ -142,6 +146,7 @@ function init_hal_gralloc()
                                set_property ro.hardware.hwcomposer drm
                                set_property ro.hardware.gralloc gbm
                        fi
                                set_property ro.hardware.hwcomposer drm
                                set_property ro.hardware.gralloc gbm
                        fi

+                       set_prop_if_empty sleep.state none

                        ;;
                0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
                        if [ "$HWACCEL" != "0" ]; then
                        ;;
                0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
                        if [ "$HWACCEL" != "0" ]; then


@@ -178,6 +183,9 @@ function init_hal_power()
 
        # TODO
        case "$PRODUCT" in
 
        # TODO
        case "$PRODUCT" in

+               HP*Omni*|OEMB|Surface*3|T10*TA)
+                       set_prop_if_empty sleep.state none
+                       ;;

                *)
                        ;;
        esac
                *)
                        ;;
        esac