Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev

This commit is contained in:
Sudheer Shanka
2017-04-27 20:46:07 +00:00
committed by Android (Google) Code Review

View File

@@ -93,7 +93,7 @@ public class EncryptionInterstitialTest {
Intent mMatchedIntent = null;
@Override
public ActivityResult onMatchIntent(Intent intent) {
public ActivityResult onStartActivity(Intent intent) {
if ("test.unlock.intent".equals(intent.getAction())) {
mMatchedIntent = intent;
return new ActivityResult(Activity.RESULT_OK, null);