commit 6cf6dd8bced42e04c3981bd6e4431021c671faa6
author Jonathan Miranda <jonmiranda@google.com> Tue Mar 27 00:10:24 2018 +0000
committer Jon <jonmiranda@google.com> Mon Mar 26 20:12:04 2018 -0400
tree 8d3abab696dfd102cf2f9096dda0577a20e9e72e
parent 3f7df53dda43d05c7a40ed8c4114b63189936ffe

Revert "Merge branch 'ub-launcher3-master' into pi-dev"

Original CL loses the commit history. I believe this is due to doing the merge on master and cherry picking to pi-dev. Tested locally that reverting this results in no conflicts when doing the merge properly on pi-dev.

This reverts commit 3f7df53dda43d05c7a40ed8c4114b63189936ffe.

Bug: 74794600
Test: manual test
Change-Id: I58f3bb1bd5ce789be380bac9716efd2627a90f92

AndroidManifest-common.xml

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index c24850d..bb03f50 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -87,11 +87,9 @@
             android:process=":wallpaper_chooser"
             android:permission="android.permission.BIND_JOB_SERVICE" />
 
-        <service
-            android:name="com.android.launcher3.notification.NotificationListener"
-            android:label="@string/icon_badging_service_title"
-            android:enabled="@bool/notification_badging_enabled"
-            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+        <service android:name="com.android.launcher3.notification.NotificationListener"
+                 android:enabled="@bool/notification_badging_enabled"
+                 android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
             </intent-filter>