Let's use the default webview for this build

cat/AndroidProducts.mk

@@ -1,2 +0,0 @@
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/cat_s22.mk

cat/cat_s22.mk

@@ -1,64 +0,0 @@
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
-
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
-
-
-# Enable mainline checking
-# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-
-#
-# All components inherited here go to product image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
-
-#
-# Special settings for GSI releasing
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-
-
-# Don't build super.img
-PRODUCT_BUILD_SUPER_PARTITION := false
-
-PRODUCT_NAME := cat_s22
-PRODUCT_DEVICE := cat_s22
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := wePhone Cat S22
-
-PRODUCT_CHARACTERISTICS := device
-
-PRODUCT_PACKAGE_OVERLAYS += device/wephone/cat/overlay
-
-PRODUCT_COPY_FILES += \
-    device/wephone/cat/files/qpnp_pon.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/qpnp_pon.kl \
-    device/wephone/cat/files/soc_matrix_keypad.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/soc_matrix_keypad.kl \
-    device/wephone/cat/files/soc_matrix_keypad.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/soc_matrix_keypad.kcm \
-    device/wephone/cat/files/wephone.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/wephone.rc \
-    device/wephone/cat/files/wephone-boot.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/wephone-boot.sh
-
-PRODUCT_PACKAGES += \
-    BromiteSystemWebView \
-    Conversations \
-    Davx5 \
-    Etar \
-    ExactCalculator \
-    DeskClock \
-    FairEmail \
-    FDroid \
-    K9Mail \
-    Linphone \
-    Nextcloud \
-    NextcloudNotes \
-    OpenDocumentReader \
-    Wireguard
-
-PRODUCT_PACKAGES -= \
-    EasterEgg \
-    webview \
-    libwebviewchromium_loader \
-    libwebviewchromium_plat_support

cat/cat_s22/BoardConfig.mk

@@ -1,9 +0,0 @@
-include build/make/target/board/generic_arm_ab/BoardConfig.mk
-#include device/phh/treble/board-base.mk
-
-ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000
-endif
-
-TARGET_USES_64_BIT_BINDER := true
-TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP)

cat/files/qpnp_pon.kl

@@ -1,2 +0,0 @@
-key 114   VOLUME_DOWN
-key 116   POWER

cat/files/wephone-boot.sh

@@ -1,4 +0,0 @@
-#!/system/bin/sh
-
-touch /mnt/wephone_script
-mount -o bind /vendor/etc/audio/audio_policy_configuration.xml /vendor/etc/audio_policy_configuration.xml

cat/files/wephone.rc

@@ -1,6 +0,0 @@
-service wephone_boot /system/bin/wephone-boot.sh
-    oneshot
-    disabled
-
-on property:sys.boot_completed=1
-    start wephone_boot

cat/patches/audio_configuration.patch

@@ -1,293 +0,0 @@
-diff --git a/services/audiopolicy/config/audio_policy_configuration.xml b/services/audiopolicy/config/audio_policy_configuration.xml
-index b28381b32d..218cdf8e8f 100644
---- a/services/audiopolicy/config/audio_policy_configuration.xml
-+++ b/services/audiopolicy/config/audio_policy_configuration.xml
-@@ -1,5 +1,8 @@
- <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
--<!-- Copyright (C) 2019 The Android Open Source Project
-+<!-- Copyright (c) 2016-2017, 2020, The Linux Foundation. All rights reserved
-+     Not a Contribution.
-+-->
-+<!-- Copyright (C) 2015 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.
-@@ -13,12 +16,11 @@
-      See the License for the specific language governing permissions and
-      limitations under the License.
- -->
--
- <audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-     <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
- 
-     <!-- Global configuration Decalaration -->
--    <globalConfiguration speaker_drc_enabled="true"/>
-+    <globalConfiguration speaker_drc_enabled="true" call_screen_mode_supported="true"/>
- 
- 
-     <!-- Modules section:
-@@ -44,168 +46,165 @@
-     -->
-     <modules>
-         <!-- Primary Audio HAL -->
--        <module name="primary" halVersion="3.0">
-+        <module name="primary" halVersion="2.0">
-             <attachedDevices>
-+                <item>Earpiece</item>
-                 <item>Speaker</item>
-+                <item>Telephony Tx</item>
-                 <item>Built-In Mic</item>
-                 <item>Built-In Back Mic</item>
-+                <item>FM Tuner</item>
-+                <item>Telephony Rx</item>
-             </attachedDevices>
-             <defaultOutputDevice>Speaker</defaultOutputDevice>
-             <mixPorts>
--                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-+                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-+                </mixPort>
-+                <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                 </mixPort>
--                <mixPort name="deep_buffer" role="source"
--                        flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-+                <mixPort name="deep_buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                 </mixPort>
--                <mixPort name="compressed_offload" role="source"
--                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
--                    <profile name="" format="AUDIO_FORMAT_MP3"
--                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
--                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
--                    <profile name="" format="AUDIO_FORMAT_AAC"
--                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
--                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
--                    <profile name="" format="AUDIO_FORMAT_AAC_LC"
--                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
--                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-+                <mixPort name="direct_pcm" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
-+                </mixPort>
-+                <mixPort name="compressed_offload" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
-+                    <profile name="" format="AUDIO_FORMAT_MP3" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_FLAC" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_ALAC" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
-+                    <profile name="" format="AUDIO_FORMAT_APE" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_AAC_LC" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_WMA" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
-+                    <profile name="" format="AUDIO_FORMAT_WMA_PRO" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
-+                    <profile name="" format="AUDIO_FORMAT_VORBIS" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_AAC_ADTS_LC" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V1" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V2" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-                 </mixPort>
-                 <mixPort name="voice_tx" role="source">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
-+                </mixPort>
-+                <mixPort name="voip_rx" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
-                 </mixPort>
-+
-                 <mixPort name="primary input" role="sink">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
--                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
-+                </mixPort>
-+                <mixPort name="incall_music_uplink" role="source" flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-+                </mixPort>
-+                <mixPort name="surround_sound" role="sink">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6"/>
-                 </mixPort>
-                 <mixPort name="voice_rx" role="sink">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                 </mixPort>
-             </mixPorts>
-+
-             <devicePorts>
-                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
-                 <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
--                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-+                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                 </devicePort>
-                 <devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
--                    <gains>
--                        <gain name="gain_1" mode="AUDIO_GAIN_MODE_JOINT"
--                              minValueMB="-8400"
--                              maxValueMB="4000"
--                              defaultValueMB="0"
--                              stepValueMB="100"/>
--                    </gains>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                 </devicePort>
-                 <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                 </devicePort>
-                 <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-+                </devicePort>
-+                <devicePort tagName="Line" type="AUDIO_DEVICE_OUT_LINE" role="sink">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                 </devicePort>
-                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
-                 </devicePort>
-                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
-                 </devicePort>
-                 <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
-                 </devicePort>
-                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
-+                </devicePort>
-+                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
-+                </devicePort>
-+                <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
-+                </devicePort>
-+                <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
-                 </devicePort>
- 
-                 <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
--                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
-                 </devicePort>
-                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
--                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
-+                </devicePort>
-+                <devicePort tagName="FM Tuner" type="AUDIO_DEVICE_IN_FM_TUNER" role="source">
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                 </devicePort>
-                 <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
--                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
-                 </devicePort>
-                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                 </devicePort>
-                 <devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source">
--                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
--                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                 </devicePort>
-             </devicePorts>
-             <!-- route declaration, i.e. list all available sources for a given sink -->
-             <routes>
--                <route type="mix" sink="Earpiece"
--                       sources="primary output,deep_buffer,BT SCO Headset Mic"/>
--                <route type="mix" sink="Speaker"
--                       sources="primary output,deep_buffer,compressed_offload,BT SCO Headset Mic,Telephony Rx"/>
--                <route type="mix" sink="Wired Headset"
--                       sources="primary output,deep_buffer,compressed_offload,BT SCO Headset Mic,Telephony Rx"/>
--                <route type="mix" sink="Wired Headphones"
--                       sources="primary output,deep_buffer,compressed_offload,BT SCO Headset Mic,Telephony Rx"/>
--                <route type="mix" sink="primary input"
--                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic"/>
--                <route type="mix" sink="Telephony Tx"
--                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic, voice_tx"/>
--                <route type="mix" sink="voice_rx"
--                       sources="Telephony Rx"/>
-+                <route type="mix" sink="Earpiece" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
-+                <route type="mix" sink="Speaker" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
-+                <route type="mix" sink="Wired Headset" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
-+                <route type="mix" sink="Wired Headphones" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
-+                <route type="mix" sink="Line" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
-+                <route type="mix" sink="HDMI" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
-+                <route type="mix" sink="Proxy" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
-+                <route type="mix" sink="Telephony Tx" sources="voice_tx,incall_music_uplink"/>
-+                <route type="mix" sink="FM" sources="primary output"/>
-+                <route type="mix" sink="BT SCO" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
-+                <route type="mix" sink="BT SCO Headset" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
-+                <route type="mix" sink="BT SCO Car Kit" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
-+                <route type="mix" sink="Telephony Tx" sources="voice_tx"/>
-+                <route type="mix" sink="primary input" sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner"/>
-+                <route type="mix" sink="surround_sound" sources="Built-In Mic,Built-In Back Mic"/>
-+                <route type="mix" sink="voice_rx" sources="Telephony Rx"/>
-             </routes>
- 
-         </module>
- 
--        <!-- A2dp Input Audio HAL -->
--        <xi:include href="a2dp_in_audio_policy_configuration.xml"/>
-+        <!-- A2dp Audio HAL -->
-+        <xi:include href="/vendor/etc/a2dp_audio_policy_configuration.xml"/>
- 
-         <!-- Usb Audio HAL -->
--        <xi:include href="usb_audio_policy_configuration.xml"/>
-+        <xi:include href="/vendor/etc/usb_audio_policy_configuration.xml"/>
- 
-         <!-- Remote Submix Audio HAL -->
--        <xi:include href="r_submix_audio_policy_configuration.xml"/>
--
--        <!-- Bluetooth Audio HAL -->
--        <xi:include href="bluetooth_audio_policy_configuration.xml"/>
--
--        <!-- MSD Audio HAL (optional) -->
--        <xi:include href="msd_audio_policy_configuration.xml"/>
-+        <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>
- 
-     </modules>
-     <!-- End of Modules section -->
- 
--    <!-- Volume section:
--        IMPORTANT NOTE: Volume tables have been moved to engine configuration.
--                        Keep it here for legacy.
--                        Engine will fallback on these files if none are provided by engine.
--     -->
-+    <!-- Volume section -->
- 
--    <xi:include href="audio_policy_volumes.xml"/>
--    <xi:include href="default_volume_tables.xml"/>
-+    <xi:include href="/vendor/etc/audio_policy_volumes.xml"/>
-+    <xi:include href="/vendor/etc/default_volume_tables.xml"/>
- 
-     <!-- End of Volume section -->
- 
--    <!-- Surround Sound configuration -->
--
--    <xi:include href="surround_sound_configuration_5_0.xml"/>
--
--    <!-- End of Surround Sound configuration -->
--
- </audioPolicyConfiguration>

