PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f64c5236c7

Change-Id: Id4d543b5ff4a8abbb0356b7cd97ffe99bdc6540a
This commit is contained in:
Sudheer Shanka
2017-04-28 00:05:53 +00:00
committed by android-build-merger
parent 6e4d02fa86 f64c5236c7
commit e3961b402a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/src/com/android/settings/EncryptionInterstitialTest.java
View File

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