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

Commit 3c9043db authored by Kurt Dresner's avatar Kurt Dresner Committed by Automerger Merge Worker
Browse files

Merge "Make PROJECTION_TYPE_ALL=-1 so that all bits are on." into sc-dev am: 3a4ecbf8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14310287

Change-Id: I537904eddb27a0c6477dcf1e2e8d17ba669c4241
parents 5e1eb4b3 3a4ecbf8

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ package android.app { 
    field public static final int DEFAULT_PRIORITY = 0; // 0x0

    field public static final String EXTRA_CALLING_PACKAGE = "android.app.extra.CALLING_PACKAGE";

    field public static final String EXTRA_PRIORITY = "android.app.extra.PRIORITY";

    field public static final int PROJECTION_TYPE_ALL = 65535; // 0xffff

    field public static final int PROJECTION_TYPE_ALL = -1; // 0xffffffff

    field public static final int PROJECTION_TYPE_AUTOMOTIVE = 1; // 0x1

    field public static final int PROJECTION_TYPE_NONE = 0; // 0x0

  }

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ package android.app { 
    method public boolean isUiModeLocked();

    method @RequiresPermission(value=android.Manifest.permission.TOGGLE_AUTOMOTIVE_PROJECTION, conditional=true) public boolean releaseProjection(int);

    method @RequiresPermission(value=android.Manifest.permission.TOGGLE_AUTOMOTIVE_PROJECTION, conditional=true) public boolean requestProjection(int);

    field public static final int PROJECTION_TYPE_ALL = 65535; // 0xffff

    field public static final int PROJECTION_TYPE_ALL = -1; // 0xffffffff

    field public static final int PROJECTION_TYPE_AUTOMOTIVE = 1; // 0x1

    field public static final int PROJECTION_TYPE_NONE = 0; // 0x0

  }

core/java/android/app/UiModeManager.java

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ public class UiModeManager { 
     */

    @SystemApi

    @TestApi

    public static final int PROJECTION_TYPE_ALL = 0xffff;

    public static final int PROJECTION_TYPE_ALL = -1;  // All bits on



    /** @hide */

    @IntDef(prefix = {"PROJECTION_TYPE_"}, value = {