Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34217511 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Rename ActivityMonitor.onMatchIntent to onStartActivity. 

Fixes: 37672383
Test: cts-tradefed run singleCommand cts-dev --module CtsAppTestCases -t \
      android.app.cts.Instrumentation_ActivityMonitorTest

Change-Id: Ic3fdba576232f0a05454dde8ea482ea714aeee3d
parent fc533da9

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4954,7 +4954,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);

  }

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5133,7 +5133,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);

  }

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4967,7 +4967,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);

  }

core/java/android/app/Instrumentation.java

+10 −10
Original line number Diff line number Diff line
@@ -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++;