cat/system.prop

@@ -1,2 +0,0 @@
-# Fixed Bluetooth audio
-persist.bluetooth.bluetooth_audio_hal.disabled=true

cats22flip/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/cats22flip.mk

cats22flip/board-base.mk

@@ -0,0 +1 @@
+TARGET_SYSTEM_PROP := device/wephone/cats22flip/system.prop $(TARGET_SYSTEM_PROP)

cats22flip/cat/BoardConfig.mk

@@ -0,0 +1,8 @@
+include build/make/target/board/generic/BoardConfig.mk
+include device/wephone/cats22flip/board-base.mk
+
+ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000
+endif
+
+TARGET_USES_64_BIT_BINDER := true

cats22flip/cats22flip.mk

@@ -0,0 +1,42 @@
+TARGET_GAPPS_ARCH := arm
+
+include build/make/target/product/aosp_arm.mk
+include build/make/target/product/gsi_release.mk
+
+PRODUCT_NAME := cats22flip
+PRODUCT_DEVICE := cat
+PRODUCT_BRAND := wephone
+PRODUCT_MODEL := weOs | v14.0.1 | Nehemiah
+
+# This is for a device
+PRODUCT_CHARACTERISTICS := device
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/cats22flip/overlay
+
+PRODUCT_COPY_FILES += \
+    device/wephone/cats22flip/files/qpnp_pon.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/qpnp_pon.kl \
+    device/wephone/cats22flip/files/soc_matrix_keypad.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/soc_matrix_keypad.kl \
+    device/wephone/cats22flip/files/soc_matrix_keypad.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/soc_matrix_keypad.kcm
+
+PRODUCT_PACKAGES += \
+    BromiteSystemWebView \
+    Conversations \
+    Davx5 \
+    DeskClock \
+    Etar \
+    ExactCalculator \
+    Gallery2 \
+    K-9Mail \
+    Linphone \
+    Nextcloud \
+    NextcloudNotes \
+    OpenDocumentReader \
+    Wireguard
+
+PRODUCT_PACKAGES -= \
+    EasterEgg \
+    webview \
+    libwebviewchromium_loader \
+    libwebviewchromium_plat_support \
+    CtsShimPrebuilt \
+    CtsShimPrivPrebuilt

cats22flip/files/qpnp_pon.kl

@@ -0,0 +1,2 @@
+key 114   VOLUME_DOWN   WAKE
+key 116   POWER

cm17/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/cm17.mk

cm17/cm17.mk

@@ -0,0 +1,56 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
+
+#
+# All components inherited here go to system_ext image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
+
+#
+# All components inherited here go to product image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
+
+#
+# Special settings for GSI releasing
+#
+# ifeq (aosp_arm64,$(TARGET_PRODUCT))
+$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+# endif
+
+PRODUCT_CHARACTERISTICS := device
+
+PRODUCT_NAME := cm17
+PRODUCT_DEVICE := cm17
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := AOSP on ARM64
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/cm17/overlay
+
+# Use a more decent APN config
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+ifneq (,$(wildcard external/exfat))
+PRODUCT_PACKAGES += \
+	mkfs.exfat \
+	fsck.exfat
+endif
+
+PRODUCT_PACKAGES += \
+	TrichromeWebView \
+	Contacts \
+	DeskClock \
+	Etar \
+	ExactCalculator \
+	Gallery2
+
+
+PRODUCT_PACKAGES -= \
+	EasterEgg \
+	webview \
+	libwebviewchromium_loader \
+	libwebviewchromium_plat_support

cm17/cm17/BoardConfig.mk

@@ -0,0 +1,31 @@
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := generic
+
+include build/make/target/board/BoardConfigGsiCommon.mk
+
+# TODO(jiyong) These might be SoC specific.
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
+
+TARGET_EXFAT_DRIVER := exfat
+TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
+
+ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+else
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+endif
+
+TARGET_USES_64_BIT_BINDER := true

cm17/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 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.
+-->
+
+<webviewproviders>
+    <!-- The default WebView implementation -->
+    <webviewprovider description="Vanadium" packageName="app.vanadium.webview" availableByDefault="true">
+    </webviewprovider>
+</webviewproviders>

cm17/system.prop

@@ -3,3 +3,9 @@ persist.bluetooth.bluetooth_audio_hal.disabled=true
 persist.sys.bt.unsupport.features=00000000
 persist.sys.bt.unsupport.states=00000000
 persist.sys.bt.unsupport.stdfeatures=000001
+qemu.hw.mainkeys=1
+hw.lcd.width = 716
+hw.lcd.height = 720
+hw.lcd.depth = 24
+hw.lcd.density = 220
+ro.sf.lcd_density=220

duoqin/AndroidProducts.mk

@@ -1,3 +0,0 @@
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/duoqin_f21pro.mk \
-    $(LOCAL_DIR)/duoqin_f22pro.mk

duoqin/board-base.mk

@@ -1 +0,0 @@
-TARGET_SYSTEM_PROP := device/wephone/duoqin/system.prop $(TARGET_SYSTEM_PROP)

duoqin/duoqin/BoardConfig.mk

@@ -1,8 +0,0 @@
-include build/make/target/board/generic_arm64_ab/BoardConfig.mk
-include device/wephone/duoqin/board-base.mk
-
-ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
-else
-BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
-endif

duoqin/duoqin_f21pro.mk

@@ -1,67 +0,0 @@
-#
-# All components inherited here go to system image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
-
-# Enable mainline checking
-# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
-
-#
-# Special settings for GSI releasing
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-
-
-PRODUCT_NAME := duoqin_f21pro
-PRODUCT_DEVICE := duoqin
-PRODUCT_BRAND := wephone
-PRODUCT_MODEL := Duoqin F21pro - wePhone
-
-# This is for a device
-PRODUCT_CHARACTERISTICS := device
-
-PRODUCT_PACKAGE_OVERLAYS += device/wephone/duoqin/overlay
-
-PRODUCT_COPY_FILES += \
-	device/wephone/duoqin/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
-	device/wephone/duoqin/files/mtk-kpd.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-kpd.kcm \
-	device/wephone/duoqin/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl \
-	device/wephone/duoqin/files/mtk-pmic-keys.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-pmic-keys.idc \
-	device/wephone/duoqin/files/mtk-pmic-keys.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-pmic-keys.kcm \
-	device/wephone/duoqin/files/mtk-pmic-keys.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-pmic-keys.kl \
-	device/wephone/duoqin/files/Vendor_0001_Product_0001_Version_0100.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/Vendor_0001_Product_0001_Version_0100.kl
-
-PRODUCT_PACKAGES += \
-	BromiteSystemWebView \
-	Conversations \
-	Davx5 \
-	DeskClock \
-	Etar \
-	ExactCalculator \
-	FairEmail \
-	FDroid \
-	Gallery2 \
-	K9Mail \
-	Linphone \
-	Nextcloud \
-	NextcloudNotes \
-	OpenDocumentReader \
-	Wireguard
-
-PRODUCT_PACKAGES -= \
-	EasterEgg \
-	webview \
-	libwebviewchromium_loader \
-    libwebviewchromium_plat_support

duoqin/duoqin_f22pro.mk

