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

This commit is contained in:
Jim Miller
2014-08-15 21:36:38 +00:00
committed by Android (Google) Code Review

View File

@@ -1116,11 +1116,6 @@
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" /> <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </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>
<activity android:name=".notification.RedactionInterstitial" /> <activity android:name=".notification.RedactionInterstitial" />