Snap for 5061196 from 3409b868ddcb612726aef5e0642572d32c02bf11 to master-cuttlefish-testing-releasemaster-cuttlefish-testing-release

Change-Id: I2f60e0853f5123c8c07ba965190b396b539907b4

14 files changed, 29 insertions, 237 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index d931ba7c6..6df795e9a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,7 +16,6 @@
 
 PRODUCT_MAKEFILES := \
 	aosp_cf_x86_64_auto:$(LOCAL_DIR)/vsoc_x86_64/auto/device.mk \
-	aosp_cf_x86_64_iot:$(LOCAL_DIR)/vsoc_x86_64/iot/device.mk \
 	aosp_cf_x86_64_pasan:$(LOCAL_DIR)/vsoc_x86_64/pasan/device.mk \
 	aosp_cf_x86_64_phone:$(LOCAL_DIR)/vsoc_x86_64/phone/device.mk \
 	aosp_cf_x86_64_go_phone:$(LOCAL_DIR)/vsoc_x86_64/go_phone/device.mk \
@@ -26,7 +25,6 @@ PRODUCT_MAKEFILES := \
 	aosp_cf_x86_64_tv:$(LOCAL_DIR)/vsoc_x86_64/tv/device.mk \
 	aosp_cf_x86_64_wear:$(LOCAL_DIR)/vsoc_x86_64/wear/device.mk \
 	aosp_cf_x86_auto:$(LOCAL_DIR)/vsoc_x86/auto/device.mk \
-	aosp_cf_x86_iot:$(LOCAL_DIR)/vsoc_x86/iot/device.mk \
 	aosp_cf_x86_pasan:$(LOCAL_DIR)/vsoc_x86/pasan/device.mk \
 	aosp_cf_x86_phone:$(LOCAL_DIR)/vsoc_x86/phone/device.mk \
 	aosp_cf_x86_go_phone:$(LOCAL_DIR)/vsoc_x86/go_phone/device.mk \
@@ -38,14 +36,12 @@ PRODUCT_MAKEFILES := \
 
 COMMON_LUNCH_CHOICES := \
 	aosp_cf_x86_auto-userdebug \
-	aosp_cf_x86_iot-userdebug \
 	aosp_cf_x86_phone-userdebug \
 	aosp_cf_x86_tablet-userdebug \
 	aosp_cf_x86_tablet_3g-userdebug \
 	aosp_cf_x86_tv-userdebug \
 	aosp_cf_x86_wear-userdebug \
 	aosp_cf_x86_64_auto-userdebug \
-	aosp_cf_x86_64_iot-userdebug \
 	aosp_cf_x86_64_phone-userdebug \
 	aosp_cf_x86_64_tablet-userdebug \
 	aosp_cf_x86_64_tablet_3g-userdebug \
diff --git a/shared/config/init.vsoc.rc b/shared/config/init.vsoc.rc
index 10730c403..589dfb261 100644
--- a/shared/config/init.vsoc.rc
+++ b/shared/config/init.vsoc.rc
@@ -12,6 +12,7 @@ on early-init
     chmod 0755 /sys/kernel/debug
     setprop service.adb.tcp.port 5555
     setprop ro.sf.lcd_density ${ro.boot.lcd_density}
+    setprop ro.setupwizard.mode ${ro.boot.setupwizard_mode}
 
 on init
     chown system root /dev/input_events
@@ -35,7 +36,13 @@ on fs
     mount_all /vendor/etc/fstab.${ro.hardware}
     restorecon_recursive /vendor
 
-    start setup_network
+    start rename_eth0
+    # works around framework netiface enumeration issue
+    start rename_eth1
+
+    # wait until rename_eth0 is done before attempting to stack wifi
+    wait /proc/self/net/xt_qtaguid/iface_stat/buried_eth0
+    start create_wifi
 
     # TODO(ender): Find better way to talk to serial port.
     chmod 622 /dev/kmsg
@@ -74,7 +81,15 @@ on boot
     start socket_forward_proxy
 
 
-service setup_network /vendor/bin/setup_network ${ro.boot.cuttlefish_network}
+service rename_eth0 /vendor/bin/rename_netiface eth0 buried_eth0
+    oneshot
+
+
+service rename_eth1 /vendor/bin/rename_netiface eth1 rmnet0
+    oneshot
+
+
+service create_wifi /vendor/bin/ip_link_add virt_wifi buried_eth0 wlan0
     oneshot
 
 
