am 248e9eff: am 0b4e4fb1: am 23c76e38: Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev

* commit '248e9eff3d95806a0062a17bf78cf11e575f2fa6':
  Remove temporary workaround for GMS TrustAgent while API changed.
This commit is contained in:
Jim Miller
2014-08-16 00:43:56 +00:00
committed by Android Git Automerger

View File

@@ -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" />