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

Commit 5e91c8f1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 8bf530ae 1666882e

core/res/res/values/attrs_manifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -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" />

services/core/java/com/android/server/am/ServiceRecord.java

+4 −4
Original line number Diff line number Diff line
@@ -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) {