diff options
author | Xin Li <delphij@google.com> | 2018-08-06 16:50:13 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2018-08-06 16:50:13 -0700 |
commit | c2d694cdd2f594340f197041b03c0471f1d7389a (patch) | |
tree | 165dbfb0e1e0e3609a3db0c20e31d5e71300b3d6 | |
parent | 2d8fb579d511429bbf3b2a2cdabaf9dd4361cba8 (diff) | |
parent | c2258c35ade6f29596aa0e44d231f09e68e2baad (diff) | |
download | hikey-c2d694cdd2f594340f197041b03c0471f1d7389a.tar.gz |
Merge Android Pie into master
Bug: 112104996
Change-Id: If475bd23f609a2910df5ac8e0c8464971fed1a7a
-rw-r--r-- | device-common.mk | 4 | ||||
-rw-r--r-- | init.common.rc | 8 | ||||
-rw-r--r-- | init.common.usb.rc | 15 | ||||
-rw-r--r-- | manifest.xml | 11 | ||||
-rw-r--r-- | sepolicy/hal_wifi_supplicant_default.te | 4 | ||||
-rw-r--r-- | sepolicy/hostapd.te | 11 |
6 files changed, 28 insertions, 25 deletions
diff --git a/device-common.mk b/device-common.mk index bad41b0e..e0927644 100644 --- a/device-common.mk +++ b/device-common.mk @@ -139,8 +139,8 @@ PRODUCT_PACKAGES += \ endif -# Use Launcher3 -PRODUCT_PACKAGES += Launcher3 +# Use Launcher3QuickStep +PRODUCT_PACKAGES += Launcher3QuickStep # Copy hardware config file(s) PRODUCT_COPY_FILES += \ diff --git a/init.common.rc b/init.common.rc index e1f9793d..c15b29dd 100644 --- a/init.common.rc +++ b/init.common.rc @@ -71,6 +71,11 @@ on post-fs-data # Set SELinux security contexts for files used by lava. restorecon_recursive /data/local/tmp/lava +on zygote-start + mkdir /data/vendor/wifi 0770 wifi wifi + mkdir /data/vendor/wifi/wpa 0770 wifi wifi + mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi + on property:sys.boot_completed=1 # update cpuset now that processors are up # Foreground should contain most cores (7 is reserved for top-app) @@ -102,8 +107,9 @@ service uim /vendor/bin/uim oneshot service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \ - -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ -g@android:wpa_wlan0 + interface android.hardware.wifi.supplicant@1.0::ISupplicant default + interface android.hardware.wifi.supplicant@1.1::ISupplicant default socket wpa_wlan0 dgram 660 wifi wifi class main disabled diff --git a/init.common.usb.rc b/init.common.usb.rc index 5d6986b3..f198a8b5 100644 --- a/init.common.usb.rc +++ b/init.common.usb.rc @@ -13,6 +13,7 @@ on boot mkdir /config/usb_gadget/g1/functions/midi.gs5 mkdir /config/usb_gadget/g1/functions/ffs.adb mkdir /config/usb_gadget/g1/functions/ffs.mtp + mkdir /config/usb_gadget/g1/functions/ffs.ptp mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1 @@ -22,7 +23,9 @@ on boot mkdir /dev/usb-ffs/adb 0770 shell shell mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000 mkdir /dev/usb-ffs/mtp 0770 mtp mtp + mkdir /dev/usb-ffs/ptp 0770 mtp mtp mount functionfs mtp /dev/usb-ffs/mtp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1 + mount functionfs ptp /dev/usb-ffs/ptp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1 setprop sys.usb.mtp.device_type 3 setprop sys.usb.configfs 1 setprop sys.usb.ffs.aio_compat 1 @@ -31,12 +34,12 @@ on boot on property:sys.usb.config=none && property:sys.usb.configfs=1 write /config/usb_gadget/g1/os_desc/use 0 -on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=mtp && property:sys.usb.configfs=1 +on property:sys.usb.config=mtp && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee1 write /config/usb_gadget/g1/os_desc/use 1 symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1 -on property:sys.usb.ffs.ready=1 && property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1 +on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee2 write /config/usb_gadget/g1/os_desc/use 1 symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1 @@ -47,15 +50,15 @@ on property:sys.usb.config=rndis && property:sys.usb.configfs=1 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee4 -on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=ptp && property:sys.usb.configfs=1 +on property:sys.usb.config=ptp && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee5 write /config/usb_gadget/g1/os_desc/use 1 - symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1 + symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1 -on property:sys.usb.ffs.ready=1 && property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1 +on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee6 write /config/usb_gadget/g1/os_desc/use 1 - symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1 + symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1 on property:sys.usb.config=adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee7 diff --git a/manifest.xml b/manifest.xml index 9e39a312..b90111d4 100644 --- a/manifest.xml +++ b/manifest.xml @@ -148,10 +148,19 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.wifi.supplicant</name> + <name>android.hardware.wifi.hostapd</name> <transport>hwbinder</transport> <version>1.0</version> <interface> + <name>IHostapd</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.wifi.supplicant</name> + <transport>hwbinder</transport> + <version>1.1</version> + <interface> <name>ISupplicant</name> <instance>default</instance> </interface> diff --git a/sepolicy/hal_wifi_supplicant_default.te b/sepolicy/hal_wifi_supplicant_default.te index 3646bac8..c657db53 100644 --- a/sepolicy/hal_wifi_supplicant_default.te +++ b/sepolicy/hal_wifi_supplicant_default.te @@ -4,7 +4,3 @@ typeattribute hal_wifi_supplicant_default data_between_core_and_vendor_violators allow hal_wifi_supplicant_default wifi_data_file:dir create_dir_perms; allow hal_wifi_supplicant_default wifi_data_file:file create_file_perms; - -# Create a socket for receiving info from wpa -allow hal_wifi_supplicant_default wpa_socket:dir create_dir_perms; -allow hal_wifi_supplicant_default wpa_socket:sock_file create_file_perms; diff --git a/sepolicy/hostapd.te b/sepolicy/hostapd.te deleted file mode 100644 index 86b985ae..00000000 --- a/sepolicy/hostapd.te +++ /dev/null @@ -1,11 +0,0 @@ -# TODO(b/36657258): Remove data_between_core_and_vendor_violators once -# hostapd no longer directly accesses /data outside /data/vendor. -typeattribute hostapd data_between_core_and_vendor_violators; -# hostapd can read and write WiFi related data and configuration. -allow hostapd wifi_data_file:file rw_file_perms; -r_dir_file(hostapd, wifi_data_file) - -# hostapd wants to create the directory holding its control socket. -allow hostapd hostapd_socket:dir create_dir_perms; -# hostapd needs to create, bind to, read, and write its control socket. -allow hostapd hostapd_socket:sock_file create_file_perms; |