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

Commit 0831e452 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Ravenwood] Enable several hidden APIs and its tests" into main

parents af201dd3 64130047

core/java/android/app/ApplicationPackageManager.java

+8 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ import android.os.storage.VolumeInfo; 
import android.permission.PermissionControllerManager;

import android.permission.PermissionManager;

import android.provider.Settings;

import android.ravenwood.annotation.RavenwoodKeepPartialClass;

import android.ravenwood.annotation.RavenwoodReplace;

import android.system.ErrnoException;

import android.system.Os;

import android.system.OsConstants;
@@ -157,6 +159,7 @@ import java.util.function.Consumer; 
import java.util.function.Function;



/** @hide */

@RavenwoodKeepPartialClass

public class ApplicationPackageManager extends PackageManager {

    private static final String TAG = "ApplicationPackageManager";

    private static final boolean DEBUG_ICONS = false;
@@ -2163,6 +2166,7 @@ public class ApplicationPackageManager extends PackageManager { 
    }



    @UnsupportedAppUsage

    @RavenwoodReplace(reason = "<cinit> crashes due to unsupported class PropertyInvalidatedCache")

    static void configurationChanged() {

        synchronized (sSync) {

            sIconCache.clear();
@@ -2170,6 +2174,10 @@ public class ApplicationPackageManager extends PackageManager { 
        }

    }



    private static void configurationChanged$ravenwood() {

        /* no-op */

    }



    @UnsupportedAppUsage

    protected ApplicationPackageManager(ContextImpl context, IPackageManager pm) {

        mContext = context;

core/java/android/app/ResourcesManager.java

+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.LocaleList; 
import android.os.Process;

import android.os.Trace;

import android.ravenwood.annotation.RavenwoodKeepWholeClass;

import android.ravenwood.annotation.RavenwoodReplace;

import android.ravenwood.annotation.RavenwoodThrow;

import android.util.ArrayMap;

import android.util.ArraySet;
@@ -1409,6 +1410,7 @@ public class ResourcesManager { 
        return newKey;

    }



    @RavenwoodThrow(reason = "AppInfo update not supported")

    public void appendPendingAppInfoUpdate(@NonNull String[] oldSourceDirs,

            @NonNull ApplicationInfo appInfo) {

        synchronized (mLock) {
@@ -1427,6 +1429,7 @@ public class ResourcesManager { 
        }

    }



    @RavenwoodReplace(reason = "AppInfo update not supported")

    public final void applyAllPendingAppInfoUpdates() {

        synchronized (mLock) {

            if (mPendingAppInfoUpdates != null) {
@@ -1439,6 +1442,10 @@ public class ResourcesManager { 
        }

    }



    private void applyAllPendingAppInfoUpdates$ravenwood() {

        /* no-op */

    }



    public final boolean applyConfigurationToResources(@NonNull Configuration config,

            @Nullable CompatibilityInfo compat) {

        synchronized (mLock) {

core/java/android/content/res/CompatibilityInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Build; 
import android.os.Build.VERSION_CODES;

import android.os.Parcel;

import android.os.Parcelable;

import android.ravenwood.annotation.RavenwoodKeepWholeClass;

import android.util.DisplayMetrics;

import android.util.MergedConfiguration;

import android.view.InsetsSourceControl;
@@ -42,6 +43,7 @@ import android.view.WindowManager.LayoutParams; 
 * 

 *  {@hide} 

 */

@RavenwoodKeepWholeClass

public class CompatibilityInfo implements Parcelable {

    /** default compatibility info object for compatible applications */

    @UnsupportedAppUsage

core/java/android/content/res/Configuration.java

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import android.os.Build; 
import android.os.LocaleList;

import android.os.Parcel;

import android.os.Parcelable;

import android.ravenwood.annotation.RavenwoodKeepWholeClass;

import android.text.TextUtils;

import android.util.DisplayMetrics;

import android.util.Slog;
@@ -89,6 +90,7 @@ import java.util.Locale; 
 * with {@link android.app.Activity#getResources}:</p>

 * <pre>Configuration config = getResources().getConfiguration();</pre>

 */

@RavenwoodKeepWholeClass

public final class Configuration implements Parcelable, Comparable<Configuration> {

    /** @hide */

    public static final Configuration EMPTY = new Configuration();

core/java/android/content/res/ConfigurationBoundResourceCache.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.content.res; 


import android.compat.annotation.UnsupportedAppUsage;

import android.content.pm.ActivityInfo.Config;

import android.ravenwood.annotation.RavenwoodKeepWholeClass;



/**

 * A Cache class which can be used to cache resource objects that are easy to clone but more
@@ -25,6 +26,7 @@ import android.content.pm.ActivityInfo.Config; 
 *

 * @hide For internal use only.

 */

@RavenwoodKeepWholeClass

public class ConfigurationBoundResourceCache<T> extends ThemedResourceCache<ConstantState<T>> {



    @UnsupportedAppUsage