From 55657365819baeccf67d68ba1265cae5362c4805 Mon Sep 17 00:00:00 2001
From: Hinix <greenland10@126.com>
Date: Tue, 5 Nov 2024 15:46:15 +0800
Subject: [PATCH] update v4.5.0

---
 README.md                                     |   2 ++
 .../frameworks/base/cmds/screencap/Android.bp |   4 +++
 .../base/cmds/screencap/screencap.cpp         |   4 ++-
 .../services/surfaceflinger/DisplayDevice.cpp |   3 +-
 .../providers/MediaProvider/Android.bp        |   1 +
 .../android/providers/media/MediaService.java |   4 +++
 .../frameworks/base/native/cmds/Android.bp    |  19 ++++++++++-
 .../base/native/cmds/include/HwScreencap.h    |   5 +++
 .../cmds/lib/libscreencap_vendor_impl.a       | Bin 0 -> 38634 bytes
 .../cmds/lib64/libscreencap_vendor_impl.a     | Bin 0 -> 42306 bytes
 .../com/android/providers/media/Android.bp    |  11 ++++++
 .../media/MediaProvider-vendor-impl.jar       | Bin 0 -> 1155 bytes
 .../media/audio_policy_configuration.xml      |   8 +++++
 .../primary_audio_policy_configuration.xml    |  31 +++++++++++++++++
 .../r_submix_audio_policy_configuration.xml   |  32 ++++++++++++++++++
 aosp/vendor/common/products/product_common.mk |   9 +++--
 16 files changed, 127 insertions(+), 6 deletions(-)
 create mode 100644 aosp/vendor/common/android/cph/frameworks/base/native/cmds/include/HwScreencap.h
 create mode 100644 aosp/vendor/common/android/cph/frameworks/base/native/cmds/lib/libscreencap_vendor_impl.a
 create mode 100644 aosp/vendor/common/android/cph/frameworks/base/native/cmds/lib64/libscreencap_vendor_impl.a
 create mode 100644 aosp/vendor/common/android/cph/packages/providers/MediaProvider/src/com/android/providers/media/Android.bp
 create mode 100644 aosp/vendor/common/android/cph/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider-vendor-impl.jar
 create mode 100644 aosp/vendor/common/android/media/audio_policy_configuration.xml
 create mode 100644 aosp/vendor/common/android/media/primary_audio_policy_configuration.xml
 create mode 100644 aosp/vendor/common/android/media/r_submix_audio_policy_configuration.xml

diff --git a/README.md b/README.md
index c21197708..f06f4640c 100644
--- a/README.md
+++ b/README.md
@@ -285,3 +285,5 @@ PRODUCT_PACKAGES += \
 支持镜像查询以及同region不同账号镜像共享
 
 https://support.huaweicloud.com/api-cph/cph_api_0559.html
+
+注意:同一个账号在同一个region下最多支持创建200个镜像文件
diff --git a/aosp/frameworks/base/cmds/screencap/Android.bp b/aosp/frameworks/base/cmds/screencap/Android.bp
index 248c67589..635ca1867 100644
--- a/aosp/frameworks/base/cmds/screencap/Android.bp
+++ b/aosp/frameworks/base/cmds/screencap/Android.bp
@@ -12,6 +12,10 @@ cc_binary {
         "libgui",
     ],
 
