commit df22af326ebb0429d12dcdd9a5c52c3ad9a3ab36
author rishb <rishb@google.com> Wed May 06 13:07:37 2020 +0200
committer rishb <rishb@google.com> Fri May 08 15:30:59 2020 +0200
tree 9c5537d35138ab130a1e0134cfc134446fc9be29
parent f7a7ff442d1da56877898495cfb96bd78be98221

DO NOT MERGE Set queries to Manifest for Android 11's packages visibility update.

This is required to allow car usb handler to search for packages that
can handle the USB_DEVICE_ATTACHED intent.

Do not merge back to master because of failing automerge to master due
to differences in file formatting.

Bug: 155855863
Test: The Android Auto icon goes blue as soon as the MD device is
plugged in via USB.

Change-Id: I8cac885c382e4dba3aa606920b9e13fa9bb7e3f7

car-usb-handler/AndroidManifest.xml

diff --git a/car-usb-handler/AndroidManifest.xml b/car-usb-handler/AndroidManifest.xml
index caa93bd..bcd9975 100644
--- a/car-usb-handler/AndroidManifest.xml
+++ b/car-usb-handler/AndroidManifest.xml
@@ -14,22 +14,36 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-        package="android.car.usb.handler">
-    <uses-sdk android:minSdkVersion="25" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.MANAGE_USB" />
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher"
-                 android:directBootAware="true">
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+          package="android.car.usb.handler">
+    <uses-sdk
+        android:minSdkVersion="25"
+        android:targetSdkVersion="29"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <uses-permission android:name="android.permission.MANAGE_USB"/>
+    <uses-permission android:name="android.permission.MANAGE_USERS"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <!-- "queries" to specify what car-usb-handler will query for due to  Android 11's
+         package visibility update. -->
+    <queries>
+        <intent>
+            <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
+        </intent>
+    </queries>
+
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/ic_launcher"
+        android:directBootAware="true">
         <activity android:name=".UsbHostManagementActivity"
                   android:theme="@android:style/Theme.DeviceDefault.Dialog"
                   android:launchMode="standard">
             <meta-data
                 android:name="distractionOptimized"
-                android:value="true" />
+                android:value="true"/>
         </activity>
         <service android:name=".BootUsbService"
                  android:exported="false"
@@ -38,7 +52,7 @@
         <receiver android:name=".BootUsbScanner"
                   android:directBootAware="true">
             <intent-filter>
-                <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+                <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
     </application>