diff --git a/shared/device.mk b/shared/device.mk
index afdf30325..0ae414092 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -35,7 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.opengles.version=131072 \
     ro.ril.gprsclass=10 \
     ro.ril.hsxpa=1 \
-    ro.setupwizard.mode=DISABLED \
     wifi.interface=wlan0 \
 
 # Below is a list of properties we probably should get rid of.
@@ -68,7 +67,7 @@ PRODUCT_PACKAGES += \
     vsoc_input_service \
     vport_trigger \
     rename_netiface \
-    setup_network \
+    ip_link_add \
 
 #
 # Packages for AOSP-available stuff we use from the framework
diff --git a/shared/iot/device.mk b/shared/iot/device.mk
deleted file mode 100644
index 5ce553ee6..000000000
--- a/shared/iot/device.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-$(call inherit-product, device/google/cuttlefish/shared/device.mk)
-$(call inherit-product, device/google/iot/iot_base.mk)
-$(call inherit-product, device/google/iot/iot_board_config_minimal.mk)
-
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/shared/iot/overlay
-
-PRODUCT_COPY_FILES += \
-    device/google/iot/bootanimation.zip:/system/media/bootanimation.zip \
-
-PRODUCT_FULL_TREBLE_OVERRIDE := false
diff --git a/shared/iot/overlay/frameworks/base/core/res/res/values/config.xml b/shared/iot/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index d5dca9a81..000000000
--- a/shared/iot/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2018, The Android Open Source Project.
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="networkAttributes" translatable="false">
-    <item>"wifi,1,1,1,-1,true"</item>
-    <item>"bluetooth,7,7,2,-1,true"</item>
-  </string-array>
-  <string-array name="radioAttributes" translatable="false">
-    <item>"1,1"</item>
-    <item>"7,1"</item>
-  </string-array>
-  <string-array name="config_tether_wifi_regexs" translatable="false">
-    <item>"wlan0"</item>
-  </string-array>
-  <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
-  <bool name="config_bluetooth_address_validation">true</bool>
-  <bool name="config_showNavigationBar">false</bool>
-  <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
-  <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
-  Network Offload feature. We disable the use of this feature here. -->
-  <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
-  <!--  Maximum number of supported users -->
-  <integer name="config_multiuserMaximumUsers">1</integer>
-
-  <!-- Needed for CTS -->
-  <!-- Use the default VPN confirm dialog -->
-  <string name="config_customVpnConfirmDialogComponent" translatable="false"
-          >com.android.vpndialogs/com.android.vpndialogs.ConfirmDialog</string>
-
-  <!-- True if WallpaperService is enabled -->
-  <bool name="config_enableWallpaperService">true</bool>
-</resources>
diff --git a/shared/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/shared/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
deleted file mode 100644
index 359672349..000000000
--- a/shared/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2018, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<resources>
-    <bool name="def_bluetooth_on">true</bool>
-    <bool name="def_wifi_on">true</bool>
-    <bool name="def_stay_on_while_plugged_in">true</bool>
-    <bool name="def_device_provisioned">true</bool>
-    <bool name="def_user_setup_complete">true</bool>
-    <bool name="def_package_verifier_enable">false</bool>
-</resources>
diff --git a/shared/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/shared/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index e48a6aaec..1fa6ff4ac 100644
--- a/shared/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/shared/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -21,7 +21,6 @@
     <bool name="def_wifi_on">false</bool>
     <bool name="def_stay_on_while_plugged_in">true</bool>
     <bool name="def_device_provisioned">true</bool>
-    <bool name="def_user_setup_complete">true</bool>
     <bool name="def_install_non_market_apps">true</bool>
     <bool name="def_package_verifier_enable">false</bool>
 </resources>
diff --git a/shared/sepolicy/file_contexts b/shared/sepolicy/file_contexts
index 4f880f0d3..22c93a987 100644
--- a/shared/sepolicy/file_contexts
+++ b/shared/sepolicy/file_contexts
@@ -31,4 +31,4 @@
 /vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service\.sim             u:object_r:hal_bluetooth_sim_exec:s0
 /vendor/bin/hw/android\.hardware\.dumpstate@1\.0-service\.cuttlefish      u:object_r:hal_dumpstate_impl_exec:s0
 /vendor/bin/hw/android\.hardware\.health@2\.0-service.cuttlefish          u:object_r:hal_health_default_exec:s0
