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

Merge "Fix issue #123661517: API Review: packageType"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-12 13:48:53 +00:00
committed by Android (Google) Code Review
parent 8bf530ae17 1666882e92
commit 5e91c8f1e3
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/attrs_manifest.xml
View File

@@ -1996,7 +1996,9 @@
{@link #AndroidManifestApplication application} tag. -->
<declare-styleable name="AndroidManifestUsesPackage" parent="AndroidManifestApplication">
<!-- Required type of association with the package, for example "android.package.ad_service"
if it provides an advertising service. -->
if it provides an advertising service. This should use the standard scoped naming
convention as used for other things such as package names, based on the Java naming
convention. -->
<attr name="packageType" format="string" />
<!-- Required name of the package you use. -->
<attr name="name" />

8
services/core/java/com/android/server/am/ServiceRecord.java
View File

@@ -519,10 +519,10 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
public void setProcess(ProcessRecord _proc) {
app = _proc;
if (pendingConnectionGroup > 0) {
app.connectionService = this;
app.connectionGroup = pendingConnectionGroup;
app.connectionImportance = pendingConnectionImportance;
if (pendingConnectionGroup > 0 && _proc != null) {
_proc.connectionService = this;
_proc.connectionGroup = pendingConnectionGroup;
_proc.connectionImportance = pendingConnectionImportance;
pendingConnectionGroup = pendingConnectionImportance = 0;
}
if (ActivityManagerService.TRACK_PROCSTATS_ASSOCIATIONS) {