commit bea563f4ce3140f266799f3f789daf75132de3e8
author Xin Li <delphij@google.com> Wed Oct 06 22:55:15 2021 +0000
committer Xin Li <delphij@google.com> Wed Oct 06 22:55:15 2021 +0000
tree dba26166b2efbc32038e86e9e7f8114266ff7ceb
parent 1deacf3c1aed56bde78450aa089e86c4143c393f
parent 2056616b04aa206e7acd1198991a8acbf71553e4

Merge Android 12

Bug: 202323961
Merged-In: I4420cc393dd51b2e8e95e492fb384ce79fd973f7
Change-Id: Ia3c4e60a8f275156ba25a9f27cdf513ffda5de61

crashtest/AndroidManifest.xml

diff --git a/crashtest/AndroidManifest.xml b/crashtest/AndroidManifest.xml
index e002d95..032198c 100644
--- a/crashtest/AndroidManifest.xml
+++ b/crashtest/AndroidManifest.xml
@@ -23,6 +23,12 @@
         android:process=":CrashTest" />
     <service android:name="com.android.nn.crashtest.core.InProcessCrashTestService"
         android:process=".CrashTest" />
+    <!--provider entry is a workaround for b/195309961-->
+    <provider
+            xmlns:tools="http://schemas.android.com/tools"
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="com.google.android.storagemanager.androidx-startup"
+            tools:replace="android:authorities" />
   </application>
 
   <uses-sdk android:minSdkVersion="27" />

dogfood/AndroidManifest.xml

diff --git a/dogfood/AndroidManifest.xml b/dogfood/AndroidManifest.xml
index 5573e52..c45bda3 100644
--- a/dogfood/AndroidManifest.xml
+++ b/dogfood/AndroidManifest.xml
@@ -25,6 +25,12 @@
 	android:permission="android.permission.BIND_JOB_SERVICE" >
 
     </service>
+    <!--provider entry is a workaround for b/195309961-->
+    <provider
+            xmlns:tools="http://schemas.android.com/tools"
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="com.google.android.storagemanager.androidx-startup"
+            tools:replace="android:authorities" />
   </application>
 
 </manifest>

dogfood/src/com/android/nn/dogfood/BenchmarkJobService.java

diff --git a/dogfood/src/com/android/nn/dogfood/BenchmarkJobService.java b/dogfood/src/com/android/nn/dogfood/BenchmarkJobService.java
index 6789954..3811222 100644
--- a/dogfood/src/com/android/nn/dogfood/BenchmarkJobService.java
+++ b/dogfood/src/com/android/nn/dogfood/BenchmarkJobService.java
@@ -123,7 +123,7 @@
         mNotificationManager = NotificationManagerCompat.from(this);
         NotificationChannel channel =
                 new NotificationChannel(CHANNEL_ID, "Default", NotificationManager.IMPORTANCE_LOW);
-        mNotificationManager.createNotificationChannel(channel);
+        // mNotificationManager.createNotificationChannel(channel);
         mNotificationManager = NotificationManagerCompat.from(this);
         String title = "NN API Dogfood";
         String msg = String.format("Background test %d of %d is running", getNumRuns(), NUM_RUNS);