+    static_libs: [
+         "libscreencap_vendor",
+    ],
+ 
     cflags: [
         "-Wall",
         "-Werror",
diff --git a/aosp/frameworks/base/cmds/screencap/screencap.cpp b/aosp/frameworks/base/cmds/screencap/screencap.cpp
index bb32dd2fa..48a4a69cf 100644
--- a/aosp/frameworks/base/cmds/screencap/screencap.cpp
+++ b/aosp/frameworks/base/cmds/screencap/screencap.cpp
@@ -36,6 +36,7 @@
 #include <ui/PixelFormat.h>
 
 #include <system/graphics.h>
+#include "HwScreencap.h"
 
 // TODO: Fix Skia.
 #pragma GCC diagnostic push
@@ -100,8 +101,9 @@ static uint32_t dataSpaceToInt(ui::Dataspace d)
 }
 
 static status_t notifyMediaScanner(const char* fileName) {
+    std::string inputFilePath = getCmdPath(fileName);
     std::string filePath("file://");
-    filePath.append(fileName);
+    filePath.append(inputFilePath);
     char *cmd[] = {
         (char*) "am",
         (char*) "broadcast",
diff --git a/aosp/frameworks/native/services/surfaceflinger/DisplayDevice.cpp b/aosp/frameworks/native/services/surfaceflinger/DisplayDevice.cpp
index 9ff603a5c..d0e226185 100644
--- a/aosp/frameworks/native/services/surfaceflinger/DisplayDevice.cpp
+++ b/aosp/frameworks/native/services/surfaceflinger/DisplayDevice.cpp
@@ -236,8 +236,7 @@ void DisplayDevice::setProjection(ui::Rotation orientation, Rect viewport, Rect
         if (sPrimaryDisplayRotationFlags != ui::Transform::toRotationFlags(orientation)) {
             // 通知hwConposer屏幕发生旋转
             const auto displayId = getId();
-            int32_t transformFlag = ui::Transform::toRotationFlags(orientation) > 0 ? 1 : 0;
-            mFlinger->getHwComposer().eventControl(*displayId, HWC_EVENT_ORIENTATION_CHANGED, transformFlag);
+            mFlinger->getHwComposer().eventControl(*displayId, HWC_EVENT_ORIENTATION_CHANGED, ui::toRotationInt(orientation));
         }
         sPrimaryDisplayRotationFlags = ui::Transform::toRotationFlags(orientation);
         transformOrientation = ui::Transform::toRotationFlags(orientation + mPhysicalOrientation);
diff --git a/aosp/packages/providers/MediaProvider/Android.bp b/aosp/packages/providers/MediaProvider/Android.bp
index e1ac31ded..c78b5189c 100644
--- a/aosp/packages/providers/MediaProvider/Android.bp
+++ b/aosp/packages/providers/MediaProvider/Android.bp
@@ -7,6 +7,7 @@ android_app {
         "androidx.appcompat_appcompat",
         "androidx.core_core",
         "guava",
+        "MediaProvider-vendor",
     ],
 
     libs: [
diff --git a/aosp/packages/providers/MediaProvider/src/com/android/providers/media/MediaService.java b/aosp/packages/providers/MediaProvider/src/com/android/providers/media/MediaService.java
index d7c6babdf..2ef3b7983 100644
--- a/aosp/packages/providers/MediaProvider/src/com/android/providers/media/MediaService.java
+++ b/aosp/packages/providers/MediaProvider/src/com/android/providers/media/MediaService.java
@@ -160,6 +160,10 @@ public class MediaService extends JobIntentService {
 
     private static Uri onScanFile(Context context, Uri uri) throws IOException {
         final File file = new File(uri.getPath()).getCanonicalFile();
+        HwMediaService hwMediaService = new HwMediaService();
+        if (!hwMediaService.checkFile(file)) {
+            throw new IOException("Invalid path " + file.getPath());
+        }
         try (ContentProviderClient cpc = context.getContentResolver()
                 .acquireContentProviderClient(MediaStore.AUTHORITY)) {
             final MediaProvider provider = ((MediaProvider) cpc.getLocalContentProvider());
diff --git a/aosp/vendor/common/android/cph/frameworks/base/native/cmds/Android.bp b/aosp/vendor/common/android/cph/frameworks/base/native/cmds/Android.bp
index ddce2ef2a..9cc349d2b 100644
--- a/aosp/vendor/common/android/cph/frameworks/base/native/cmds/Android.bp
+++ b/aosp/vendor/common/android/cph/frameworks/base/native/cmds/Android.bp
@@ -32,4 +32,21 @@ cc_prebuilt_library_static {
     strip : {
         none: true,
     },
-}
\ No newline at end of file
+}
+
+cc_prebuilt_library_static {
+    name: "libscreencap_vendor",
+    compile_multilib: "both",
+    export_include_dirs: ["./include"],
+    multilib: {
+        lib64: {
+            srcs: ["lib64/libscreencap_vendor_impl.a"],
+        },
+        lib32: {
+            srcs: ["lib/libscreencap_vendor_impl.a"],
+        },
+    },
+    strip : {
+        none: true,
+    },
+}
diff --git a/aosp/vendor/common/android/cph/frameworks/base/native/cmds/include/HwScreencap.h b/aosp/vendor/common/android/cph/frameworks/base/native/cmds/include/HwScreencap.h
new file mode 100644
index 000000000..01e34eed9
--- /dev/null
+++ b/aosp/vendor/common/android/cph/frameworks/base/native/cmds/include/HwScreencap.h
@@ -0,0 +1,5 @@
+#pragma once
+ 
+#include <string>
+ 
+std::string getCmdPath(const char *filePath);
diff --git a/aosp/vendor/common/android/cph/frameworks/base/native/cmds/lib/libscreencap_vendor_impl.a b/aosp/vendor/common/android/cph/frameworks/base/native/cmds/lib/libscreencap_vendor_impl.a
new file mode 100644
index 0000000000000000000000000000000000000000..761ec87ee3dd4bda76e999ac80723588e79c764d
GIT binary patch
literal 38634
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

literal 0
HcmV?d00001

diff --git a/aosp/vendor/common/android/cph/frameworks/base/native/cmds/lib64/libscreencap_vendor_impl.a b/aosp/vendor/common/android/cph/frameworks/base/native/cmds/lib64/libscreencap_vendor_impl.a
new file mode 100644
index 0000000000000000000000000000000000000000..b011b786765350b7a33e947fea08efc99fef9083
GIT binary patch
literal 42306
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
auZMy|vh6U>y{mN2UYv-2<0~$*{Qn0{XGLlN

literal 0
HcmV?d00001

diff --git a/aosp/vendor/common/android/cph/packages/providers/MediaProvider/src/com/android/providers/media/Android.bp b/aosp/vendor/common/android/cph/packages/providers/MediaProvider/src/com/android/providers/media/Android.bp
new file mode 100644
index 000000000..038002e92
--- /dev/null
+++ b/aosp/vendor/common/android/cph/packages/providers/MediaProvider/src/com/android/providers/media/Android.bp
@@ -0,0 +1,11 @@
+java_import {
+    name: "MediaProvider-vendor",
+    installable: false,
+    required: ["MediaProvider-vendor-impl"],
+    jars: ["MediaProvider-vendor-impl.jar"],
+ 
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+}
diff --git a/aosp/vendor/common/android/cph/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider-vendor-impl.jar b/aosp/vendor/common/android/cph/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider-vendor-impl.jar
new file mode 100644
index 0000000000000000000000000000000000000000..44b743347aea318c970f211e5ac8acaa3f2a6d51
GIT binary patch
literal 1155
zcmWIWW@Zs#;Nak3NZcF~$$$hn8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1g<Oz^PdT
zr~<Cp*U`_@%{4eg&)4m<@0rs+-nx1hdA)VD&Yd~GImqCO@q?#DdS1Rdp1v1LSFvz0
zxPI{wG5OOiG`ToPbk65)u20=U-VI%*l{+hTf?Y6`ZQC*jp!rTfjN1hUK-uK{T>Zqn
zl%o916#ast{IblH)S_bj+|-oJM17BPUl1LfT2z*qoT`_clUQ8b8({0t<S0<f&91Kg
zY2}x)hGT2D9K10@!q-pNK&0&SJvOnO(VJy{EYDfvqw|OHpT^@icTFQCW><cGc6Rp6
zGuOW#S8oXZ!ZhXL$BSP#zJJ`Xuxg#~+&F_NzneLm%QKaZUf?NR^zPcnkelp=u|Z3P
zr8K7rCvJW0deQrN)zJbOFX7^eF4tak*hg=^IB}D<+-eW*y1zxQ3)Z}G^EORdadPJ*
z|L|MB8Q%}L-r!irTi$x{!9+!m*10Q9@-uQ?FX=mb%WLZDyKf(=uiM_owTkEP|NBQS
zoSLTNYV`Q~<<?1>hcCweoBfv2!lm<{7ym-_=^QVay6g=7PH<=+F5j@-=ib7Iv)wBK
z*N9g(#5%dvtT&i1IBm}H>c3Cdq@IggC+0WZ^uigjZARDrF@n-Sz2CfTDvS&aKY$o_
z3>XrK0Z(jE5Zil@@1TQ3%k%YFS38e53v~W}@<dPN$U^h&TYtB&-KO1LWzNq3U}4MC
zG``6vpUgh<xwM{PhLZQhWiJGbY6WWN+z#US`*2l2Z_;ZEk<AyUT{wI9YW7dY=BJOg
zi6w{X?b{fo#;D%2b#=tmW7gR}p2Q~i{xA-2e6pW&;rG89p?ja7T_;fM$<e~$C?Xuy
z;q3JLvEU?gkdKoV`*%zR`e!pZ%`q~GFra1{SdIW?8dLz!1)wYx;Ek#kIVpp(3<B5!
znQ*O083^43<fs58c?8%GWRjWz&`n47HYhp~z!B(Ue5PZK+yHM@Hjoi4KxhR_JI2f)
F9svHzh`9g&

literal 0
HcmV?d00001

diff --git a/aosp/vendor/common/android/media/audio_policy_configuration.xml b/aosp/vendor/common/android/media/audio_policy_configuration.xml
new file mode 100644
index 000000000..ac820e126
--- /dev/null
+++ b/aosp/vendor/common/android/media/audio_policy_configuration.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+ 
+<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <modules>
+        <xi:include href="primary_audio_policy_configuration.xml"/>
+        <xi:include href="r_submix_audio_policy_configuration.xml"/>
+    </modules>
+</audioPolicyConfiguration>
\ No newline at end of file
diff --git a/aosp/vendor/common/android/media/primary_audio_policy_configuration.xml b/aosp/vendor/common/android/media/primary_audio_policy_configuration.xml
new file mode 100644
index 000000000..0b4c2cd48
--- /dev/null
+++ b/aosp/vendor/common/android/media/primary_audio_policy_configuration.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module name="primary" halVersion="2.0">
+    <attachedDevices>
+        <item>Speaker</item>
+        <item>Built-In Mic</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="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
+        <mixPort name="primary input" role="sink">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+        </mixPort>
+   </mixPorts>
+   <devicePorts>
+        <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
+        </devicePort>
+
+        <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
+        </devicePort>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="Speaker"
+               sources="primary output"/>
+        <route type="mix" sink="primary input"
+               sources="Built-In Mic"/>
+    </routes>
+</module>
\ No newline at end of file
diff --git a/aosp/vendor/common/android/media/r_submix_audio_policy_configuration.xml b/aosp/vendor/common/android/media/r_submix_audio_policy_configuration.xml
new file mode 100644
index 000000000..2f5fa8d32
--- /dev/null
+++ b/aosp/vendor/common/android/media/r_submix_audio_policy_configuration.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module name="r_submix" halVersion="2.0">
+    <attachedDevices>
+        <item>Remote Submix In</item>
+    </attachedDevices>
+    <mixPorts>
+        <mixPort name="r_submix output" role="source">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
+        <mixPort name="r_submix input" role="sink">
+           <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+        </mixPort>
+   </mixPorts>
+   <devicePorts>
+       <devicePort tagName="Remote Submix Out" type="AUDIO_DEVICE_OUT_REMOTE_SUBMIX"  role="sink">
+           <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+       </devicePort>
+       <devicePort tagName="Remote Submix In" type="AUDIO_DEVICE_IN_REMOTE_SUBMIX"  role="source">
+           <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+        </devicePort>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="Remote Submix Out"
+               sources="r_submix output"/>
+        <route type="mix" sink="r_submix input"
+               sources="Remote Submix In"/>
+    </routes>
+</module>
\ No newline at end of file
diff --git a/aosp/vendor/common/products/product_common.mk b/aosp/vendor/common/products/product_common.mk
index 90313a9de..cad57dbb2 100644
--- a/aosp/vendor/common/products/product_common.mk
+++ b/aosp/vendor/common/products/product_common.mk
@@ -50,7 +50,8 @@ PRODUCT_PACKAGES += \
     libGLESv2_slow_binding \
     libGLESv3_slow_binding \
     ni_rsrc_mon \
-    ni_rsrc_list
+    ni_rsrc_list \
+    audio.primary.defaul
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.hardware.gralloc=$(BUILD_HARDWARE) \
@@ -116,7 +117,11 @@ PRODUCT_COPY_FILES += \
     vendor/common/android/media/audio_policy_engine_configuration.xml:system/vendor/etc/audio_policy_engine_configuration.xml \
     vendor/common/android/media/audio_policy_engine_default_stream_volumes.xml:system/vendor/etc/audio_policy_engine_default_stream_volumes.xml \
     vendor/common/android/media/audio_policy_engine_product_strategies.xml:system/vendor/etc/audio_policy_engine_product_strategies.xml \
-    vendor/common/android/media/audio_policy_engine_stream_volumes.xml:system/vendor/etc/audio_policy_engine_stream_volumes.xml
+    vendor/common/android/media/audio_policy_engine_stream_volumes.xml:system/vendor/etc/audio_policy_engine_stream_volumes.xml \
+    vendor/common/android/media/audio_policy_engine_stream_volumes.xml:system/vendor/etc/audio_policy_engine_stream_volumes.xml \
+    vendor/common/android/media/audio_policy_configuration.xml:system/vendor/etc/audio_policy_configuration.xml \
+    vendor/common/android/media/primary_audio_policy_configuration.xml:system/vendor/etc/primary_audio_policy_configuration.xml \
+    vendor/common/android/media/r_submix_audio_policy_configuration.xml:system/vendor/etc/r_submix_audio_policy_configuration.xml
 
 DEVICE_PACKAGE_OVERLAYS += \
     vendor/common/android/overlay
-- 
Gitee