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

Commit 5ec3d18e authored by Felipe Leme's avatar Felipe Leme Committed by Automerger Merge Worker
Browse files

Merge "Add AdServicesManagerService to system_server_dumper" into udc-dev am:... 

Merge "Add AdServicesManagerService to system_server_dumper" into udc-dev am: 297366d0 am: 81c83ddd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23006465



Change-Id: Ic5788ff1ed656f0382b1cbf0fb36d037d3d7d1c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dfef51b2 81c83ddd

services/java/com/android/server/SystemServer.java

+6 −2
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ public final class SystemServer implements Dumpable { 
                    final String name = args[1];

                    final Dumpable dumpable = mDumpables.get(name);

                    if (dumpable == null) {

                        pw.printf("No dummpable named %s\n", name);

                        pw.printf("No dumpable named %s\n", name);

                        return;

                    }
@@ -2644,7 +2644,11 @@ public final class SystemServer implements Dumpable { 


        // AdServicesManagerService (PP API service)

        t.traceBegin("StartAdServicesManagerService");

        mSystemServiceManager.startService(AD_SERVICES_MANAGER_SERVICE_CLASS);

        SystemService adServices = mSystemServiceManager

                .startService(AD_SERVICES_MANAGER_SERVICE_CLASS);

        if (adServices instanceof Dumpable) {

            mDumper.addDumpable((Dumpable) adServices);

        }

        t.traceEnd();



        // OnDevicePersonalizationSystemService