Merge "Make resources APIs visible for synthetic bench"

This commit is contained in:
Ryan Mitchell
2020-08-07 22:53:48 +00:00
committed by Android (Google) Code Review
2 changed files with 7 additions and 3 deletions

View File

@@ -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);
}

View File

@@ -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;