-/vendor/bin/setup_network    u:object_r:setup_network_exec:s0
+/vendor/bin/ip_link_add    u:object_r:ip_link_add_exec:s0
diff --git a/shared/sepolicy/ip_link_add.te b/shared/sepolicy/ip_link_add.te
new file mode 100644
index 000000000..a1c13e20f
--- /dev/null
+++ b/shared/sepolicy/ip_link_add.te
@@ -0,0 +1,10 @@
+type ip_link_add, domain;
+type ip_link_add_exec, exec_type, vendor_file_type, file_type;
+
+init_daemon_domain(ip_link_add)
+
+allow ip_link_add self:capability { net_admin net_raw sys_module };
+allow ip_link_add self:udp_socket { create ioctl };
+allow ip_link_add self:netlink_route_socket { bind create nlmsg_write read write };
+
+allow ip_link_add kernel:system module_request;
diff --git a/shared/sepolicy/setup_network.te b/shared/sepolicy/setup_network.te
deleted file mode 100644
index a1568a3cd..000000000
--- a/shared/sepolicy/setup_network.te
+++ /dev/null
@@ -1,10 +0,0 @@
-type setup_network, domain;
-type setup_network_exec, exec_type, vendor_file_type, file_type;
-
-init_daemon_domain(setup_network)
-
-allow setup_network self:capability { net_admin net_raw sys_module };
-allow setup_network self:udp_socket { create ioctl };
-allow setup_network self:netlink_route_socket { bind create nlmsg_write read write };
-
-allow setup_network kernel:system module_request;
diff --git a/vsoc_x86/iot/device.mk b/vsoc_x86/iot/device.mk
deleted file mode 100644
index 88504eab6..000000000
--- a/vsoc_x86/iot/device.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-$(call inherit-product, device/google/cuttlefish/shared/iot/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_iot
-PRODUCT_DEVICE := vsoc_x86
-PRODUCT_MODEL := Cuttlefish x86 IoT
\ No newline at end of file
diff --git a/vsoc_x86_64/iot/device.mk b/vsoc_x86_64/iot/device.mk
deleted file mode 100644
index 25a28a800..000000000
--- a/vsoc_x86_64/iot/device.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/google/cuttlefish/shared/iot/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_iot
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 IoT
\ No newline at end of file
diff --git a/vsoc_x86_64/iot/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86_64/iot/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index d5dca9a81..000000000
--- a/vsoc_x86_64/iot/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2018, The Android Open Source Project.
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="networkAttributes" translatable="false">
-    <item>"wifi,1,1,1,-1,true"</item>
-    <item>"bluetooth,7,7,2,-1,true"</item>
-  </string-array>
-  <string-array name="radioAttributes" translatable="false">
-    <item>"1,1"</item>
-    <item>"7,1"</item>
-  </string-array>
-  <string-array name="config_tether_wifi_regexs" translatable="false">
-    <item>"wlan0"</item>
-  </string-array>
-  <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
-  <bool name="config_bluetooth_address_validation">true</bool>
-  <bool name="config_showNavigationBar">false</bool>
-  <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
-  <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
-  Network Offload feature. We disable the use of this feature here. -->
-  <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
-  <!--  Maximum number of supported users -->
-  <integer name="config_multiuserMaximumUsers">1</integer>
-
-  <!-- Needed for CTS -->
-  <!-- Use the default VPN confirm dialog -->
-  <string name="config_customVpnConfirmDialogComponent" translatable="false"
-          >com.android.vpndialogs/com.android.vpndialogs.ConfirmDialog</string>
-
-  <!-- True if WallpaperService is enabled -->
-  <bool name="config_enableWallpaperService">true</bool>
-</resources>
diff --git a/vsoc_x86_64/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/vsoc_x86_64/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
deleted file mode 100644
index 359672349..000000000
--- a/vsoc_x86_64/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2018, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<resources>
-    <bool name="def_bluetooth_on">true</bool>
-    <bool name="def_wifi_on">true</bool>
-    <bool name="def_stay_on_while_plugged_in">true</bool>
-    <bool name="def_device_provisioned">true</bool>
-    <bool name="def_user_setup_complete">true</bool>
-    <bool name="def_package_verifier_enable">false</bool>
-</resources>