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

Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev am: fb5840b0e6

Browse Source 
am: 0ef4ea95f2

Change-Id: Ib196133e3affc2a9adc8bb66ffdf7dbf0792d307
This commit is contained in:
Dianne Hackborn
2017-04-28 22:52:35 +00:00
committed by android-build-merger
parent 2c23b505c8 0ef4ea95f2
commit fcab4e793b
9 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/content/pm/InstrumentationInfo.java
View File

@@ -19,7 +19,6 @@ package android.content.pm;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.SparseArray;
import android.util.SparseIntArray;
/**
* Information you can retrieve about a particular piece of test
@@ -38,7 +37,7 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable {
* runs in the main process of the targetPackage. Can either be a comma-separated list
* of process names or '*' for any process that launches to run targetPackage code.
*/
public String targetProcess;
public String targetProcesses;
/**
* Full path to the base APK for this application.
@@ -122,7 +121,7 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable {
public InstrumentationInfo(InstrumentationInfo orig) {
super(orig);
targetPackage = orig.targetPackage;
targetProcess = orig.targetProcess;
targetProcesses = orig.targetProcesses;
sourceDir = orig.sourceDir;
publicSourceDir = orig.publicSourceDir;
splitNames = orig.splitNames;
@@ -151,7 +150,7 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable {
public void writeToParcel(Parcel dest, int parcelableFlags) {
super.writeToParcel(dest, parcelableFlags);
dest.writeString(targetPackage);
dest.writeString(targetProcess);
dest.writeString(targetProcesses);
dest.writeString(sourceDir);
dest.writeString(publicSourceDir);
dest.writeStringArray(splitNames);
@@ -181,7 +180,7 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable {
private InstrumentationInfo(Parcel source) {
super(source);
targetPackage = source.readString();
targetProcess = source.readString();
targetProcesses = source.readString();
sourceDir = source.readString();
publicSourceDir = source.readString();
splitNames = source.readStringArray();

8
core/java/android/content/pm/PackageParser.java
View File

@@ -3300,8 +3300,8 @@ public class PackageParser {
a.info.targetPackage = str != null ? str.intern() : null;
str = sa.getNonResourceString(
com.android.internal.R.styleable.AndroidManifestInstrumentation_targetProcess);
a.info.targetProcess = str != null ? str.intern() : null;
com.android.internal.R.styleable.AndroidManifestInstrumentation_targetProcesses);
a.info.targetProcesses = str != null ? str.intern() : null;
a.info.handleProfiling = sa.getBoolean(
com.android.internal.R.styleable.AndroidManifestInstrumentation_handleProfiling,
@@ -7237,8 +7237,8 @@ public class PackageParser {
info.targetPackage = info.targetPackage.intern();
}
if (info.targetProcess != null) {
info.targetProcess = info.targetProcess.intern();
if (info.targetProcesses != null) {
info.targetProcesses = info.targetProcesses.intern();
}
}