Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sudheer Shanka
2017-04-27 20:47:04 +00:00
committed by Android (Google) Code Review
parent d08c064976 34217511bc
commit 7e7f7d526d
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -4955,7 +4955,7 @@ package android.app {
method public final android.app.Activity getLastActivity();
method public final android.app.Instrumentation.ActivityResult getResult();
method public final boolean isBlocking();
method public android.app.Instrumentation.ActivityResult onMatchIntent(android.content.Intent);
method public android.app.Instrumentation.ActivityResult onStartActivity(android.content.Intent);
method public final android.app.Activity waitForActivity();
method public final android.app.Activity waitForActivityWithTimeout(long);
}

2
api/system-current.txt
View File

@@ -5135,7 +5135,7 @@ package android.app {
method public final android.app.Activity getLastActivity();
method public final android.app.Instrumentation.ActivityResult getResult();
method public final boolean isBlocking();
method public android.app.Instrumentation.ActivityResult onMatchIntent(android.content.Intent);
method public android.app.Instrumentation.ActivityResult onStartActivity(android.content.Intent);
method public final android.app.Activity waitForActivity();
method public final android.app.Activity waitForActivityWithTimeout(long);
}

2
api/test-current.txt
View File

@@ -4968,7 +4968,7 @@ package android.app {
method public final android.app.Activity getLastActivity();
method public final android.app.Instrumentation.ActivityResult getResult();
method public final boolean isBlocking();
method public android.app.Instrumentation.ActivityResult onMatchIntent(android.content.Intent);
method public android.app.Instrumentation.ActivityResult onStartActivity(android.content.Intent);
method public final android.app.Activity waitForActivity();
method public final android.app.Activity waitForActivityWithTimeout(long);
}

20
core/java/android/app/Instrumentation.java
View File

@@ -543,10 +543,10 @@ public class Instrumentation {
* Create a new ActivityMonitor that can be used for intercepting any activity to be
* started.
*
* <p> When an activity is started, {@link #onMatchIntent(Intent)} will be called on
* <p> When an activity is started, {@link #onStartActivity(Intent)} will be called on
* instances created using this constructor to see if it is a hit.
*
* @see #onMatchIntent(Intent)
* @see #onStartActivity(Intent)
*/
public ActivityMonitor() {
mWhich = null;
@@ -558,7 +558,7 @@ public class Instrumentation {
/**
* @return true if this monitor is used for intercepting any started activity by calling
* into {@link #onMatchIntent(Intent)}, false if this monitor is only used
* into {@link #onStartActivity(Intent)}, false if this monitor is only used
* for specific intents corresponding to the intent filter or activity class
* passed in the constructor.
*/
@@ -665,7 +665,7 @@ public class Instrumentation {
* @param intent The intent used for starting the activity.
* @return The {@link ActivityResult} that needs to be used in case of a match.
*/
public ActivityResult onMatchIntent(Intent intent) {
public ActivityResult onStartActivity(Intent intent) {
return null;
}
@@ -1589,7 +1589,7 @@ public class Instrumentation {
final ActivityMonitor am = mActivityMonitors.get(i);
ActivityResult result = null;
if (am.ignoreMatchingSpecificIntents()) {
result = am.onMatchIntent(intent);
result = am.onStartActivity(intent);
}
if (result != null) {
am.mHits++;
@@ -1652,7 +1652,7 @@ public class Instrumentation {
final ActivityMonitor am = mActivityMonitors.get(i);
ActivityResult result = null;
if (am.ignoreMatchingSpecificIntents()) {
result = am.onMatchIntent(intents[0]);
result = am.onStartActivity(intents[0]);
}
if (result != null) {
am.mHits++;
@@ -1722,7 +1722,7 @@ public class Instrumentation {
final ActivityMonitor am = mActivityMonitors.get(i);
ActivityResult result = null;
if (am.ignoreMatchingSpecificIntents()) {
result = am.onMatchIntent(intent);
result = am.onStartActivity(intent);
}
if (result != null) {
am.mHits++;
@@ -1789,7 +1789,7 @@ public class Instrumentation {
final ActivityMonitor am = mActivityMonitors.get(i);
ActivityResult result = null;
if (am.ignoreMatchingSpecificIntents()) {
result = am.onMatchIntent(intent);
result = am.onStartActivity(intent);
}
if (result != null) {
am.mHits++;
@@ -1835,7 +1835,7 @@ public class Instrumentation {
final ActivityMonitor am = mActivityMonitors.get(i);
ActivityResult result = null;
if (am.ignoreMatchingSpecificIntents()) {
result = am.onMatchIntent(intent);
result = am.onStartActivity(intent);
}
if (result != null) {
am.mHits++;
@@ -1880,7 +1880,7 @@ public class Instrumentation {
final ActivityMonitor am = mActivityMonitors.get(i);
ActivityResult result = null;
if (am.ignoreMatchingSpecificIntents()) {
result = am.onMatchIntent(intent);
result = am.onStartActivity(intent);
}
if (result != null) {
am.mHits++;