Update raviole SVN to 62 am: 96e7f36feb am: f6d0a7b929 am: 0c4378df65
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/23809690
Change-Id: I693a9bf17f15b630acd394d0ef1236f5a75089bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-oriole.mk b/device-oriole.mk
index d8373d8..68dbd21 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -193,6 +193,10 @@
NoCutoutOverlay \
AvoidAppsInCutoutOverlay
+# Android DeviceAsWebcam specific overlay
+PRODUCT_PACKAGES += \
+ DeviceAsWebcamOriole
+
# SKU specific RROs
PRODUCT_PACKAGES += \
SettingsOverlayGR1YH \
@@ -273,6 +277,13 @@
device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
endif
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
# Disable Settings large-screen optimization enabled by Window Extensions
PRODUCT_SYSTEM_PROPERTIES += \
persist.settings.large_screen_opt.enabled=false
+
+# Enable DeviceAsWebcam support
+PRODUCT_VENDOR_PROPERTIES += \
+ ro.usb.uvc.enabled=true
diff --git a/device-raven.mk b/device-raven.mk
index d86a801..1c31ecf 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -205,6 +205,10 @@
NoCutoutOverlay \
AvoidAppsInCutoutOverlay
+# Android DeviceAsWebcam specific overlay
+PRODUCT_PACKAGES += \
+ DeviceAsWebcamRaven
+
# Fingerprint antispoof property
PRODUCT_PRODUCT_PROPERTIES +=\
persist.vendor.fingerprint.disable.fake.override=none
@@ -292,6 +296,13 @@
device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
endif
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
# Disable Settings large-screen optimization enabled by Window Extensions
PRODUCT_SYSTEM_PROPERTIES += \
persist.settings.large_screen_opt.enabled=false
+
+# Enable DeviceAsWebcam support
+PRODUCT_VENDOR_PROPERTIES += \
+ ro.usb.uvc.enabled=true
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index e3d7efc..c428a83 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -38,6 +38,7 @@
BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/gs101/BoardConfig-common.mk
+include device/google/gs101-sepolicy/oriole-sepolicy.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp b/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp
new file mode 100644
index 0000000..158e2b8
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp
@@ -0,0 +1,10 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "DeviceAsWebcamOriole",
+ certificate: "platform",
+ product_specific: true,
+ sdk_version: "current",
+}
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml b/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml
new file mode 100644
index 0000000..cc7d3ba
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.google.android.overlay.DeviceAsWebcam"
+ android:versionCode="1"
+ android:versionName="1.0" >
+ <application android:hasCode="false" />
+ <overlay
+ android:targetPackage="com.android.DeviceAsWebcam"
+ android:isStatic="true"
+ android:priority="1"/>
+</manifest>
\ No newline at end of file
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS b/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS
new file mode 100644
index 0000000..d22af85
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/av:/camera/OWNERS
\ No newline at end of file
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json b/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json
new file mode 100644
index 0000000..4dd9988
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json
@@ -0,0 +1 @@
+{"0": {"3" : "UW"}}
\ No newline at end of file
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 16a368f..41de22a 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -1850,7 +1850,7 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 15.0
},
{
"Name": "REFRESH_90FPS",
@@ -1874,7 +1874,7 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 15.0
},
{
"Name": "REFRESH_60FPS",
@@ -1898,7 +1898,7 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 15.0
},
{
"Name": "UiHighBoostWithoutPid",
diff --git a/powerhint-raven.json b/powerhint-raven.json
index b0b22d8..82fc9f4 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -1831,7 +1831,7 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 15.0
},
{
"Name": "REFRESH_90FPS",
@@ -1855,7 +1855,7 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 15.0
},
{
"Name": "REFRESH_60FPS",
@@ -1879,7 +1879,7 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 15.0
},
{
"Name": "UiHighBoostWithoutPid",
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index 2217df1..462133a 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -38,6 +38,7 @@
BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/gs101/BoardConfig-common.mk
+include device/google/gs101-sepolicy/raven-sepolicy.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp b/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp
new file mode 100644
index 0000000..9a0527d
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp
@@ -0,0 +1,10 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "DeviceAsWebcamRaven",
+ certificate: "platform",
+ product_specific: true,
+ sdk_version: "current",
+}
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml b/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml
new file mode 100644
index 0000000..cc7d3ba
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.google.android.overlay.DeviceAsWebcam"
+ android:versionCode="1"
+ android:versionName="1.0" >
+ <application android:hasCode="false" />
+ <overlay
+ android:targetPackage="com.android.DeviceAsWebcam"
+ android:isStatic="true"
+ android:priority="1"/>
+</manifest>
\ No newline at end of file
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS b/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS
new file mode 100644
index 0000000..d22af85
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/av:/camera/OWNERS
\ No newline at end of file
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json b/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json
new file mode 100644
index 0000000..4dd9988
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json
@@ -0,0 +1 @@
+{"0": {"3" : "UW"}}
\ No newline at end of file