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

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

Merge "Keep DesktopExperienceFlags on Ravenwood." into main

parents 9b8e4b49 4e1f8202

core/java/android/window/DesktopExperienceFlags.java

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.Nullable; 
import android.app.ActivityThread;

import android.content.Context;

import android.os.SystemProperties;

import android.ravenwood.annotation.RavenwoodKeepWholeClass;

import android.util.ArrayMap;

import android.util.Log;
@@ -51,6 +52,7 @@ import java.util.function.BooleanSupplier; 
 *

 * @hide

 */

@RavenwoodKeepWholeClass

public enum DesktopExperienceFlags {

    // go/keep-sorted start

    BASE_DENSITY_FOR_EXTERNAL_DISPLAYS(

core/tests/coretests/src/android/graphics/drawable/IconTest.java

+0 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ public class IconTest { 
    }



    @Test

    @DisabledOnRavenwood(blockedBy = DesktopExperienceFlags.class)

    public void testParcel() throws Exception {

        final Bitmap originalbits = ((BitmapDrawable) getContext().getDrawable(R.drawable.landscape))

                .getBitmap();

ravenwood/texts/ravenwood-annotation-allowed-classes.txt

+2 −0
Original line number Diff line number Diff line
@@ -583,6 +583,8 @@ android.view.InflateException 


android.view.inputmethod.InputBinding



android.window.DesktopExperienceFlags



com.android.internal.display.BrightnessSynchronizer



com.android.internal.graphics.ColorUtils