commit 9296530729ba5ad0d0c2567f404e7042186f8685
author Xin Li <delphij@google.com> Tue Dec 08 23:49:45 2020 -0800
committer Xin Li <delphij@google.com> Tue Dec 08 23:49:45 2020 -0800
tree 3f3d638d2ae525d9ec03962891c4b6878b492b3d
parent 19d1b1f25539440640e87f5ffcbeef78b252f7c4
parent 5d18121d018ffde17420e5e9f91513c30abd20c5

DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ic0e9d890e2493c75183ef908e1ed68fe06301593
Change-Id: I773f39739643fafa8ac3cad91cc2c90ef0aa7125

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 14bbcb5..b8d34d2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     package="android.ext.services"
-    android:versionCode="300900700"
-    android:versionName="r_aml_300900700"
+    android:versionCode="300000000"
+    android:versionName="2019-09"
     coreApp="true">
 
     <uses-permission android:name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE" />

src/android/ext/services/notification/Assistant.java

diff --git a/src/android/ext/services/notification/Assistant.java b/src/android/ext/services/notification/Assistant.java
index dd5d1fd..721558b 100644
--- a/src/android/ext/services/notification/Assistant.java
+++ b/src/android/ext/services/notification/Assistant.java
@@ -187,7 +187,7 @@
             mLiveNotifications.remove(sbn.getKey());
 
         } catch (Throwable e) {
-            Log.e(TAG, "Error occurred processing removal of " + sbn, e);
+            Log.e(TAG, "Error occurred processing removal of " + sbn.getKey(), e);
         }
     }