@@ -1,71 +0,0 @@
-# $(call inherit-product, vendor/hardware_overlay/overlay.mk)
-
-#
-# All components inherited here go to system image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
-
-# Enable mainline checking
-# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
-
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, device/nehemiah/wephone/gsi_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-$(call inherit-product, device/generic/common/gsi_product.mk)
-
-#
-# All components inherited here go to boot image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
-
-#
-# Special settings for GSI releasing
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-
-PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
-
-PRODUCT_NAME := duoqin-f22pro
-PRODUCT_DEVICE := duoqin
-PRODUCT_BRAND := wePhone
-PRODUCT_MODEL := F22pro wePhone
-
-PRODUCT_CHARACTERISTICS := device
-
-PRODUCT_PACKAGE_OVERLAYS += device/nehemiah/wephone/overlay
-
-PRODUCT_COPY_FILES += \
-	device/nehemiah/wephone/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
-	device/nehemiah/wephone/files/mtk-kpd.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-kpd.kcm \
-	device/nehemiah/wephone/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl
-
-PRODUCT_COPY_FILES += \
-	device/nehemiah/wephone/files/f22pro-animation.zip:$(TARGET_COPY_OUT_SYSTEM)/media/bootanimation.zip \
-    device/nehemiah/wephone/files/privapp-permissions-app.lawnchair.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-app.lawnchair.xml \
-    device/nehemiah/wephone/files/privapp-permissions-net.mezimmah.wkt9.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-net.mezimmah.wkt9.xml
-
-PRODUCT_PACKAGES += \
-	mkfs.exfat \
-	fsck.exfat
-
-PRODUCT_PACKAGES += \
-	BromiteSystemWebView \
-	Contacts \
-	Conversations \
-	Davx5 \
-	Etar \
-	ExactCalculator \
-	DeskClock \
-	FDroid \
-	Gallery2 \
-	Lawnchair \
-	Lawnicons \
-	Linphone \
-	Nextcloud \
-	Wireguard

duoqin/files/privapp-permissions-app.lawnchair.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="app.lawnchair">
-        <permission name="android.permission.INTERNET"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.FOREGROUND_SERVICE"/>
-        <permission name="com.google.android.apps.nexuslauncher.permission.QSB"/>
-        <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
-        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
-        <permission name="android.permission.VIBRATE"/>
-        <permission name="android.permission.QUERY_ALL_PACKAGES"/>
-        <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
-        <permission name="android.permission.REMOVE_TASKS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.MANAGE_ACTIVITY_TASKS"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="android.permission.SET_ORIENTATION"/>
-        <permission name="android.permission.READ_FRAME_BUFFER"/>
-        <permission name="android.permission.MANAGE_ACCESSIBILITY"/>
-        <permission name="android.permission.MONITOR_INPUT"/>
-        <permission name="android.permission.ALLOW_SLIPPERY_TOUCHES"/>
-        <permission name="android.permission.SYSTEM_APPLICATION_OVERLAY"/>
-        <permission name="android.permission.CALL_PHONE"/>
-        <permission name="android.permission.SET_WALLPAPER"/>
-        <permission name="android.permission.SET_WALLPAPER_HINTS"/>
-        <permission name="android.permission.BIND_APPWIDGET"/>
-        <permission name="android.permission.READ_EXTERNAL_STORAGE"/>
-        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-        <permission name="android.permission.REQUEST_DELETE_PACKAGES"/>
-        <permission name="android.permission.READ_DEVICE_CONFIG"/>
-        <permission name="android.permission.EXPAND_STATUS_BAR"/>
-        <permission name="android.permission.ROTATE_SURFACE_FLINGER"/>
-        <permission name="app.lawnchair.permission.READ_SETTINGS"/>
-        <permission name="app.lawnchair.permission.WRITE_SETTINGS"/>
-        <permission name="app.lawnchair.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"/>
-    </privapp-permissions>
-</permissions>

duoqin/files/privapp-permissions-net.mezimmah.wkt9.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="net.mezimmah.wkt9">
-    	<permission name="android.permission.INTERNET"/>
-    	<permission name="android.permission.RECORD_AUDIO"/>
-    	<permission name="android.permission.POST_NOTIFICATIONS"/>
-	    <permission name="android.permission.CONTROL_DEVICE_LIGHTS"/>
-    </privapp-permissions>
-</permissions>

jelly_star/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/jelly_star.mk

jelly_star/jelly_star.mk

@@ -0,0 +1,50 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
+
+#
+# All components inherited here go to system_ext image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
+
+#
+# All components inherited here go to product image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
+
+#
+# Special settings for GSI releasing
+#
+# ifeq (aosp_arm64,$(TARGET_PRODUCT))
+$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+# endif
+
+PRODUCT_CHARACTERISTICS := device
+
+PRODUCT_NAME := jelly_star
+PRODUCT_DEVICE := jelly_star
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := AOSP on Unihertz Jelly Star
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/ttp/overlay
+
+# Use a more decent APN config
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+ifneq (,$(wildcard external/exfat))
+PRODUCT_PACKAGES += \
+	mkfs.exfat \
+	fsck.exfat
+endif
+
+PRODUCT_PACKAGES += \
+	TrichromeWebView 
+
+PRODUCT_PACKAGES -= \
+	EasterEgg \
+	webview \
+	libwebviewchromium_loader \
+	libwebviewchromium_plat_support

jelly_star/jelly_star/BoardConfig.mk

@@ -0,0 +1,29 @@
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := generic
+
+include build/make/target/board/BoardConfigGsiCommon.mk
+
+# TODO(jiyong) These might be SoC specific.
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
+
+TARGET_EXFAT_DRIVER := exfat
+TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
+
+ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+else
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+endif

jelly_star/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<webviewproviders>
+    <!-- The default WebView implementation -->
+    <webviewprovider description="Vanadium" packageName="app.vanadium.webview" availableByDefault="true">
+    </webviewprovider>
+</webviewproviders>

jelly_star/system.prop

@@ -0,0 +1,11 @@
+# Fixed Bluetooth audio
+persist.bluetooth.bluetooth_audio_hal.disabled=true
+persist.sys.bt.unsupport.features=00000000
+persist.sys.bt.unsupport.states=00000000
+persist.sys.bt.unsupport.stdfeatures=000001
+qemu.hw.mainkeys=1
+hw.lcd.width = 480
+hw.lcd.height = 854
+hw.lcd.depth = 24
+hw.lcd.density = 220
+ro.sf.lcd_density=220

nehemiah/AndroidProducts.mk

@@ -1,2 +0,0 @@
-PRODUCT_MAKEFILES := \
-	$(LOCAL_DIR)/nehemiah.mk

nehemiah/base-pre.mk

@@ -1,2 +0,0 @@
-PRODUCT_COPY_FILES += \
-	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml

nehemiah/base.mk

