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

Commit 5b39a511 authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

Merge "Dump overlay configurations to the bugreport"

parents 335d2c57 5487d16c

core/java/com/android/internal/content/om/OverlayConfig.java

+21 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.pm.parsing.ParsingPackageRead; 
import android.os.Build;

import android.os.Trace;

import android.util.ArrayMap;

import android.util.IndentingPrintWriter;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;
@@ -32,6 +33,7 @@ import com.android.internal.content.om.OverlayScanner.ParsedOverlayInfo; 
import com.android.internal.util.Preconditions;



import java.io.File;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Comparator;
@@ -397,6 +399,25 @@ public class OverlayConfig { 
        return idmapPaths.toArray(new String[0]);

    }



    /** Dump all overlay configurations to the Printer. */

    public void dump(@NonNull PrintWriter writer) {

        final IndentingPrintWriter ipw = new IndentingPrintWriter(writer);

        ipw.println("Overlay configurations:");

        ipw.increaseIndent();



        final ArrayList<Configuration> configurations = new ArrayList<>(mConfigurations.values());

        configurations.sort(Comparator.comparingInt(o -> o.configIndex));

        for (int i = 0; i < configurations.size(); i++) {

            final Configuration configuration = configurations.get(i);

            ipw.print(configuration.configIndex);

            ipw.print(", ");

            ipw.print(configuration.parsedConfig);

            ipw.println();

        }

        ipw.decreaseIndent();

        ipw.println();

    }



    /**

     * For each overlay APK, this creates the idmap file that allows the overlay to override the

     * target package.

services/core/java/com/android/server/om/OverlayManagerServiceImpl.java

+5 −0
Original line number Diff line number Diff line
@@ -719,6 +719,11 @@ final class OverlayManagerServiceImpl { 
        if (overlayIdmap == null) {

            pw.println("Default overlays: " + TextUtils.join(";", mDefaultOverlays));

        }



        // overlay configurations

        if (dumpState.getPackageName() == null) {

            mOverlayConfig.dump(pw);

        }

    }



    @NonNull String[] getDefaultOverlayPackages() {