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

quickstep/AndroidManifest.xml

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index d531a46..02b4379 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -36,13 +36,8 @@
         android:restoreAnyVersion="true"
         android:supportsRtl="true" >
 
-        <service
-            android:name="com.android.quickstep.TouchInteractionService"
-            android:permission="android.permission.STATUS_BAR_SERVICE" >
-            <intent-filter>
-                <action android:name="android.intent.action.QUICKSTEP_SERVICE" />
-            </intent-filter>
-        </service>
+        <service android:name="com.android.quickstep.TouchInteractionService"
+            android:exported="true" />
 
         <!-- STOPSHIP: Change exported to false once all the integration is complete.
         It is set to true so that the activity can be started from command line -->