commit 3ccf874dcaaebd7e11bb18bfa63111d6a1e42fa7
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 18 16:37:11 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 18 16:37:11 2020 +0000
tree 80ca6426fd2c4ae348aedc59a9c8b00b6a62a247
parent f7b6901230342c789047e1da0042e314fb95e927
parent c2094aedcc62926560a584f60da6883d2c163948

Merge "Screen recording doesnt record internal audio" into rvc-dev

data/etc/com.android.systemui.xml

diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml
index 72827a9..a5a2221 100644
--- a/data/etc/com.android.systemui.xml
+++ b/data/etc/com.android.systemui.xml
@@ -16,6 +16,7 @@
   -->
 <permissions>
     <privapp-permissions package="com.android.systemui">
+        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
         <permission name="android.permission.BATTERY_STATS"/>
         <permission name="android.permission.BIND_APPWIDGET"/>
         <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>

packages/SystemUI/AndroidManifest.xml

diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 4510b87..055b2be 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -155,6 +155,7 @@
     <!-- Screen Recording -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
 
     <!-- Assist -->
     <uses-permission android:name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE" />