Merge "Revert "Add variables in google3a_config for camera tuning"" into sc-dev
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 846e7cb..888761d 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -178,8 +178,7 @@
system \
system_ext \
product \
- vendor \
- vendor_dlkm
+ vendor
# Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB
BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336
@@ -346,10 +345,6 @@
endif
ARMNN_COMPUTE_NEON_ENABLE := 1
-BOARD_USES_VENDOR_DLKMIMAGE := true
-BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm
-
# Boot.img
BOARD_RAMDISK_USE_LZ4 := true
#BOARD_KERNEL_BASE := 0x80000000
diff --git a/conf/fstab.gs101 b/conf/fstab.gs101
index 5958e3e..5353166 100644
--- a/conf/fstab.gs101
+++ b/conf/fstab.gs101
@@ -8,7 +8,6 @@
system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
product /product ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount
-vendor_dlkm /vendor_dlkm ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata ext4 defaults,noatime,rw wait,check,formattable
@@ -16,6 +15,6 @@
/dev/block/platform/14700000.ufs/by-name/misc /misc emmc defaults wait
/dev/block/platform/14700000.ufs/by-name/metadata /metadata ext4 noatime,nosuid,nodev,data=journal,commit=1 wait,check,formattable,first_stage_mount,metadata_csum
/dev/block/platform/14700000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount
-/dev/block/platform/14700000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,compress_extension=apk,compress_extension=apex,compress_extension=so,atgc latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fileencryption=aes-256-xts:aes-256-cts:v2,keydirectory=/metadata/vold/metadata_encryption,fscompress
+/dev/block/platform/14700000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,compress_extension=apk,compress_extension=apex,compress_extension=so,atgc,checkpoint_merge latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fileencryption=::inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,fscompress
/dev/block/zram0 none swap defaults zramsize=2147483648,max_comp_streams=8,zram_backingdev_size=512M
/devices/platform/11110000.usb* auto vfat defaults voldmanaged=usb:auto
diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index eb36739..234d701 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -216,8 +216,6 @@
on post-fs-data
# Log data folder
- mkdir /data/log 0771 radio system
- mkdir /data/log/abox 0771 audioserver system
mkdir /data/vendor 0771 radio system
mkdir /data/vendor/log 0771 radio system
mkdir /data/vendor/log/cbd 0771 radio system
@@ -260,7 +258,6 @@
mkdir /data/vendor/misc/vpn 0771 root system
# Permissions Camera
- mkdir /data/camera 0777 root root
mkdir /data/vendor/camera 0770 system camera
chmod 0755 /sys/kernel/debug/tracing
restorecon /sys/kernel/debug/tracing/trace_marker
@@ -442,6 +439,27 @@
chown system system /sys/class/backlight/panel0-backlight/hbm_mode
chown system system /sys/devices/platform/exynos-drm/primary-panel/gamma
chown system system /sys/module/drm/parameters/vblankoffdelay
+ chown system system /sys/class/dqe/atc/ambient_light
+ chown system system /sys/class/dqe/atc/st
+ chown system system /sys/class/dqe/atc/en
+ chown system system /sys/class/dqe/atc/lt
+ chown system system /sys/class/dqe/atc/ns
+ chown system system /sys/class/dqe/atc/dither
+ chown system system /sys/class/dqe/atc/pl_w1
+ chown system system /sys/class/dqe/atc/pl_w2
+ chown system system /sys/class/dqe/atc/ctmode
+ chown system system /sys/class/dqe/atc/pp_en
+ chown system system /sys/class/dqe/atc/upgrade_on
+ chown system system /sys/class/dqe/atc/tdr_max
+ chown system system /sys/class/dqe/atc/tdr_min
+ chown system system /sys/class/dqe/atc/back_light
+ chown system system /sys/class/dqe/atc/dstep
+ chown system system /sys/class/dqe/atc/scale_mode
+ chown system system /sys/class/dqe/atc/threshold_1
+ chown system system /sys/class/dqe/atc/threshold_2
+ chown system system /sys/class/dqe/atc/threshold_3
+ chown system system /sys/class/dqe/atc/gain_limit
+ chown system system /sys/class/dqe/atc/lt_calc_ab_shift
# Copy DRM Key
# copy /system/app/wv.keys /factory/wv.keys
diff --git a/device.mk b/device.mk
index 065d503..6278c55 100644
--- a/device.mk
+++ b/device.mk
@@ -210,7 +210,6 @@
# Fstab files
PRODUCT_COPY_FILES += \
device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.gs101 \
- device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.gs101 \
device/google/gs101/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.gs101
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index e958aec..de8766d 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -114,4 +114,7 @@
<!-- Enable concurrent STA + Bridged access point (AP) support -->
<bool translatable="false" name="config_wifiStaWithBridgedSoftApConcurrencySupported">true</bool>
+
+ <!-- Enable aggregation of Wifi link layer radio stats from all radios -->
+ <bool translatable="false" name="config_config_wifiLinkLayerAllRadiosStatsAggregationEnabled">true</bool>
</resources>