From 1be5354aba7fdcb877125731a05debe35b39114f Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Fri, 28 Apr 2017 13:36:00 -0700 Subject: Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo targetProcess -> targetProcesses Test: bit CtsAppTestCases:InstrumentationTest Change-Id: I859985c689cc588c585cd0ec6e0a20411493a7c0 --- api/current.txt | 4 ++-- api/system-current.txt | 4 ++-- api/test-current.txt | 4 ++-- core/java/android/content/pm/InstrumentationInfo.java | 9 ++++----- core/java/android/content/pm/PackageParser.java | 8 ++++---- core/res/res/values/attrs_manifest.xml | 4 ++-- core/res/res/values/public.xml | 2 +- .../core/java/com/android/server/am/ActivityManagerService.java | 6 +++--- .../src/com/android/server/pm/PackageParserTest.java | 3 +-- 9 files changed, 21 insertions(+), 23 deletions(-) diff --git a/api/current.txt b/api/current.txt index 0586d3504856..d73590524efa 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1296,7 +1296,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 targetProcesses = 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 @@ -10319,7 +10319,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; + field public java.lang.String targetProcesses; } public class LabeledIntent extends android.content.Intent { diff --git a/api/system-current.txt b/api/system-current.txt index 792796bfc94e..b5550d5f7137 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1422,7 +1422,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 targetProcesses = 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 @@ -10980,7 +10980,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; + field public java.lang.String targetProcesses; } public final class IntentFilterVerificationInfo implements android.os.Parcelable { diff --git a/api/test-current.txt b/api/test-current.txt index 65e3dc21f2ff..4eebaffbd850 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1296,7 +1296,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 targetProcesses = 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 @@ -10355,7 +10355,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; + field public java.lang.String targetProcesses; } public class LabeledIntent extends android.content.Intent { diff --git a/core/java/android/content/pm/InstrumentationInfo.java b/core/java/android/content/pm/InstrumentationInfo.java index f6f1be63baee..3faa9517d17a 100644 --- a/core/java/android/content/pm/InstrumentationInfo.java +++ b/core/java/android/content/pm/InstrumentationInfo.java @@ -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(); diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index a05f11b1953c..766eab9dac4d 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -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(); } } diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 95ba94209343..c88367476984 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -897,7 +897,7 @@ will run against. If not specified, only 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. --> - + - + diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index e13026b1360e..1fbcac247ac9 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2778,7 +2778,7 @@ - + diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index cabaebd43e46..71ef23028651 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -19719,12 +19719,12 @@ public class ActivityManagerService extends IActivityManager.Stub ActiveInstrumentation activeInstr = new ActiveInstrumentation(this); activeInstr.mClass = className; String defProcess = ai.processName;; - if (ii.targetProcess == null) { + if (ii.targetProcesses == null) { activeInstr.mTargetProcesses = new String[]{ai.processName}; - } else if (ii.targetProcess.equals("*")) { + } else if (ii.targetProcesses.equals("*")) { activeInstr.mTargetProcesses = new String[0]; } else { - activeInstr.mTargetProcesses = ii.targetProcess.split(","); + activeInstr.mTargetProcesses = ii.targetProcesses.split(","); defProcess = activeInstr.mTargetProcesses[0]; } activeInstr.mTargetInfo = ai; diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java index d8db3315d423..1284b1b5bf24 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java @@ -15,7 +15,6 @@ */ package com.android.server.pm; -import android.annotation.TestApi; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.ConfigurationInfo; @@ -338,7 +337,7 @@ public class PackageParserTest { // Sanity check for InstrumentationInfo. assertEquals(a.info.targetPackage, b.info.targetPackage); - assertEquals(a.info.targetProcess, b.info.targetProcess); + assertEquals(a.info.targetProcesses, b.info.targetProcesses); assertEquals(a.info.sourceDir, b.info.sourceDir); assertEquals(a.info.publicSourceDir, b.info.publicSourceDir); } -- cgit v1.2.3-59-g8ed1b