Merge changes from topic "cf-from-4.19-to-5.4" am: ef92fd6f04 am: 3c4e098adb am: f4198b12a4
Change-Id: If26e61f1619d46fa09091182c90d4fedfbd667a1
diff --git a/Android.bp b/Android.bp
index 67ecf9d..86e4a08 100644
--- a/Android.bp
+++ b/Android.bp
@@ -110,21 +110,6 @@
host_supported: true,
defaults: ["cuttlefish_base"],
}
-//
-// 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.
-
cc_defaults {
name: "cuttlefish_recovery_available",
diff --git a/default-permissions.xml b/default-permissions.xml
new file mode 100644
index 0000000..2c1de87
--- /dev/null
+++ b/default-permissions.xml
@@ -0,0 +1,127 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+
+<!-- Copyright (C) 2019 Google Inc.
+
+ 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.
+-->
+
+<!--
+ This file contains permissions to be granted by default. Default
+ permissions are granted to special platform components and to apps
+ that are approved to get default grants. The special components
+ are apps that are expected tto work out-of-the-box as they provide
+ core use cases such as default dialer, default email, etc. These
+ grants are managed by the platform. The apps that are additionally
+ approved for default grants are ones that provide carrier specific
+ functionality, ones legally required at some location, ones providing
+ alternative disclosure and opt-out UI, ones providing highlight features
+ of a dedicated device, etc. This file contains only the latter exceptions.
+ Fixed permissions cannot be controlled by the user and need a special
+ approval. Typically these are to ensure either legally mandated functions
+ or the app is considered a part of the OS.
+-->
+
+<exceptions>
+
+ <!-- This is an example of an exception:
+ <exception
+ package="foo.bar.permission"
+ <permission name="android.permission.READ_CONTACTS" fixed="true"/>
+ <permission name="android.permission.READ_CALENDAR" fixed="false"/>
+ </exception>
+ -->
+
+ <exception
+ package="com.google.android.apps.pixelmigrate">
+ <!-- External storage -->
+ <permission name="android.permission.READ_EXTERNAL_STORAGE" fixed="false"/>
+ <permission name="android.permission.WRITE_EXTERNAL_STORAGE" fixed="false"/>
+ <!-- Contacts -->
+ <permission name="android.permission.READ_CONTACTS" fixed="false"/>
+ <permission name="android.permission.WRITE_CONTACTS" fixed="false"/>
+ <!-- Call logs -->
+ <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
+ <permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
+ <!-- SMS -->
+ <permission name="android.permission.RECEIVE_SMS" fixed="false"/>
+ <permission name="android.permission.READ_PHONE_NUMBERS" fixed="false"/>
+ </exception>
+
+ <exception
+ package="com.verizon.mips.services">
+ <!-- Call -->
+ <permission name="android.permission.PROCESS_OUTGOING_CALLS" fixed="false"/>
+ <!-- Phone -->
+ <permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
+ <!-- SMS -->
+ <permission name="android.permission.RECEIVE_SMS" fixed="false"/>
+ </exception>
+
+ <exception
+ package="com.google.android.projection.gearhead"
+ sha256-cert-digest="FD:B0:0C:43:DB:DE:8B:51:CB:31:2A:A8:1D:3B:5F:A1:77:13:AD:B9:4B:28:F5:98:D7:7F:8E:B8:9D:AC:EE:DF">
+ <!-- Gearhead legacy -->
+ <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
+ <permission name="android.permission.CALL_PHONE" fixed="false"/>
+ <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
+ <permission name="android.permission.READ_CONTACTS" fixed="false"/>
+ <permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
+ <permission name="android.permission.RECEIVE_SMS" fixed="false"/>
+ <permission name="android.permission.RECORD_AUDIO" fixed="false"/>
+ <permission name="android.permission.SEND_SMS" fixed="false"/>
+ <!-- For Top Gear -->
+ <permission name="android.permission.PROCESS_OUTGOING_CALLS" fixed="false"/>
+ <permission name="android.permission.READ_SMS" fixed="false"/>
+ <permission name="android.permission.RECEIVE_MMS" fixed="false"/>
+ <permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
+ <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
+ </exception>
+
+ <exception package="com.google.android.settings.intelligence">
+ <!-- Calendar -->
+ <permission name="android.permission.READ_CALENDAR" fixed="true"/>
+ <!-- Location -->
+ <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="true"/>
+ <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="true"/>
+ </exception>
+
+ <exception package="com.google.android.cbrsnetworkmonitor">
+ <!-- Location access to create CBRS geofences-->
+ <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="true"/>
+ <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="true"/>
+ </exception>
+
+ <exception package="com.google.android.apps.scone">
+ <!-- NLP Location access to determine proximity to country border -->
+ <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
+ <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/>
+ <!-- Used to call ActivityTransition API for Smart OOS & Smart PNO -->
+ <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
+ </exception>
+
+ <exception package="com.google.android.wfcactivation">
+ <!-- SMS -->
+ <permission name="android.permission.RECEIVE_WAP_PUSH" fixed="false"/>
+ </exception>
+ <exception
+ package="com.google.vr.apps.ornament"
+ sha256-cert-digest="4A:9E:3F:3B:C8:D6:0C:E4:D3:CB:E5:A9:C6:6E:EC:11:EF:D0:1C:5F:E9:C7:8D:8C:92:3B:9D:42:48:23:00:13">
+ <!-- Camera -->
+ <permission name="android.permission.CAMERA" fixed="false"/>
+ <!-- Microphone -->
+ <permission name="android.permission.RECORD_AUDIO" fixed="false"/>
+ <!-- Storage -->
+ <permission name="android.permission.READ_EXTERNAL_STORAGE" fixed="false"/>
+ <permission name="android.permission.WRITE_EXTERNAL_STORAGE" fixed="false"/>
+ </exception>
+</exceptions>
diff --git a/guest/hals/camera/fake-pipeline2/JpegCompressor.cpp b/guest/hals/camera/fake-pipeline2/JpegCompressor.cpp
index 7fb6cf1..22c5d3a 100644
--- a/guest/hals/camera/fake-pipeline2/JpegCompressor.cpp
+++ b/guest/hals/camera/fake-pipeline2/JpegCompressor.cpp
@@ -30,7 +30,8 @@
mIsBusy(false),
mSynchronous(false),
mBuffers(NULL),
- mListener(NULL) {}
+ mListener(NULL),
+ mFoundAux(false) {}
JpegCompressor::~JpegCompressor() { Mutex::Autolock lock(mMutex); }
@@ -121,7 +122,6 @@
// Find source and target buffers. Assumes only one buffer matches
// each condition!
ALOGV("%s: Compressing start", __FUNCTION__);
- bool mFoundAux = false;
for (size_t i = 0; i < mBuffers->size(); i++) {
const StreamBuffer &b = (*mBuffers)[i];
if (b.format == HAL_PIXEL_FORMAT_BLOB) {
diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index 30ff594..787aa5d 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -63,11 +63,13 @@
PRODUCT_PACKAGES += android.hardware.broadcastradio@2.0-service
# DRM HAL
-PRODUCT_PACKAGES += android.hardware.drm@1.2-service.clearkey
+PRODUCT_PACKAGES += android.hardware.drm@1.3-service.clearkey
-# GPS HAL
-PRODUCT_PACKAGES += \
- android.hardware.gnss@2.0-service
+# CAN bus HAL
+PRODUCT_PACKAGES += android.hardware.automotive.can@1.0-service
+PRODUCT_PACKAGES_DEBUG += canhalctrl \
+ canhaldump \
+ canhalsend
# DRM Properities
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/shared/auto/manifest.xml b/shared/auto/manifest.xml
index 7fcdd4d..a82a844 100644
--- a/shared/auto/manifest.xml
+++ b/shared/auto/manifest.xml
@@ -39,6 +39,19 @@
<instance>default</instance>
</interface>
</hal>
+ <hal format="hidl">
+ <name>android.hardware.automotive.can</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>ICanController</name>
+ <instance>socketcan</instance>
+ </interface>
+ <interface>
+ <name>ICanBus</name>
+ <instance>test</instance>
+ </interface>
+ </hal>
<!-- FIXME: Move this to shared manifest.xml -->
<hal format="hidl">
<name>android.hardware.broadcastradio</name>
diff --git a/shared/config/CleanSpec.mk b/shared/config/CleanSpec.mk
index 8ead76d..8c33800 100644
--- a/shared/config/CleanSpec.mk
+++ b/shared/config/CleanSpec.mk
@@ -46,3 +46,5 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.gnss@1.0-service)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.drm@1.2-service.clearkey)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.drm@1.2-service.widevine)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.gnss@2.0-service)
+$(call add-clean-step, find $(PRODUCT_OUT)/vendor/bin/hw/ -type f -name "android.hardware.drm@*" -print0 | xargs -0 rm -f)
diff --git a/shared/config/init.common.rc b/shared/config/init.common.rc
index 4833241..3957a38 100644
--- a/shared/config/init.common.rc
+++ b/shared/config/init.common.rc
@@ -162,13 +162,14 @@
interface android.hardware.wifi.supplicant@1.0::ISupplicant default
interface android.hardware.wifi.supplicant@1.1::ISupplicant default
interface android.hardware.wifi.supplicant@1.2::ISupplicant default
+ interface android.hardware.wifi.supplicant@1.3::ISupplicant default
socket wpa_wlan0 dgram 660 wifi wifi
group system wifi inet
disabled
oneshot
-service bugreport /system/bin/dumpstate -d -p -B -z -o /sdcard/bugreport
+service bugreport /system/bin/dumpstate -d -p -z
class main
disabled
oneshot
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index d54570f..32cc2c3 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -89,10 +89,11 @@
<hal format="hidl">
<name>android.hardware.camera.provider</name>
<transport>hwbinder</transport>
+ <impl level="generic"></impl>
<version>2.4</version>
<interface>
<name>ICameraProvider</name>
- <instance>legacy/0</instance>
+ <instance>internal/0</instance>
</interface>
</hal>
<hal format="hidl">
@@ -288,7 +289,7 @@
<hal format="hidl">
<name>android.hardware.soundtrigger</name>
<transport>hwbinder</transport>
- <version>2.0</version>
+ <version>2.3</version>
<interface>
<name>ISoundTriggerHw</name>
<instance>default</instance>
@@ -391,13 +392,4 @@
</interface>
</hal>
-->
- <hal format="hidl">
- <name>android.hardware.wifi.supplicant</name>
- <transport>hwbinder</transport>
- <version>1.2</version>
- <interface>
- <name>ISupplicant</name>
- <instance>default</instance>
- </interface>
- </hal>
</manifest>
diff --git a/shared/device.mk b/shared/device.mk
index 3eaebd1..a431399 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -37,7 +37,6 @@
# sepolicy
PRODUCT_PRODUCT_PROPERTIES += \
persist.adb.tcp.port=5555 \
- persist.traced.enable=1 \
ro.com.google.locationfeatures=1 \
# Explanation of specific properties:
@@ -60,6 +59,9 @@
PRODUCT_PROPERTY_OVERRIDES += \
wlan.driver.status=ok
+PRODUCT_SOONG_NAMESPACES += hardware/google/camera
+PRODUCT_SOONG_NAMESPACES += hardware/google/camera/devices/EmulatedCamera
+
#
# Packages for various GCE-specific utilities
#
@@ -118,7 +120,9 @@
#
PRODUCT_COPY_FILES += \
device/google/cuttlefish/shared/config/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
- device/google/cuttlefish/shared/config/camera_v3.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/camera.json \
+ hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_back.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_back.json \
+ hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_front.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_front.json \
+ hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_depth.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_depth.json \
device/google/cuttlefish/shared/config/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.common.rc \
device/google/cuttlefish/shared/config/init.cutf_cvm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.cutf_cvm.rc \
device/google/cuttlefish/shared/config/init.product.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/init.rc \
@@ -223,7 +227,7 @@
android.hardware.audio@5.0-impl:32 \
android.hardware.audio.effect@5.0-impl:32 \
android.hardware.audio@2.0-service \
- android.hardware.soundtrigger@2.0-impl \
+ android.hardware.soundtrigger@2.3-impl \
#
# Drm HAL
@@ -231,8 +235,8 @@
PRODUCT_PACKAGES += \
android.hardware.drm@1.0-impl \
android.hardware.drm@1.0-service \
- android.hardware.drm@1.2-service.clearkey \
- android.hardware.drm@1.2-service.widevine
+ android.hardware.drm@1.3-service.clearkey \
+ android.hardware.drm@1.3-service.widevine
#
# Dumpstate HAL
@@ -244,11 +248,9 @@
# Camera
#
PRODUCT_PACKAGES += \
- camera.cutf \
- camera.cutf.jpeg \
- camera.device@3.2-impl \
- android.hardware.camera.provider@2.4-impl \
- android.hardware.camera.provider@2.4-service
+ android.hardware.camera.provider@2.4-service-google \
+ libgooglecamerahwl_impl \
+ android.hardware.camera.provider@2.4-impl-google \
#
# Gatekeeper
@@ -260,7 +262,7 @@
# GPS
#
PRODUCT_PACKAGES += \
- android.hardware.gnss@2.0-service
+ android.hardware.gnss@2.1-service
# Health
PRODUCT_PACKAGES += \
diff --git a/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts
index d58dac3..c85d297 100644
--- a/shared/sepolicy/vendor/file_contexts
+++ b/shared/sepolicy/vendor/file_contexts
@@ -54,18 +54,20 @@
/vendor/bin/vport_trigger u:object_r:vport_trigger_exec:s0
/vendor/bin/rename_netiface u:object_r:rename_netiface_exec:s0
/vendor/bin/hw/libcuttlefish-rild u:object_r:libcuttlefish_rild_exec:s0
+/vendor/bin/hw/android\.hardware\.camera\.provider@2\.4-service-google u:object_r:hal_camera_default_exec:s0
/vendor/bin/hw/android\.hardware\.power\.stats@1\.0-service\.mock u:object_r:hal_power_stats_default_exec:s0
/vendor/bin/hw/android\.hardware\.bluetooth@1\.1-service\.sim u:object_r:hal_bluetooth_sim_exec:s0
-/vendor/bin/hw/android\.hardware\.drm@1\.2-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0
-/vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy\.clearkey u:object_r:hal_drm_clearkey_exec:s0
-/vendor/bin/hw/android\.hardware\.drm@1\.2-service\.widevine u:object_r:hal_drm_widevine_exec:s0
-/vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy\.widevine u:object_r:hal_drm_widevine_exec:s0
+/vendor/bin/hw/android\.hardware\.drm@[0-9]+\.[0-9]+-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0
+/vendor/bin/hw/android\.hardware\.drm@[0-9]+\.[0-9]+-service-lazy\.clearkey u:object_r:hal_drm_clearkey_exec:s0
+/vendor/bin/hw/android\.hardware\.drm@[0-9]+\.[0-9]+-service\.widevine u:object_r:hal_drm_widevine_exec:s0
+/vendor/bin/hw/android\.hardware\.drm@[0-9]+\.[0-9]+-service-lazy\.widevine u:object_r:hal_drm_widevine_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\.gatekeeper@1\.0-service\.software u:object_r:hal_gatekeeper_default_exec:s0
/vendor/bin/hw/android\.hardware\.health\.storage@1\.0-service\.cuttlefish u:object_r:hal_health_storage_default_exec:s0
/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.3-service-sample-.* u:object_r:hal_neuralnetworks_sample_exec:s0
/vendor/bin/hw/android\.hardware\.vibrator@1\.x-service\.example u:object_r:hal_vibrator_default_exec:s0
/vendor/bin/hw/android\.hardware\.tv\.cec@1\.0-service\.mock u:object_r:hal_tv_cec_mock_exec:s0
+/vendor/bin/hw/android\.hardware\.tv\.tuner@1\.0-service u:object_r:hal_tv_tuner_default_exec:s0
/vendor/bin/ip_link_add u:object_r:ip_link_add_exec:s0
/vendor/bin/setup_wifi u:object_r:setup_wifi_exec:s0
/vendor/bin/hw/android\.hardware\.sensors@2\.0-service\.mock u:object_r:hal_sensors_default_exec:s0
diff --git a/shared/tv/device.mk b/shared/tv/device.mk
index 25eb85e..7e64f45 100644
--- a/shared/tv/device.mk
+++ b/shared/tv/device.mk
@@ -23,6 +23,9 @@
# HDMI CEC HAL
PRODUCT_PACKAGES += android.hardware.tv.cec@1.0-service.mock
+# Tuner HAL
+PRODUCT_PACKAGES += android.hardware.tv.tuner@1.0-service
+
# Enabling managed profiles
PRODUCT_COPY_FILES += frameworks/native/data/etc/android.software.managed_users.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.managed_users.xml
DEVICE_PACKAGE_OVERLAYS += device/google/cuttlefish/shared/tv/overlay
diff --git a/tests/hidl/hidl_implementation_test.cpp b/tests/hidl/hidl_implementation_test.cpp
index 3eedc96..35a4054 100644
--- a/tests/hidl/hidl_implementation_test.cpp
+++ b/tests/hidl/hidl_implementation_test.cpp
@@ -43,7 +43,6 @@
"android.hardware.broadcastradio@1.1",
"android.hardware.broadcastradio@2.0",
"android.hardware.camera.provider@2.5",
- "android.hardware.cas@1.2",
"android.hardware.cas.native@1.0",
"android.hardware.confirmationui@1.0",
"android.hardware.contexthub@1.0",
@@ -71,7 +70,6 @@
"android.hardware.renderscript@1.0",
"android.hardware.secure_element@1.1",
"android.hardware.sensors@1.0",
- "android.hardware.soundtrigger@2.2",
"android.hardware.tetheroffload.config@1.0",
"android.hardware.tetheroffload.control@1.0",
"android.hardware.thermal@1.1",
@@ -86,7 +84,7 @@
"android.hardware.weaver@1.0",
"android.hardware.wifi@1.3",
"android.hardware.wifi@1.4",
- "android.hardware.wifi.hostapd@1.1",
+ "android.hardware.wifi.hostapd@1.2",
"android.hardware.wifi.offload@1.0",
"android.hidl.base@1.0",
"android.hidl.memory.token@1.0",
diff --git a/vsoc_arm64/phone/device.mk b/vsoc_arm64/phone/device.mk
deleted file mode 100644
index 0053ec5..0000000
--- a/vsoc_arm64/phone/device.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2017 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/phone/device.mk)
-$(call inherit-product, device/google/cuttlefish/vsoc_arm64/device.mk)
-
-PRODUCT_NAME := aosp_cf_arm64_phone
-PRODUCT_DEVICE := vsoc_arm64
-PRODUCT_MODEL := Cuttlefish arm64 phone
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_arm64/phone/overlay
diff --git a/vsoc_arm64/phone/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_arm64/phone/overlay/frameworks/base/core/res/res/values/config.xml
index b272ba5..5455fd4 100644
--- a/vsoc_arm64/phone/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/vsoc_arm64/phone/overlay/frameworks/base/core/res/res/values/config.xml
@@ -37,16 +37,12 @@
<string-array name="config_tether_apndata" translatable="false">
<item>Android,android,,,,,,,,311,740,,default,dun,ims</item>
</string-array>
- <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
<bool name="config_bluetooth_address_validation" translatable="false">true</bool>
<bool name="config_sms_capable" translatable="false">true</bool>
<string name="default_sms_application" translatable="false">com.android.mms</string>
<bool name="config_showNavigationBar" translatable="false">true</bool>
<dimen name="config_viewConfigurationTouchSlop" translatable="false">12dp</dimen>
<integer name="config_mobile_mtu" translatable="false">1460</integer>
- <!-- cuttlefish uses mac80211-hwsim, which does not support the Preferred
- Network Offload feature. The below config disables the use of this feature. -->
- <bool name="config_wifi_background_scan_support" translatable="false">false</bool>
<!-- Maximum number of supported users -->
<integer name="config_multiuserMaximumUsers" translatable="false">4</integer>
</resources>
diff --git a/vsoc_x86/phone/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86/phone/overlay/frameworks/base/core/res/res/values/config.xml
index b272ba5..5455fd4 100644
--- a/vsoc_x86/phone/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/vsoc_x86/phone/overlay/frameworks/base/core/res/res/values/config.xml
@@ -37,16 +37,12 @@
<string-array name="config_tether_apndata" translatable="false">
<item>Android,android,,,,,,,,311,740,,default,dun,ims</item>
</string-array>
- <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
<bool name="config_bluetooth_address_validation" translatable="false">true</bool>
<bool name="config_sms_capable" translatable="false">true</bool>
<string name="default_sms_application" translatable="false">com.android.mms</string>
<bool name="config_showNavigationBar" translatable="false">true</bool>
<dimen name="config_viewConfigurationTouchSlop" translatable="false">12dp</dimen>
<integer name="config_mobile_mtu" translatable="false">1460</integer>
- <!-- cuttlefish uses mac80211-hwsim, which does not support the Preferred
- Network Offload feature. The below config disables the use of this feature. -->
- <bool name="config_wifi_background_scan_support" translatable="false">false</bool>
<!-- Maximum number of supported users -->
<integer name="config_multiuserMaximumUsers" translatable="false">4</integer>
</resources>
diff --git a/vsoc_x86_64/phone/device.mk b/vsoc_x86_64/phone/device.mk
deleted file mode 100644
index 316176b..0000000
--- a/vsoc_x86_64/phone/device.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2017 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/phone/device.mk)
-$(call inherit-product, device/google/cuttlefish/vsoc_x86_64/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_phone
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 phone
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86_64/phone/overlay
-
diff --git a/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml
index 74469e5..36184c8 100644
--- a/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml
@@ -37,16 +37,12 @@
<string-array name="config_tether_apndata" translatable="false">
<item>Android,android,,,,,,,,302,780,,default,dun,ims</item>
</string-array>
- <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
<bool name="config_bluetooth_address_validation" translatable="false">true</bool>
<bool name="config_sms_capable" translatable="false">true</bool>
<string name="default_sms_application" translatable="false">com.android.mms</string>
<bool name="config_showNavigationBar" translatable="false">true</bool>
<dimen name="config_viewConfigurationTouchSlop" translatable="false">12dp</dimen>
<integer name="config_mobile_mtu" translatable="false">1460</integer>
- <!-- cuttlefish uses mac80211-hwsim, which does not support the Preferred
- Network Offload feature. The below config disables the use of this feature. -->
- <bool name="config_wifi_background_scan_support" translatable="false">false</bool>
<!-- Maximum number of supported users -->
<integer name="config_multiuserMaximumUsers" translatable="false">4</integer>
</resources>