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

Commit dc9c8033 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Android (Google) Code Review
Browse files

Merge "Make resources APIs visible for synthetic bench"

parents e15f8d66 327747f2

core/java/android/app/ResourcesManager.java

+2 −1
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ public class ResourcesManager { 
        }

    }



    DisplayMetrics getDisplayMetrics() {

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public DisplayMetrics getDisplayMetrics() {

        return getDisplayMetrics(Display.DEFAULT_DISPLAY,

                DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS);

    }

core/java/android/content/res/XmlBlock.java

+5 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.Nullable; 
import android.compat.annotation.UnsupportedAppUsage;

import android.util.TypedValue;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.XmlUtils;



import dalvik.annotation.optimization.FastNative;
@@ -38,7 +39,8 @@ import java.io.Reader; 
 * 

 * {@hide}

 */

final class XmlBlock implements AutoCloseable {

@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

public final class XmlBlock implements AutoCloseable {

    private static final boolean DEBUG=false;



    @UnsupportedAppUsage
@@ -88,7 +90,8 @@ final class XmlBlock implements AutoCloseable { 
        }

    }



    /*package*/ final class Parser implements XmlResourceParser {

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public final class Parser implements XmlResourceParser {

        Parser(long parseState, XmlBlock block) {

            mParseState = parseState;

            mBlock = block;