@@ -1,21 +0,0 @@
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/wephone/nehemiah/sepolicy
-PRODUCT_PACKAGE_OVERLAYS += device/wephone/nehemiah/overlay
-
-$(call inherit-product, vendor/hardware_overlay/overlay.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
-PRODUCT_PACKAGES += \
-	treble-environ-rc \
-
-PRODUCT_PACKAGES += \
-	bootctl \
-	vintf \
-    simg2img_simple \
-    lptools
-
-ifneq (,$(wildcard external/exfat))
-PRODUCT_PACKAGES += \
-	mkfs.exfat \
-	fsck.exfat
-endif

nehemiah/bluetooth/bdroid_buildcfg.h

@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2013, The Linux Foundation. All rights reserved.
- *  Not a Contribution, Apache license notifications and license are retained
- *  for attribution purposes only.
- *
- * Copyright (C) 2012 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.
- */
-
-#ifndef _BDROID_BUILDCFG_H
-#define _BDROID_BUILDCFG_H
-
-//#include <cutils/properties.h>
-#include <string.h>
-
-static inline const char* BtmDefLocalName()
-{
-#if 0
-    static char product_device[PROPERTY_VALUE_MAX];
-    //Huawei-defined property
-    property_get("ro.config.marketing_name", product_device, "");
-
-    if (strcmp(product_device, "") != 0)
-        return product_device;
-
-    // Fallback to ro.product.model
-    return "";
-#endif
-    return "hello";
-}
-
-static inline int BtmBypassExtraAclSetup() {
-#if 0
-    int8_t prop = property_get_bool("persist.sys.bt_acl_bypass", false);
-    return prop == true;
-#endif
-    return 1;
-}
-
-#define BTM_DEF_LOCAL_NAME BtmDefLocalName()
-#define BTM_BYPASS_EXTRA_ACL_SETUP BtmBypassExtraAclSetup()
-
-#endif

nehemiah/board-base.mk

@@ -1,6 +0,0 @@
-TARGET_SYSTEM_PROP := device/wephone/nehemiah/system.prop $(TARGET_SYSTEM_PROP)
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/wephone/nehemiah/bluetooth
-TARGET_EXFAT_DRIVER := exfat
-DEVICE_FRAMEWORK_MANIFEST_FILE := device/wephone/nehemiah/framework_manifest.xml
-
-BOARD_ROOT_EXTRA_FOLDERS += bt_firmware sec_storage efs

nehemiah/environ/Android.mk

@@ -1,11 +0,0 @@
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := treble-environ-rc
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_POST_INSTALL_CMD := \
-	mkdir -p $(PRODUCT_OUT)/system/etc/init/ && \
-	sed -e 's?%BOOTCLASSPATH%?$(PRODUCT_BOOTCLASSPATH)?g' device/phh/treble/environ/init.treble-environ.rc > $(PRODUCT_OUT)/system/etc/init/init.treble-environ.rc && \
-	sed -i -e 's?%SYSTEMSERVERCLASSPATH%?$(PRODUCT_SYSTEM_SERVER_CLASSPATH)?g' $(PRODUCT_OUT)/system/etc/init/init.treble-environ.rc
-
-include $(BUILD_PHONY_PACKAGE)

nehemiah/environ/init.treble-environ.rc

@@ -1,4 +0,0 @@
-# set up the global environment
-on init
-    export BOOTCLASSPATH /apex/com.android.runtime/javalib/core-oj.jar:/apex/com.android.runtime/javalib/core-libart.jar:/apex/com.android.runtime/javalib/okhttp.jar:/apex/com.android.runtime/javalib/bouncycastle.jar:/apex/com.android.runtime/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/android.test.base.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar
-    export SYSTEMSERVERCLASSPATH /system/framework/services.jar:/system/framework/ethernet-service.jar:/system/framework/wifi-service.jar:/system/framework/com.android.location.provider.jar

nehemiah/mediatek_arm64/BoardConfig.mk

@@ -1,8 +0,0 @@
-include build/make/target/board/generic_arm64_ab/BoardConfig.mk
-include device/wephone/nehemiah/board-base.mk
-
-ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
-else
-BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
-endif

nehemiah/nehemiah.mk

@@ -1,15 +0,0 @@
-TARGET_GAPPS_ARCH := arm64
-$(call inherit-product, device/wephone/nehemiah/base-pre.mk)
-include build/make/target/product/aosp_arm64_ab.mk
-$(call inherit-product, device/wephone/nehemiah/base.mk)
-
-PRODUCT_NAME := nehemiah_qin_f21pro
-PRODUCT_DEVICE := mediatek_arm64
-PRODUCT_BRAND := wePhone
-PRODUCT_SYSTEM_BRAND := wePhone
-PRODUCT_MODEL := wePhone Qin F21pro
-
-# Overwrite the inherited "emulator" characteristics
-PRODUCT_CHARACTERISTICS := device
-
-PRODUCT_PACKAGES += 

nehemiah/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 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.
--->
-
-<webviewproviders>
-
-    <webviewprovider description="Chrome Stable" packageName="com.android.chrome" availableByDefault="true">
-        <signature>MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK</signature>
-    </webviewprovider>
-    <webviewprovider description="Chrome Beta" packageName="com.chrome.beta">
-        <signature>MIIDwzCCAqugAwIBAgIJAOoj9MXoVhH6MA0GCSqGSIb3DQEBBQUAMHgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEUMBIGA1UEAwwLY2hyb21lX2JldGEwHhcNMTYwMjI5MTUxNTIzWhcNNDMwNzE3MTUxNTIzWjB4MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEUMBIGA1UECgwLR29vZ2xlIEluYy4xEDAOBgNVBAsMB0FuZHJvaWQxFDASBgNVBAMMC2Nocm9tZV9iZXRhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo/wW27nRxVqGbFOyXr8jtv2pc2Ke8XMr6Sfs+3JK2licVaAljGFpLtWH4wUdb50w/QQSPALNLSSyuK/94rtp5Jjs4RSJI+whuewV/R6El+mFXBO3Ek5/op4UrOsR91IM4emvS67Ji2u8gp5EmttVgJtllFZCbtZLPmKuTaOkOB+EdWIxrYiHVEEaAcQpEHa9UgWUZ0bMfPj8j3F0w+Ak2ttmTjoFGLaZjuBAYwfdctN1b0sdLT9Lif45kMCb8QwPp0F9/ozs0rrTc+I6vnTS8kfFQfk7GIE4Hgm+cYQEHkIA6gLJxUVWvPZGdulAZw7wPt/neOkazHNZPcV4pYuNLQIDAQABo1AwTjAdBgNVHQ4EFgQU5t7dhcZfOSixRsiJ1E46JhzPlwowHwYDVR0jBBgwFoAU5t7dhcZfOSixRsiJ1E46JhzPlwowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAZO2jB8P1d8ki3KZILvp27a2VM3DInlp8I8UgG3gh7nBQfTrnZr5M1PL8eFHqX7MEvAiGCMTcrPklEhjtcHK/c7BcdeCWq6oL56UK3JTl33RxJcjmjrz3e3VI6ehRSm1feNAkMD0Nr2RWr2LCYheAEmwTPtluLOJS+i7WhnXJzBtg5UpUFEbdFYenqUbDzya+cUVp0197k7hUTs8/Hxs0wf79o/TZXzTBq9eYQkiITonRN8+5QCBl1XmZKV0IHkzGFES1RP+fTiZpIjZT+W4tasHgs9QTTks4CCpyHBAy+uy7tApe1AxCzihgecCfUN1hWIltKwGZS6EE0bu0OXPzaQ==</signature>
-    </webviewprovider>
-    <webviewprovider description="Chrome Dev" packageName="com.chrome.dev">
-        <signature>MIIDwTCCAqmgAwIBAgIJAOSN+O0cdii5MA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDETMBEGA1UEAwwKY2hyb21lX2RldjAeFw0xNjAyMjkxNzUwMDdaFw00MzA3MTcxNzUwMDdaMHcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDETMBEGA1UEAwwKY2hyb21lX2RldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOYPj6Y9rVt8xizSHDYjDEkDfFZAgSiZ9T6tevkQXsFyfaq3Gk3h2qssi29G6cTPJ2VXFKlVB71wSXv5p9/LEcDQPWQiO3Q2cLmgUXxyhJWXI3g96tPAhZQX2q6SC37ZQdiBR/raMO70DAkvCyBGtNplsvutzSE3oZ7LYfzB8vTbe7zCh3fDYSS/7xb3ZVvFqydHS40uVq1qqg1S80Pge7tW3pDGsPMZN7yA4yfmsvA1rbHm9N8t3Rc9hqzh6OxNAAgRB535YcsWL7iF+mpdFILXk3jLYT0nMvMnB83rsdgnRREjlGQYHl2mh8+6CqujsW/eICDq/LR6BYDyqHhk0ECAwEAAaNQME4wHQYDVR0OBBYEFKzsl07JglgpbeYDYGqsgqRDo+01MB8GA1UdIwQYMBaAFKzsl07JglgpbeYDYGqsgqRDo+01MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACka6SFF6xAcj8L8O6R36++E09DTiGZEjvKT8eIycgcQQ+p1WUmPb6M2EJpN6zvvSE62ussmXdzf8rIyc0JXA8jbViZt62Y39epNENFxPTLN9QzXlT+w8AW73Ka3cnbOuL5EgoDl8fM79WVlARY3X+wB/jGNrkiGIdRm2IZIeAodWgC2mtXMiferyYBKz2/F2bhnU6DwgCbegS8trFjEWviijWdJ+lBdobn7LRc3orZCtHl8UyvRDi7cye3sK9y3BM39k0g20F21wTNHAonnvL6zbuNgpd+UEsVxDpOeWrEdBFN7Md0CI2wnu8eA8ljJD45v0WWMEoxsIi131g5piNM=</signature>
-    </webviewprovider>
-    <webviewprovider description="Chrome Canary" packageName="com.chrome.canary">
-        <signature>MIIDxzCCAq+gAwIBAgIJAML7APITsgV7MA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEWMBQGA1UEAwwNY2hyb21lX2NhbmFyeTAeFw0xNjAyMjkxOTA5MDdaFw00MzA3MTcxOTA5MDdaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEWMBQGA1UEAwwNY2hyb21lX2NhbmFyeTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANXfeAoZlr0ya1HBzIfAz/nLLjpPJeAPvuX5dueaxmiQgv2hNG22acriFuiiJI6TU0t8AIVJD5Ifbc4OOuA0zeFhdzWWGnmTRH6x27WI7bzOKnAqOvv21ZBmE9i8Vo++K13xWdTs3qVn1bn9oUONxFu0wKDzXYZhoj1Jom0RZGjXm16xuPlEuOzMcjiNBDoYuxPAXkMcK/G1gP4P4nAV8Rd/GGIjKRS/SUtcShhoAMOQhs4WIEkUrvEVRwhBDIbpM87oFbCVdBH38r0XS6F6CdhPJsKFhoEfq4c01HZqNmDpCPA8AAcCuSWqmXoTIqs7OqkWgduE2bInbWU7WMaTl+kCAwEAAaNQME4wHQYDVR0OBBYEFB/AsC4iPAqaLoNytNSx29qByI7+MB8GA1UdIwQYMBaAFB/AsC4iPAqaLoNytNSx29qByI7+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAMb2Td3ro/+MGVnCPAbwBSOZMVLUKGqt6zr8CShW9mtFHnmy29EaWSYYAj1M4+6Vpkq85NsgBEck7rnUjV8A3Q0NKdTys1KRKJqVvQRBN6SwqQenSf/abxQCa8Z+69rh+3BkIU1HLtu5lrMDZwon5H91L5mpORn6vItd20uW132lwSDeUEW2CHslTrodoFuTUcSUlRiq/URfUH3baO1QHXkxpQwrBPKL5deJfcZnxh5MAtAGSQL7gHvayEFlDppETXdDO7vgGTH2dEK2TjKWALbGiKkxSqjRyTNt4/FOj10TqNRdUamj+ydVJgzGQ8bki4Vc6NnKm/r4asusxapkVR4=</signature>
-    </webviewprovider>
-    <webviewprovider description="Google WebView" packageName="com.google.android.webview" availableByDefault="true">
-<signature>MIIDuzCCAqOgAwIBAgIJANi6DgBQG4ZTMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UEAwwHd2VidmlldzAeFw0xNDA4MDgyMzIwMjBaFw00MTEyMjQyMzIwMjBaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UEAwwHd2VidmlldzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbtaFX0r5aZJMAbPVMAgK1ZZ29dTn91VsGxXv2hqrQo7IpqEy2JmPvPnoMsSiuTAe+UcQy8oKDQ2aYVSAd1DGIy+nSRyFTt3LSIAdwSBkB1qT4a+OqkpsR6bSNXQXQ18lCQu9gREY3h3QlYBQAyzRxw4hRGlrXAzuSz1Ec4W+6x4nLG5DG61MAMR8ClF9XSqbmGB3kyZ70A0X9OPYYxiMWP1ExaYvpaVqjyZZcrPwr+vtW8oCuGBUtHpBUH3OoG+9s2YMcgLG7vCK9awKDqlPcJSpIAAj6uGs4gORmkqxZRMskLSTWbhP4p+3Ap8jYzTVB6Y1/DMVmYTWRMcPW0macCAwEAAaNQME4wHQYDVR0OBBYEFJ6bAR6/QVm4w9LRSGQiaR5Rhp3TMB8GA1UdIwQYMBaAFJ6bAR6/QVm4w9LRSGQiaR5Rhp3TMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEQu8QiVxax7/diEiJrgKE1LwdXsIygJK/KnaKdnYEkAQpeu/QmrLiycm+OFbL1qHJIB7OuI/PQBUtcaNSiJSCVgtwtEbZWWIdsynqG/Nf4aGOndXegSQNRH54M05sRHLoeRycPrY7xQlEwGikNFR76+5UdwFBQI3Gn22g6puJnVukQm/wXQ+ajoiS4QclrNlixoDQsZ4STLH4+Wju2wIWKFFArIhVEIlbamq+p6BghuzH3aIz/Fy0YTQKi7SA+0fuNeCaqlSm5pYSt6p5CH89y1Fr+wFc5r3iLRnUwRcy08ESC7bZJnxV3d/YQ5valTxBbzku/dQbXVj/xg69H8l8M=</signature>
-    </webviewprovider>
-    <webviewprovider description="Bromite WebView" packageName="org.bromite.webview" availableByDefault="true">
-<signature>MIIDbTCCAlWgAwIBAgIEHcsmjjANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEQMA4GA1UECBMHVW5rbm93bjEPMA0GA1UEBxMGQmVybGluMRAwDgYDVQQKEwdCcm9taXRlMRAwDgYDVQQLEwdCcm9taXRlMRAwDgYDVQQDEwdjc2FnYW41MCAXDTE4MDExOTA3MjE1N1oYDzIwNjgwMTA3MDcyMTU3WjBmMQswCQYDVQQGEwJERTEQMA4GA1UECBMHVW5rbm93bjEPMA0GA1UEBxMGQmVybGluMRAwDgYDVQQKEwdCcm9taXRlMRAwDgYDVQQLEwdCcm9taXRlMRAwDgYDVQQDEwdjc2FnYW41MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtakjGj0eTavbBB2vWXj8KBixWn4zgXAKc+yGFu3SLEGF1VB5aJWwcMHxVI55yH/8M2eNnJP0BkSidfKgPVcm1sk/GrNEs9uk5sWod9byO5M5QWQmGP2REeTd6J0BVVVaMp2MZnqeR3Su3pwFzrSwTqIGyf8dkPSEz7ifj792+EeRNrov4oRQK7lIfqInzwc4d34wU069Lrw6m7J7HM0KbRYISsWMiYj025Qg+dTrtdWt7jbdcj7htW0eYyJoLd90+s43RWnOpENmWpcWv1EVPxUD4mCdV9idYwoHRIESpSu9IWvqDZp1VoRc43nLgsNfNBwmYdTkIaPiz1m7TBcr7QIDAQABoyEwHzAdBgNVHQ4EFgQUuWoGd7W7wMyQ1pOdjiMv10YHTR0wDQYJKoZIhvcNAQELBQADggEBAA7iw6eKz+T8HIpKDoDcX1Ywjn9JUzuCFu20LnsLzreO/Pog1xErYjdLAS7LTZokfbAnitBskO9QhV9BYkDiM0Qr5v2/HsJTtxa1mz9ywCcI36jblMyuXFj8tuwQI9/t9i+Fc3+bOFBV3t7djPo9qX1dIK0lZ6s8HcIhaCNdqm65fH+nWhC/H9djqC6qOtrkTiACKEcHQ4a/5dfROU0q0M4bS4YuiaAQWgjiGbik4LrZ8wZX1aqJCLt0Hs7MzXyyf0cRSO11FIOViHwzh6WTZGufq2J3YBFXPond8kLxkKL3LNezbi5yTcecxsbKQ6OS46CnIKcy/M8asSreLpoCDvw=</signature>
-    </webviewprovider>
-    <!-- The default WebView implementation -->
-    <webviewprovider description="AOSP WebView" packageName="com.android.webview" availableByDefault="true" isFallback="true" />
-</webviewproviders>
-

nehemiah/sepolicy/asus.te

@@ -1,5 +0,0 @@
-allow cameraserver phhsu_exec:file rx_file_perms;
-
-type asus_motor_device, file_type;
-allow cameraserver asus_motor_device:chr_file { open read write ioctl };
-allowxperm cameraserver asus_motor_device:chr_file ioctl { 0x4d02 };

nehemiah/sepolicy/board_properties.te

@@ -1,4 +0,0 @@
-type sysfs_board_properties, fs_type, sysfs_type;
-
-allow system_server sysfs_board_properties:dir search;
-allow system_server sysfs_board_properties:file r_file_perms;

nehemiah/sepolicy/bootanim.te

@@ -1,3 +0,0 @@
-#11-14 21:15:02.748   477   477 I auditd  : type=1400 audit(0.0:104): avc: denied { search } for comm="BootAnimation" name="dri" dev="tmpfs" ino=1108 scontext=u:r:bootanim:s0 tcontext=u:object_r:gpu_device:s0 tclass=dir permissive=0
-#Seen on some MTK devices
-allow bootanim gpu_device:dir r_dir_perms;

nehemiah/sepolicy/file_contexts

@@ -1,22 +0,0 @@
-/system/bin/phh-su                   u:object_r:phhsu_exec:s0
-/system/bin/vndk-detect			u:object_r:vndk_detect_exec:s0
-/system/etc/usb_audio_policy_configuration.xml	u:object_r:vendor_configs_file:s0
-/system/bin/rw-system.sh u:object_r:phhsu_exec:s0
-/system/bin/phh-on-boot.sh u:object_r:phhsu_exec:s0
-/system/bin/phh-on-data.sh u:object_r:phhsu_exec:s0
-/system/bin/asus-motor u:object_r:phhsu_exec:s0
-
-#/system/bin/fsck\.exfat                 u:object_r:fsck_exec:s0
-/system/bin/fsck\.ntfs                  u:object_r:fsck_exec:s0
-
-/bt_firmware(/.*)?      u:object_r:bt_firmware_file:s0
-
-/sec_storage(/.*)?      u:object_r:teecd_data_file:s0
-/dev/dsm                u:object_r:dmd_device:s0
-
-/system/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.oppo.compat u:object_r:hal_fingerprint_oppo_compat_exec:s0
-/system/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.oplus.compat u:object_r:hal_fingerprint_oppo_compat_exec:s0
-
-/efs u:object_r:efs_file:s0
-
-/dev/smcinvoke u:object_r:smcinvoke_device:s0

nehemiah/sepolicy/genfs_contexts

@@ -1 +0,0 @@
-genfscon sysfs /board_properties u:object_r:sysfs_board_properties:s0

nehemiah/sepolicy/hal.te

@@ -1,10 +0,0 @@
-type hal_fingerprint_oppo_compat, domain;
-hal_client_domain(hal_fingerprint_oppo_compat, hal_fingerprint)
-hal_server_domain(hal_fingerprint_oppo_compat, hal_fingerprint)
-
-type hal_fingerprint_oppo_compat_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_fingerprint_oppo_compat)
-
-
-type hal_fingerprint_oppo, domain;
-allow hal_fingerprint_oppo vendor_default_prop:property_service { set };

