commit 23c76e38ef2a62a996dbb304c558c80b3fee5f28
author Jim Miller <jaggies@google.com> Fri Aug 15 21:36:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 15 21:23:40 2014 +0000
tree 6f1849018c2e7d96bfe4a0343f135c98911df71e
parent 4325f8080888bd3b15246f5bbd9db878aced030c
parent 6a0c89743c82684d25a6c418c3fe38aa0cf3ca0a

Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5007c3a..27738c3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1116,11 +1116,6 @@
                 <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <!-- TODO: Remove this once new API is being used -->
-            <intent-filter android:priority="1000">
-                <action android:name="android.intent.action.CONFIRM_DEVICE_CREDENTIAL" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
 
         <activity android:name=".notification.RedactionInterstitial" />