Fixed camera-testing compatibility issues to the Android 12
This is synced from ag/13402743,
also solve the merge conflict in aosp/1653830
Test: ./gradlew bOS
Change-Id: I9f29c9be63ea022643cb77408203dd6b143ff139
diff --git a/camera/camera-testing/src/main/AndroidManifest.xml b/camera/camera-testing/src/main/AndroidManifest.xml
index 0710da9..20e22e1 100644
--- a/camera/camera-testing/src/main/AndroidManifest.xml
+++ b/camera/camera-testing/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.camera.testing">
-
+ <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
<application>
<activity
android:name="androidx.camera.testing.activity.ForegroundTestActivity"
diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/CoreAppTestUtil.java b/camera/camera-testing/src/main/java/androidx/camera/testing/CoreAppTestUtil.java
index 7ec3ed7..d1b6cb9e 100644
--- a/camera/camera-testing/src/main/java/androidx/camera/testing/CoreAppTestUtil.java
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/CoreAppTestUtil.java
@@ -80,6 +80,7 @@
* Clean up the device UI and back to the home screen for test.
* @param instrumentation the instrumentation used to run the test
*/
+ @SuppressWarnings("deprecation")
public static void clearDeviceUI(@NonNull Instrumentation instrumentation) {
UiDevice device = UiDevice.getInstance(instrumentation);
// On some devices, its necessary to wake up the device before attempting unlock, otherwise
