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

Commit b62b7b72 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Revert submission 

Based on Forrest run with earlier base build 6069142, the build with this submission failed apct/bluetooth/instrumentation_test

Reason for revert: Break tests
Bug: 146198238
Change-Id: I65060ca389bf3ae1f107552ca828bfc1e7baa7c1
parent ea945758

api/current.txt

+0 −5
Original line number Diff line number Diff line
@@ -1059,7 +1059,6 @@ package android { 
    field public static final int popupWindowStyle = 16842870; // 0x1010076

    field public static final int port = 16842793; // 0x1010029

    field public static final int positiveButtonText = 16843253; // 0x10101f5

    field public static final int preferMinimalPostProcessing = 16844300; // 0x101060c

    field public static final int preferenceCategoryStyle = 16842892; // 0x101008c

    field public static final int preferenceFragmentStyle = 16844038; // 0x1010506

    field public static final int preferenceInformationStyle = 16842893; // 0x101008d
@@ -11175,7 +11174,6 @@ package android.content.pm { 
    field public String parentActivityName;

    field public String permission;

    field public int persistableMode;

    field public boolean preferMinimalPostProcessing;

    field public int screenOrientation;

    field public int softInputMode;

    field public String targetActivity;
@@ -49127,7 +49125,6 @@ package android.view { 
    method @Deprecated public float[] getSupportedRefreshRates();

    method @Deprecated public int getWidth();

    method public boolean isHdr();

    method public boolean isMinimalPostProcessingSupported();

    method public boolean isValid();

    method public boolean isWideColorGamut();

    field public static final int DEFAULT_DISPLAY = 0; // 0x0
@@ -52153,7 +52150,6 @@ package android.view { 
    method public abstract void setNavigationBarColor(@ColorInt int);

    method public void setNavigationBarContrastEnforced(boolean);

    method public void setNavigationBarDividerColor(@ColorInt int);

    method public void setPreferMinimalPostProcessing(boolean);

    method public void setReenterTransition(android.transition.Transition);

    method public abstract void setResizingCaptionDrawable(android.graphics.drawable.Drawable);

    method public final void setRestrictedCaptionAreaListener(android.view.Window.OnRestrictedCaptionAreaChangedListener);
@@ -52471,7 +52467,6 @@ package android.view { 
    field public int layoutInDisplayCutoutMode;

    field @Deprecated public int memoryType;

    field public String packageName;

    field public boolean preferMinimalPostProcessing;

    field public int preferredDisplayModeId;

    field @Deprecated public float preferredRefreshRate;

    field public int rotationAnimation;

core/java/android/app/Activity.java

+0 −1
Original line number Diff line number Diff line
@@ -7853,7 +7853,6 @@ public class Activity extends ContextThemeWrapper 
        mCurrentConfig = config;



        mWindow.setColorMode(info.colorMode);

        mWindow.setPreferMinimalPostProcessing(info.preferMinimalPostProcessing);



        setAutofillOptions(application.getAutofillOptions());

        setContentCaptureOptions(application.getContentCaptureOptions());

core/java/android/content/pm/ActivityInfo.java

+0 −31
Original line number Diff line number Diff line
@@ -289,34 +289,6 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
    @ColorMode

    public int colorMode = COLOR_MODE_DEFAULT;



    /**

     * Indicates whether the activity wants the connected display to do minimal post processing on

     * the produced image or video frames. This will only be requested if this activity's main

     * window is visible on the screen.

     *

     * <p>This setting should be used when low latency has a higher priority than image enhancement

     * processing (e.g. for games or video conferencing).

     *

     * <p>If the Display sink is connected via HDMI, the device will begin to send infoframes with

     * Auto Low Latency Mode enabled and Game Content Type. This will switch the connected display

     * to a minimal image processing mode (if available), which reduces latency, improving the user

     * experience for gaming or video conferencing applications. For more information, see HDMI 2.1

     * specification.

     *

     * <p>If the Display sink has an internal connection or uses some other protocol than HDMI,

     * effects may be similar but implementation-defined.

     *

     * <p>The ability to switch to a mode with minimal post proessing may be disabled by a user

     * setting in the system settings menu. In that case, this field is ignored and the display will

     * remain in its current mode.

     *

     * <p>Set from attribute {@link android.R.attr#preferMinimalPostProcessing}.

     *

     * @see android.view.WindowManager.LayoutParams#preferMinimalPostProcessing

     * @see android.view.Display#isMinimalPostProcessingSupported

     */

    public boolean preferMinimalPostProcessing = false;



    /**

     * Bit in {@link #flags} indicating whether this activity is able to

     * run in multiple processes.  If
@@ -1032,7 +1004,6 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
        requestedVrComponent = orig.requestedVrComponent;

        rotationAnimation = orig.rotationAnimation;

        colorMode = orig.colorMode;

        preferMinimalPostProcessing = orig.preferMinimalPostProcessing;

        maxAspectRatio = orig.maxAspectRatio;

        minAspectRatio = orig.minAspectRatio;

    }
@@ -1260,7 +1231,6 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
        dest.writeInt(colorMode);

        dest.writeFloat(maxAspectRatio);

        dest.writeFloat(minAspectRatio);

        dest.writeBoolean(preferMinimalPostProcessing);

    }



    /**
@@ -1379,7 +1349,6 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
        colorMode = source.readInt();

        maxAspectRatio = source.readFloat();

        minAspectRatio = source.readFloat();

        preferMinimalPostProcessing = source.readBoolean();

    }



    /**

core/java/android/hardware/display/DisplayManagerInternal.java

+2 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.util.IntArray; 
import android.util.SparseArray;

import android.view.Display;

import android.view.DisplayInfo;

import android.view.Surface;

import android.view.SurfaceControl;

import android.view.SurfaceControl.Transaction;
@@ -150,14 +151,11 @@ public abstract class DisplayManagerInternal { 
     * has a preference.

     * @param requestedModeId The preferred mode id for the top-most visible window that has a

     * preference.

     * @param preferMinimalPostProcessing Whether there is a visible window on the screen that wants

     * minimal post processing.

     * @param inTraversal True if called from WindowManagerService during a window traversal

     * prior to call to performTraversalInTransactionFromWindowManager.

     */

    public abstract void setDisplayProperties(int displayId, boolean hasContent,

            float requestedRefreshRate, int requestedModeId, boolean preferMinimalPostProcessing,

            boolean inTraversal);

            float requestedRefreshRate, int requestedModeId, boolean inTraversal);



    /**

     * Applies an offset to the contents of a display, for example to avoid burn-in.

core/java/android/view/Display.java

+0 −26
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.Manifest.permission.CONFIGURE_DISPLAY_COLOR_MODE; 
import android.annotation.IntDef;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.app.KeyguardManager;
@@ -857,31 +856,6 @@ public final class Display { 
        }

    }



    /**

     * <p> Returns true if the connected display can be switched into a mode with minimal

     * post processing. </p>

     *

     * <p> If the Display sink is connected via HDMI, this method will return true if the

     * display supports either Auto Low Latency Mode or Game Content Type.

     *

     * <p> If the Display sink has an internal connection or uses some other protocol than

     * HDMI, this method will return true if the sink can be switched into an

     * implementation-defined low latency image processing mode. </p>

     *

     * <p> The ability to switch to a mode with minimal post processing may be disabled

     * by a user setting in the system settings menu. In that case, this method returns

     * false. </p>

     *

     * @see android.view.Window#setPreferMinimalPostProcessing

     */

    @SuppressLint("VisiblySynchronized")

    public boolean isMinimalPostProcessingSupported() {

        synchronized (this) {

            updateDisplayInfoLocked();

            return mDisplayInfo.minimalPostProcessingSupported;

        }

    }



    /**

     * Request the display applies a color mode.

     * @hide