nehemiah/sepolicy/hardware_overlay.te

@@ -1 +0,0 @@
-allow priv_app overlay_service:service_manager find;

nehemiah/sepolicy/hostapd.te

@@ -1,4 +0,0 @@
-type hostapd, domain;
-
-allow hostapd wifi_data_file:dir create_dir_perms;
-allow hostapd wifi_data_file:file create_file_perms;

nehemiah/sepolicy/huawei.te

@@ -1,17 +0,0 @@
-allow ueventd proc:file r_file_perms;
-permissive ueventd;
-
-type teecd_data_file, file_type;
-type dmd_device, file_type;
-allow hal_fingerprint_server dmd_device:chr_file rw_file_perms;
-allow hal_fingerprint_server sysfs:file rw_file_perms;
-allow tee hal_fingerprint_default:process { getattr };
-allow tee teecd_data_file:dir { search read write create getattr add_name open };
-allow tee teecd_data_file:file { read write create getattr open };
-allow tee system_data_file:dir { getattr };
-
-type oeminfo_nvm, domain;
-type oeminfo_nvm_device, file_type;
-allowxperm oeminfo_nvm oeminfo_nvm_device:blk_file ioctl { 0x1260 };
-
-allow charger rootfs:file { ioctl read getattr lock map execute entrypoint open };

