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

Commit 34041735 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Implement issue #30977956: Enable Instrumentation tests for multi-process apps 

New android:targetProcess attribute on <instrumentation> allows you to
specify the processes the instrumentation will run in.

This reworks how instrumentation is run in the activity manager to better
formalize its state and semantics, allowing us to keep track of it across
multiple processes.  This also clearly defines what happens when multiple
instrumentations are running at the same time, which is useful for writing
CTS tests that test the instrumentation APIs themselves.

Adds a couple new APIs to Instrumentation that helps with the new
situation where instrumentation can run concurrently in multiple processes.

Test: new CTS tests added (textXxxProcessInstrumentation in
ActivityManagerTest.java in cts/tests/app/src)

Change-Id: I2811e6c75bc98d4856045b2f0a45fb24af5d366f
parent 7b6bcb60

api/current.txt

+4 −1
Original line number Diff line number Diff line
@@ -203,7 +203,6 @@ package android { 














  public static final class R.attr {















    ctor public R.attr();













    field public static final int __removed0 = 16844097; // 0x1010541















    field public static final int __removed1 = 16844099; // 0x1010543















    field public static final int absListViewStyle = 16842858; // 0x101006a















    field public static final int accessibilityEventTypes = 16843648; // 0x1010380










@@ -1270,6 +1269,7 @@ package android {













    field public static final int targetId = 16843740; // 0x10103dc















    field public static final int targetName = 16843853; // 0x101044d















    field public static final int targetPackage = 16842785; // 0x1010021













    field public static final int targetProcess = 16844097; // 0x1010541















    field public static final int targetSandboxVersion = 16844110; // 0x101054e















    field public static final int targetSdkVersion = 16843376; // 0x1010270















    field public static final int taskAffinity = 16842770; // 0x1010012










@@ -4804,6 +4804,7 @@ package android.app {













    method public void addMonitor(android.app.Instrumentation.ActivityMonitor);















    method public android.app.Instrumentation.ActivityMonitor addMonitor(android.content.IntentFilter, android.app.Instrumentation.ActivityResult, boolean);















    method public android.app.Instrumentation.ActivityMonitor addMonitor(java.lang.String, android.app.Instrumentation.ActivityResult, boolean);













    method public void addResults(android.os.Bundle);















    method public void callActivityOnCreate(android.app.Activity, android.os.Bundle);















    method public void callActivityOnCreate(android.app.Activity, android.os.Bundle, android.os.PersistableBundle);















    method public void callActivityOnDestroy(android.app.Activity);









@@ -4828,6 +4829,7 @@ package android.app {













    method public android.os.Bundle getBinderCounts();















    method public android.content.ComponentName getComponentName();















    method public android.content.Context getContext();













    method public java.lang.String getProcessName();















    method public android.content.Context getTargetContext();















    method public android.app.UiAutomation getUiAutomation();















    method public android.app.UiAutomation getUiAutomation(int);










@@ -9903,6 +9905,7 @@ package android.content.pm {













    field public java.lang.String[] splitPublicSourceDirs;















    field public java.lang.String[] splitSourceDirs;















    field public java.lang.String targetPackage;













    field public java.lang.String targetProcess;















  }





























  public class LabeledIntent extends android.content.Intent {

























api/system-current.txt



+4
−1




























Original line number
Diff line number
Diff line








@@ -315,7 +315,6 @@ package android {



























  public static final class R.attr {















    ctor public R.attr();













    field public static final int __removed0 = 16844097; // 0x1010541















    field public static final int __removed1 = 16844099; // 0x1010543















    field public static final int absListViewStyle = 16842858; // 0x101006a















    field public static final int accessibilityEventTypes = 16843648; // 0x1010380










@@ -1386,6 +1385,7 @@ package android {













    field public static final int targetId = 16843740; // 0x10103dc















    field public static final int targetName = 16843853; // 0x101044d















    field public static final int targetPackage = 16842785; // 0x1010021













    field public static final int targetProcess = 16844097; // 0x1010541















    field public static final int targetSandboxVersion = 16844110; // 0x101054e















    field public static final int targetSdkVersion = 16843376; // 0x1010270















    field public static final int taskAffinity = 16842770; // 0x1010012










@@ -4964,6 +4964,7 @@ package android.app {













    method public void addMonitor(android.app.Instrumentation.ActivityMonitor);















    method public android.app.Instrumentation.ActivityMonitor addMonitor(android.content.IntentFilter, android.app.Instrumentation.ActivityResult, boolean);















    method public android.app.Instrumentation.ActivityMonitor addMonitor(java.lang.String, android.app.Instrumentation.ActivityResult, boolean);













    method public void addResults(android.os.Bundle);















    method public void callActivityOnCreate(android.app.Activity, android.os.Bundle);















    method public void callActivityOnCreate(android.app.Activity, android.os.Bundle, android.os.PersistableBundle);















    method public void callActivityOnDestroy(android.app.Activity);









@@ -4988,6 +4989,7 @@ package android.app {













    method public android.os.Bundle getBinderCounts();















    method public android.content.ComponentName getComponentName();















    method public android.content.Context getContext();













    method public java.lang.String getProcessName();















    method public android.content.Context getTargetContext();















    method public android.app.UiAutomation getUiAutomation();















    method public android.app.UiAutomation getUiAutomation(int);










@@ -10358,6 +10360,7 @@ package android.content.pm {













    field public java.lang.String[] splitPublicSourceDirs;















    field public java.lang.String[] splitSourceDirs;















    field public java.lang.String targetPackage;













    field public java.lang.String targetProcess;















  }





























  public final class IntentFilterVerificationInfo implements android.os.Parcelable {

























api/test-current.txt



+4
−1




























Original line number
Diff line number
Diff line








@@ -203,7 +203,6 @@ package android {



























  public static final class R.attr {















    ctor public R.attr();













    field public static final int __removed0 = 16844097; // 0x1010541















    field public static final int __removed1 = 16844099; // 0x1010543















    field public static final int absListViewStyle = 16842858; // 0x101006a















    field public static final int accessibilityEventTypes = 16843648; // 0x1010380










@@ -1270,6 +1269,7 @@ package android {













    field public static final int targetId = 16843740; // 0x10103dc















    field public static final int targetName = 16843853; // 0x101044d















    field public static final int targetPackage = 16842785; // 0x1010021













    field public static final int targetProcess = 16844097; // 0x1010541















    field public static final int targetSandboxVersion = 16844110; // 0x101054e















    field public static final int targetSdkVersion = 16843376; // 0x1010270















    field public static final int taskAffinity = 16842770; // 0x1010012










@@ -4814,6 +4814,7 @@ package android.app {













    method public void addMonitor(android.app.Instrumentation.ActivityMonitor);















    method public android.app.Instrumentation.ActivityMonitor addMonitor(android.content.IntentFilter, android.app.Instrumentation.ActivityResult, boolean);















    method public android.app.Instrumentation.ActivityMonitor addMonitor(java.lang.String, android.app.Instrumentation.ActivityResult, boolean);













    method public void addResults(android.os.Bundle);















    method public void callActivityOnCreate(android.app.Activity, android.os.Bundle);















    method public void callActivityOnCreate(android.app.Activity, android.os.Bundle, android.os.PersistableBundle);















    method public void callActivityOnDestroy(android.app.Activity);









@@ -4838,6 +4839,7 @@ package android.app {













    method public android.os.Bundle getBinderCounts();















    method public android.content.ComponentName getComponentName();















    method public android.content.Context getContext();













    method public java.lang.String getProcessName();















    method public android.content.Context getTargetContext();















    method public android.app.UiAutomation getUiAutomation();















    method public android.app.UiAutomation getUiAutomation(int);










@@ -9931,6 +9933,7 @@ package android.content.pm {













    field public java.lang.String[] splitPublicSourceDirs;















    field public java.lang.String[] splitSourceDirs;















    field public java.lang.String targetPackage;













    field public java.lang.String targetProcess;















  }





























  public class LabeledIntent extends android.content.Intent {

























core/java/android/app/IActivityManager.aidl



+1
−0




























Original line number
Diff line number
Diff line








@@ -145,6 +145,7 @@ interface IActivityManager {













            int flags, in Bundle arguments, in IInstrumentationWatcher watcher,















            in IUiAutomationConnection connection, int userId,















            in String abiOverride);













    void addInstrumentationResults(in IApplicationThread target, in Bundle results);















    void finishInstrumentation(in IApplicationThread target, int resultCode,















            in Bundle results);















    /**

































core/java/android/app/Instrumentation.java



+28
−2




























Original line number
Diff line number
Diff line








@@ -187,10 +187,24 @@ public class Instrumentation {













        }















    }





























    /**













     * Report some results in the middle of instrumentation execution.  Later results (including













     * those provided by {@link #finish}) will be combined with {@link Bundle#putAll}.













     */













    public void addResults(Bundle results) {













        IActivityManager am = ActivityManager.getService();













        try {













            am.addInstrumentationResults(mThread.getApplicationThread(), results);













        } catch (RemoteException ex) {













            throw ex.rethrowFromSystemServer();













        }













    }





























    /**















     * Terminate instrumentation of the application.  This will cause the















     * application process to exit, removing this instrumentation from the next













     * time the application is started. 













     * time the application is started.  If multiple processes are currently running













     * for this instrumentation, all of those processes will be killed.















     *  















     * @param resultCode Overall success/failure of instrumentation. 















     * @param results Any results to send back to the code that started the 










@@ -277,6 +291,18 @@ public class Instrumentation {













        return mAppContext;















    }





























    /**













     * Return the name of the process this instrumentation is running in.  Note this should













     * only be used for testing and debugging.  If you are thinking about using this to,













     * for example, conditionalize what is initialized in an Application class, it is strongly













     * recommended to instead use lazy initialization (such as a getter for the state that













     * only creates it when requested).  This can greatly reduce the work your process does













     * when created for secondary things, such as to receive a broadcast.













     */













    public String getProcessName() {













        return mThread.getProcessName();













    }





























    /**















     * Check whether this instrumentation was started with profiling enabled.















     *