commit 96966d2cd3e52948b661257f5d4b9bca71f9837e
author Philip Nagler-Frank <philip@nagler.world> Tue Nov 29 18:48:34 2022 +0100
committer GitHub <noreply@github.com> Tue Nov 29 18:48:34 2022 +0100
tree 7154a88fbd5994fabc1210bfa0e7b00a31887152
parent aa7bb2b364f5d078e743fdcdc7b313c9070e1615
parent 9bfcb8de6bc73b30ba4a0680017030860fe14d15

Merge branch 'master' into gmscore_optional_libs

GmsCore/Android.mk

diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
index ed13290..8bdc8b3 100644
--- a/GmsCore/Android.mk
+++ b/GmsCore/Android.mk
@@ -32,6 +32,6 @@
 LOCAL_REQUIRED_MODULES := privapp-permissions-com.google.android.gms.xml default-permissions-com.google.android.gms.xml sysconfig-com.google.android.gms.xml
 LOCAL_PRODUCT_MODULE := true
 LOCAL_USES_LIBRARIES := com.android.location.provider
-LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions, androidx.window.sidecar
+LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions androidx.window.sidecar
 include $(BUILD_PREBUILT)
 

GmsCore/privapp-permissions-com.google.android.gms.xml

diff --git a/GmsCore/privapp-permissions-com.google.android.gms.xml b/GmsCore/privapp-permissions-com.google.android.gms.xml
index 33b9554..aa04b4e 100644
--- a/GmsCore/privapp-permissions-com.google.android.gms.xml
+++ b/GmsCore/privapp-permissions-com.google.android.gms.xml
@@ -7,5 +7,6 @@
         <permission name="android.permission.INSTALL_LOCATION_PROVIDER"/>
         <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
         <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
+        <permission name="android.permission.MANAGE_USB"/>
     </privapp-permissions>
 </permissions>