nehemiah/sepolicy/init.te

@@ -1,13 +0,0 @@
-#This is in Android 8.0, but not 8.1
-domain_trans(init, rootfs, adbd)
-
-#This is used on Huawei devices to f2fs data partition
-allow init userdata_block_device:blk_file relabelto;
-allow init userdata_block_device:lnk_file relabelto;
-
-allow vendor_init vendor_init:capability { sys_module };
-
-allow init system_file:lnk_file create_file_perms;
-
-#fix adb in some cases
-allow init adbd_exec:lnk_file read;

nehemiah/sepolicy/lenovo.te

@@ -1,4 +0,0 @@
-type sysfs_tp, file_type;
-
-#Allow treble_app access to /sys/devices/virtual/touch/tp_dev/gesture_on
-allow system_app sysfs_tp:file rw_file_perms;

nehemiah/sepolicy/lmkd.te

@@ -1 +0,0 @@
-allow lmkd self:capability sys_ptrace;

nehemiah/sepolicy/mediatek.te

@@ -1,19 +0,0 @@
-type hal_graphics_allocator_default, domain; 
-type proc_ged, file_type; 
-allowxperm domain proc_ged:file ioctl { 0x6700-0x67ff };
-
-allow init mnt_product_file:dir mounton;
-
-type mtk_hal_audio, domain;
-typeattribute mtk_hal_audio hal_broadcastradio_client;
-
-type mtk_hal_power, domain;
-allow mtk_hal_power system_data_root_file:file create_file_perms;
-allow zygote ashmem_device:chr_file execute;
-
-attribute hal_mms_server;
-binder_call({appdomain -isolated_app}, hal_mms_server)
-binder_call(hal_mms_server, {appdomain -isolated_app})
-
-type mtk_hal_mms_hwservice, hwservice_manager_type;
-allow { appdomain -isolated_app }  mtk_hal_mms_hwservice:hwservice_manager find;

nehemiah/sepolicy/oppo.te

@@ -1,6 +0,0 @@
-type sysfs_usb_supply, file_type;
-
-allow system_app sysfs_usb_supply:file rw_file_perms;
-
-type hal_fingerprint_oplus, domain;
-allow hal_fingerprint_oplus vendor_default_prop:property_service set;

nehemiah/sepolicy/qualcomm.te

@@ -1,30 +0,0 @@
-type bt_firmware_file, file_type;
-type rild, domain;
-
-#me.phh.treble.qti.audio is system-signed
-allow system_app hal_telephony_hwservice:hwservice_manager { find };
-allow { rild system_app } { rild system_app }:binder { call transfer };
-
-#Pixel 1
-type vnd_qcril_audio_hwservice, hwservice_manager_type;
-allow system_app vnd_qcril_audio_hwservice:hwservice_manager { find };
-
-#Pixel 2
-type vnd_qcrilhook_hwservice, hwservice_manager_type;
-allow system_app vnd_qcrilhook_hwservice:hwservice_manager { find };
-
-#OP6
-allow system_app hal_telephony_hwservice:hwservice_manager { find };
-
-# cf https://github.com/phhusson/treble_experimentations/issues/131
-# SELinux : avc:  denied  { add } for interface=android.hardware.tetheroffload.control::IOffloadControl pid=15220 scontext=u:r:ipacm:s0 tcontext=u:object_r:hal_tetheroffload_hwservice:s0 tclass=hwservice_manager permissive=0
-type ipacm, hwservice_manager_type;
-allow ipacm hal_tetheroffload_hwservice:hwservice_manager { add };
-
-type rpmb_device, file_type;
-allow tee rpmb_device:blk_file rw_file_perms;
-allowxperm tee rpmb_device:blk_file ioctl { 0xb300-0xbfff };
-
-attribute smcinvoke_device_29_0;
-type smcinvoke_device, dev_type;
-typeattribute smcinvoke_device smcinvoke_device_29_0;

nehemiah/sepolicy/samsung.te

@@ -1,4 +0,0 @@
-type boot_prop, property_type;
-
-set_prop(system_server, boot_prop);
-

nehemiah/sepolicy/service_contexts

@@ -1,10 +0,0 @@
-qti.ims.ext                                          u:object_r:radio_service:s0
-# SPRD IMS
-ims_ex                                               u:object_r:radio_service:s0
-ims_ut_ex                                            u:object_r:radio_service:s0
-ims_doze_manager                                     u:object_r:radio_service:s0
-irit                                                 u:object_r:radio_service:s0
-
-# MTK IMS
-mwis                                    u:object_r:radio_service:s0
-mtkIms                                    u:object_r:radio_service:s0

nehemiah/sepolicy/su.te

@@ -1,151 +0,0 @@
-type phhsu_daemon, domain, mlstrustedsubject;
-type phhsu_exec, exec_type, file_type;
-type phhsu_daemon_tmpfs, file_type;
-
-typeattribute phhsu_daemon coredomain;
-permissive phhsu_daemon;
-
-tmpfs_domain(phhsu_daemon);
-domain_auto_trans(init, phhsu_exec, phhsu_daemon);
-file_type_auto_trans(phhsu_daemon, device, phhsu_daemon);
-
-allow { appdomain shell } phhsu_daemon:unix_stream_socket { connectto write read };
-allow { appdomain shell } phhsu_daemon:sock_file { write read };
-allow { appdomain shell } phhsu_exec:file { getattr read open execute execute_no_trans };
-
-create_pty(shell)
-allowxperm shell devpts:chr_file ioctl { TCSETSF TCGETS unpriv_tty_ioctls };
-allowxperm { phhsu_daemon untrusted_app untrusted_app_27 } untrusted_app_all_devpts:chr_file ioctl { TCSETSF TCGETS unpriv_tty_ioctls };
-
-allow servicemanager phhsu_daemon:dir { search read };
-allow servicemanager phhsu_daemon:file { open read };
-allow servicemanager phhsu_daemon:process { getattr };
-allow servicemanager phhsu_daemon:binder { call transfer };
-
-typeattribute phhsu_daemon mlstrustedobject;
-typeattribute phhsu_daemon mlstrustedsubject;
-
-allow shell su_exec:file getattr;
-typeattribute su mlstrustedsubject;
-
-allow phhsu_daemon { system_api_service app_api_service system_server_service }:service_manager find;
-
-allow system_server phhsu_daemon:fifo_file { read write getattr };
-allow system_server phhsu_daemon:fd use;
-allow system_server phhsu_daemon:binder { call transfer };
-allow system_server shell_devpts:chr_file { read write };
-
-# Add su to various domains
-net_domain(phhsu_daemon)
-
-hwbinder_use(phhsu_daemon)
-
-allow domain untrusted_app_all_devpts:chr_file { getattr read write };
-allow phhsu_daemon untrusted_app_all_devpts:chr_file { getattr read write open ioctl };
-allow phhsu_daemon untrusted_app_all:fifo_file { getattr read write open ioctl };
-allow phhsu_daemon zygote_exec:file { execute read open execute_no_trans getattr };
-
-allow appdomain phhsu_daemon:dir { search };
-
-allow phhsu_daemon self:global_capability_class_set { sys_resource sys_ptrace };
-
-allow phhsu_daemon self:dir rw_dir_perms;
-allow phhsu_daemon self:file { rwx_file_perms create rename setattr unlink };
-allow phhsu_daemon self:lnk_file { r_file_perms execmod };
-
-allow phhsu_daemon adbd_exec:file { getattr read };
-allow phhsu_daemon { rootfs same_process_hal_file system_file tmpfs }:file { mounton getattr };
-allow phhsu_daemon self:capability { sys_admin chown setuid setgid net_raw dac_override dac_read_search kill fowner mknod };
-allow phhsu_daemon self:capability2 { syslog };
-allow phhsu_daemon shell_exec:file rx_file_perms;
-allow phhsu_daemon system_file:file { rx_file_perms entrypoint };
-allow phhsu_daemon kmsg_device:chr_file { ioctl w_file_perms };
-allow phhsu_daemon toolbox_exec:file rx_file_perms;
-allow phhsu_daemon system_block_device:{ lnk_file file } r_file_perms;
-
-allow { phhsu_daemon shell } domain:dir rw_dir_perms;
-allow { phhsu_daemon shell } domain:file rw_file_perms;
-allow { phhsu_daemon shell } domain:lnk_file rw_file_perms;
-allow { phhsu_daemon shell } rootfs:file { rwx_file_perms create rename setattr unlink };
-allow { phhsu_daemon shell } rootfs:dir rw_dir_perms;
-allow phhsu_daemon asec_apk_file:dir rw_dir_perms;
-
-allow phhsu_daemon shell_devpts:chr_file rw_file_perms;
-
-allow phhsu_daemon app_data_file:dir rw_dir_perms;
-allow phhsu_daemon app_data_file:file { rwx_file_perms create rename setattr unlink };
-allow phhsu_daemon dalvikcache_data_file:dir rw_dir_perms;
-allow phhsu_daemon dalvikcache_data_file:file { rwx_file_perms create rename setattr unlink };
-allow phhsu_daemon dalvikcache_data_file:lnk_file { r_file_perms execmod };
-allow phhsu_daemon system_data_file:file { rwx_file_perms create rename setattr unlink };
-allow phhsu_daemon system_data_file:dir rw_dir_perms;
-allow phhsu_daemon system_data_file:file { rwx_file_perms create rename setattr unlink };
-allow phhsu_daemon system_file:dir rw_dir_perms;
-allow phhsu_daemon system_file:file { rwx_file_perms create rename setattr unlink };
-allow phhsu_daemon init:unix_stream_socket { connectto };
-allow phhsu_daemon self:process { ptrace setexec execmem setfscreate };
-allow phhsu_daemon app_data_file:file { rwx_file_perms create rename setattr unlink };
-allow phhsu_daemon app_data_file:dir rw_dir_perms;
-allow phhsu_daemon ashmem_device:chr_file { execute };
-allow phhsu_daemon dex2oat_exec:file rx_file_perms;
-
-
-allow phhsu_daemon phhsu_daemon_tmpfs:file rwx_file_perms;
-
-allow phhsu_daemon { proc_type dev_type exec_type file_type sysfs_type fs_type phhsu_daemon }:file { rwx_file_perms create mounton setattr getattr relabelto relabelfrom unlink rename };
-allow phhsu_daemon { proc_type dev_type exec_type file_type sysfs_type fs_type phhsu_daemon }:lnk_file { rw_file_perms create mounton setattr getattr relabelto relabelfrom unlink rename};
-allow phhsu_daemon { proc_type dev_type exec_type file_type sysfs_type fs_type phhsu_daemon }:dir { rw_dir_perms create mounton setattr getattr relabelto relabelfrom unlink rename};
-allow phhsu_daemon { proc_type dev_type exec_type file_type sysfs_type fs_type phhsu_daemon }:chr_file { rwx_file_perms unlink rename ioctl};
-allow phhsu_daemon { proc_type dev_type exec_type file_type sysfs_type fs_type phhsu_daemon }:blk_file { rw_file_perms create unlink rename ioctl};
-
-allow phhsu_daemon device:file rwx_file_perms;
-allow phhsu_daemon device:dir rw_dir_perms;
-
-allow phhsu_daemon domain:process { ptrace signal signull getattr };
-allow phhsu_daemon selinuxfs:file rwx_file_perms;
-allow domain phhsu_daemon:process { sigchld };
-allow phhsu_daemon domain:binder { call transfer };
-allow phhsu_daemon kernel:system { syslog_read syslog_mod };
-allow phhsu_daemon kernel:security { setenforce compute_av };
-allow phhsu_daemon domain:unix_stream_socket { getattr };
-
-allow phhsu_daemon logdr_socket:sock_file write;
-allow phhsu_daemon logd:unix_stream_socket connectto;
-
-allow phhsu_daemon property_type:property_service { set };
-allow phhsu_daemon property_socket:sock_file { write };
-allow phhsu_daemon property_type:file rw_file_perms;
-allow phhsu_daemon { hwservicemanager hwservice_manager_type }:hwservice_manager { list add find };
-allow phhsu_daemon domain:unix_dgram_socket rw_socket_perms;
-
-allow phhsu_daemon tombstoned_intercept_socket:sock_file { write };
-allow phhsu_daemon tombstoned:unix_stream_socket { connectto };
-
-allow phhsu_daemon { property_data_file data_file_type tmpfs }:file create_file_perms;
-allow phhsu_daemon { property_data_file data_file_type tmpfs }:dir create_dir_perms;
-
-allow phhsu_daemon { tmpfs fs_type }:filesystem { mount remount unmount associate };
-
-allow phhsu_daemon phhsu_daemon:file relabelfrom;
-
-allow phhsu_daemon properties_device:dir { map };
-allow phhsu_daemon { tmpfs }:dir { mounton };
-allow phhsu_daemon { file_type shell_data_file system_file}:file { relabelto relabelfrom} ;
-
-allow phhsu_daemon domain:fd { use };
-allow phhsu_daemon domain:unix_stream_socket { connectto ioctl getattr getopt read write shutdown };
-allow phhsu_daemon self:netlink_kobject_uevent_socket create_socket_perms;
-allow phhsu_daemon self:{ netlink_tcpdiag_socket } { create_socket_perms nlmsg_write nlmsg_read };
-allow phhsu_daemon self:{ netlink_selinux_socket } { create_socket_perms };
-
-allow phhsu_daemon file_type:file create_file_perms;
-allow phhsu_daemon file_type:dir create_dir_perms;
-
-allow phhsu_daemon domain:process { transition };
-
-
-# 05-09 00:05:30.149 18450 18450 W lprename: type=1400 audit(0.0:40923): avc: denied { ioctl } for path="/dev/block/sda25" dev="tmpfs" ino=19441 ioctlcmd=0x1278 scontext=u:r:phhsu_daemon:s0 tcontext=u:object_r:super_block_device:s0 tclass=blk_file permissive=0
-# 06-06 12:59:53.775 30150 30150 I auditd  : type=1400 audit(0.0:35585): avc: denied { ioctl } for comm="blockdev" path="/dev/block/dm-3" dev="tmpfs" ino=12687 ioctlcmd=0x125d scontext=u:r:phhsu_daemon:s0 tcontext=u:object_r:dm_device:s0 tclass=blk_file permissive=0
-
-allowxperm phhsu_daemon { file_type block_device }:blk_file ioctl { 0-0xffff };
-allowxperm phhsu_daemon { system_block_device super_block_device dm_device }:blk_file ioctl { 0x1278-0x127a 0x125d };

nehemiah/sepolicy/treble_app.te

@@ -1,44 +0,0 @@
-allow system_app hal_wifi_hostapd_hwservice:hwservice_manager { add find };
-allow system_app hidl_base_hwservice:hwservice_manager { add };
-allow system_app wifi_data_file:dir create_dir_perms;
-allow system_app wifi_data_file:file create_file_perms;
-
-allow system_app sysfs_batteryinfo:file rw_file_perms;
-
-type vendor_camera_prop, property_type;
-set_prop(system_app, vendor_camera_prop);
-type camera_prop, property_type;
-set_prop(system_app, camera_prop);
-
-type hal_ext_fingerprint_hwservice, hwservice_manager_type;
-allow system_app hal_ext_fingerprint_hwservice:hwservice_manager { find };
-type hal_fingerprint_default, domain;
-allow system_app hal_fingerprint_default:binder { call };
-allow system_app sysfs_power:dir r_dir_perms;
-allow system_app sysfs_power:file rw_file_perms;
-allow system_app sysfs_power:lnk_file read;
-
-type default_hisi_hwservice, hwservice_manager_type;
-allow system_app default_hisi_hwservice:hwservice_manager { find };
-
-type hal_tp_default, domain;
-allow system_app hal_tp_default:binder { call };
-
-#cam2api
-allow system_app vendor_default_prop:property_service { set };
-
-set_prop(system_app, default_prop);
-set_prop(system_app, exported3_default_prop);
-
-type mtk_hal_rild_hwservice, hwservice_manager_type;
-allow system_app mtk_hal_rild_hwservice:hwservice_manager { find};
-
-type mtk_vilte_support_prop, property_type;
-allow system_app mtk_vilte_support_prop:property_service set;
-
-type hal_gesturewake_hwservice, hwservice_manager_type;
-type hal_gesturewake_default, domain;
-allow system_app hal_gesturewake_hwservice:hwservice_manager { find };
-allow system_app hal_gesturewake_default:binder { call transfer };
-allow hal_gesturewake_default system_app:binder { call transfer };
-

nehemiah/sepolicy/vndk_detect.te

@@ -1,27 +0,0 @@
-type vndk_detect, coredomain, domain;
-type vndk_detect_exec, exec_type, file_type;
-
-init_daemon_domain(vndk_detect);
-allow vndk_detect sepolicy_file:file r_file_perms;
-set_prop(vndk_detect,system_prop);
-set_prop(vndk_detect,debug_prop);
-
-allow vndk_detect shell_exec:file rx_file_perms;
-allow vndk_detect toolbox_exec:file rx_file_perms;
-#/system/bin/grep
-allow vndk_detect system_file:file rx_file_perms;
-
-#mount -o bind /system/bin/adbd /sbin/adbd
-allow vndk_detect adbd_exec:file { getattr read };
-allow vndk_detect rootfs:file { mounton getattr };
-allow vndk_detect self:capability { sys_admin };
-
-#mount -o bind /system/etc/usb_audio_policy_configuration.xml /vendor/etc/usb_audio_policy_configuration.xml
-allow init vendor_configs_file:file { getattr mounton };
-
-#/sys/module/five
-allow vndk_detect sysfs:file r_file_perms;
-allow vndk_detect sysfs:dir r_dir_perms;
-
-#/proc/filesystems
-allow vndk_detect proc_filesystems:file r_file_perms;

nehemiah/sepolicy/vold.te

@@ -1,2 +0,0 @@
-allow vold system_data_file:lnk_file { unlink };
-allow mediaextractor sdcard_type:file read;

nehemiah/system.prop

@@ -1,4 +0,0 @@
-persist.bluetooth.bluetooth_audio_hal.disabled=true
-persist.sys.bt.unsupport.features=00000000
-persist.sys.bt.unsupport.states=00000000
-persist.sys.bt.unsupport.stdfeatures=000001

patches/calendar_test.patch

@@ -0,0 +1,12 @@
+diff --git a/build/tasks/tests/platform_test_list.mk b/build/tasks/tests/platform_test_list.mk
+index 5c5f70fa7..4669e2b44 100644
+--- a/build/tasks/tests/platform_test_list.mk
++++ b/build/tasks/tests/platform_test_list.mk
+@@ -20,7 +20,6 @@ platform_tests += \
+     BootHelperApp \
+     BusinessCard \
+     CalculatorFunctionalTests \
+-    CalendarTests \
+     camera_client_test \
+     camera_metadata_tests \
+     CellBroadcastReceiverTests \

patches/qsb_on_first_screen.patch

@@ -0,0 +1,13 @@
+diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
+index 33beacd4c0..bd2400ecbc 100644
+--- a/src/com/android/launcher3/config/FeatureFlags.java
++++ b/src/com/android/launcher3/config/FeatureFlags.java
+@@ -52,7 +52,7 @@ public final class FeatureFlags {
+      * Enable moving the QSB on the 0th screen of the workspace. This is not a configuration feature
+      * and should be modified at a project level.
+      */
+-    public static final boolean QSB_ON_FIRST_SCREEN = BuildConfig.QSB_ON_FIRST_SCREEN;
++    public static final boolean QSB_ON_FIRST_SCREEN = false;
+ 
+     /**
+      * Feature flag to handle define config changes dynamically instead of killing the process.

qinf21pro/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/qinf21pro.mk 

qinf21pro/patches/launcher3.patch

@@ -0,0 +1,25 @@
+diff --git a/res/layout/search_container_all_apps.xml b/res/layout/search_container_all_apps.xml
+index e1646ba43..850d86ccc 100644
+--- a/res/layout/search_container_all_apps.xml
++++ b/res/layout/search_container_all_apps.xml
+@@ -34,4 +34,5 @@
+     android:singleLine="true"
+     android:textColor="?android:attr/textColorSecondary"
+     android:textColorHint="@drawable/all_apps_search_hint"
+-    android:textSize="16sp" />
+\ No newline at end of file
++    android:textSize="16sp"
++    android:visibility="gone" />
+diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
+index 88a9abaf8..d4a65f05b 100644
+--- a/src/com/android/launcher3/config/FeatureFlags.java
++++ b/src/com/android/launcher3/config/FeatureFlags.java
+@@ -52,7 +52,7 @@ public final class FeatureFlags {
+      * Enable moving the QSB on the 0th screen of the workspace. This is not a configuration feature
+      * and should be modified at a project level.
+      */
+-    public static final boolean QSB_ON_FIRST_SCREEN = true;
++    public static final boolean QSB_ON_FIRST_SCREEN = false;
+ 
+     /**
+      * Feature flag to handle define config changes dynamically instead of killing the process.

qinf21pro/qinf21pro.mk

@@ -0,0 +1,59 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
+
+#
+# All components inherited here go to system_ext image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
+
+#
+# All components inherited here go to product image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
+
+#
+# Special settings for GSI releasing
+#
+# ifeq (aosp_arm64,$(TARGET_PRODUCT))
+$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+# endif
+
+PRODUCT_CHARACTERISTICS := device
+
+PRODUCT_NAME := qinf21pro
+PRODUCT_DEVICE := qinf21pro
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := DuoQin F21 pro WePhone
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/ttp/overlay
+
+PRODUCT_COPY_FILES += \
+	device/wephone/qinf21pro/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
+	device/wephone/qinf21pro/files/mtk-kpd.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-kpd.kcm \
+	device/wephone/qinf21pro/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl \
+	device/wephone/qinf21pro/files/mtk-pmic-keys.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-pmic-keys.idc \
+	device/wephone/qinf21pro/files/mtk-pmic-keys.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-pmic-keys.kcm \
+	device/wephone/qinf21pro/files/mtk-pmic-keys.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-pmic-keys.kl \
+	device/wephone/qinf21pro/files/Vendor_0001_Product_0001_Version_0100.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/Vendor_0001_Product_0001_Version_0100.kl
+
+# Use a more decent APN config
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+ifneq (,$(wildcard external/exfat))
+PRODUCT_PACKAGES += \
+	mkfs.exfat \
+	fsck.exfat
+endif
+
+PRODUCT_PACKAGES += \
+	Contacts \
+	DeskClock \
+	Etar \
+	Gallery2 \
+	TrichromeWebView \
+	WKT9
+

qinf21pro/qinf21pro/BoardConfig.mk

@@ -0,0 +1,29 @@
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := generic
+
+include build/make/target/board/BoardConfigGsiCommon.mk
+
+# TODO(jiyong) These might be SoC specific.
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
+
+TARGET_EXFAT_DRIVER := exfat
+TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
+
+ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+else
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+endif

qinf21pro/system.prop

@@ -0,0 +1,10 @@
+# Fixed Bluetooth audio
+persist.bluetooth.bluetooth_audio_hal.disabled=true
+persist.sys.bt.unsupport.features=00000000
+persist.sys.bt.unsupport.states=00000000
+persist.sys.bt.unsupport.stdfeatures=000001
+# VoLTE properties
+persist.dbg.vt_avail_ovr=1
+persist.dbg.volte_avail_ovr=1
+persist.dbg.wfc_avail_ovr=1
+persist.dbg.allow_ims_off=1

qinf22pro/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/qinf22pro.mk

qinf22pro/board-base.mk

@@ -0,0 +1 @@
+TARGET_SYSTEM_PROP := device/wephone/qinf22pro/system.prop $(TARGET_SYSTEM_PROP)

qinf22pro/files/mtk-kpd.idc

@@ -0,0 +1,6 @@
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+device.internal = 1
+keyboard.layout = mtk-kpd
+keyboard.characterMap = mtk-kpd

qinf22pro/files/mtk-kpd.kcm

@@ -0,0 +1,92 @@
+type FULL
+
+key BUTTON_X {
+    base:                               fallback BACK
+    fn:                                 fallback HOME
+    ctrl:                               fallback APP_SWITCH
+}
+
+key BUTTON_Y {
+    base:                               fallback CALL
+    ctrl:                               fallback SYM
+}
+
+key BUTTON_Z {
+    base:                               fallback ENTER
+    fn:                                 fallback VOLUME_MUTE
+    ctrl:                               fallback SYSRQ
+}
+
+key BUTTON_1 {
+    base:                               fallback DPAD_UP
+    fn:                                 fallback VOLUME_UP
+}
+
+key BUTTON_2 {
+    base:                               fallback DPAD_LEFT
+    fn:                                 fallback BRIGHTNESS_DOWN
+}
+
+key BUTTON_3 {
+    base:                               fallback DPAD_RIGHT
+    fn:                                 fallback BRIGHTNESS_UP
+}
+
+key BUTTON_4 {
+    base:                               fallback DPAD_DOWN
+    fn:                                 fallback VOLUME_DOWN
+}
+
+key 0 {
+    label:                              '0'
+    base:                               '0'
+    fn:                                 '\n'
+    ctrl:                               '\t'
+}
+
+key 1 {
+    label:                              '1'
+    base:                               '1'
+}
+
+key 2 {
+    label:                              '2'
+    base:                               '2'
+}
+
+key 3 {
+    label:                              '3'
+    base:                               '3'
+}
+
+key 4 {
+    label:                              '4'
+    base:                               '4'
+}
+
+key 5 {
+    label:                              '5'
+    base:                               '5'
+}
+
+key 6 {
+    label:                              '6'
+    base:                               '6'
+}
+
+key 7 {
+    label:                              '7'
+    base:                               '7'
+    fn:                                 '*'
+}
+
+key 8 {
+    label:                              '8'
+    base:                               '8'
+}
+
+key 9 {
+    label:                              '9'
+    base:                               '9'
+    ctrl:                               '#'
+}

qinf22pro/files/mtk-kpd.kl

@@ -0,0 +1,49 @@
+key 2     1
+key 3     2
+key 4     3
+key 5     4
+key 6     5
+key 7     6
+key 8     7
+key 9     8
+key 10    9
+key 11    0
+
+# DPAD UP
+key 103   BUTTON_1
+
+# DPAD LEFT
+key 105   BUTTON_2
+
+# DPAD RIGHT
+key 106   BUTTON_3
+
+# DPAD DOWN
+key 108   BUTTON_4
+
+# Power button
+key 116   POWER
+
+# BACK
+key 158   BUTTON_X
+
+# CALL
+key 169   BUTTON_Y
+
+# DPAD CENTER
+key 353   BUTTON_Z
+
+# STAR
+key 522   FUNCTION
+
+# POUND
+key 523   CTRL_RIGHT
+
+# VOL DOWN
+key 114   VOLUME_DOWN
+
+# VOL UP
+key 115   VOLUME_UP
+
+# DELETE
+key 139   DEL