Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kurt Dresner
2021-04-30 18:23:24 +00:00
committed by Android (Google) Code Review
parent 5177dab6e1 de22e15615
commit 3a4ecbf88f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -850,7 +850,7 @@ package android.app {
field public static final int DEFAULT_PRIORITY = 0; // 0x0 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_CALLING_PACKAGE = "android.app.extra.CALLING_PACKAGE";
field public static final String EXTRA_PRIORITY = "android.app.extra.PRIORITY"; 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_AUTOMOTIVE = 1; // 0x1
field public static final int PROJECTION_TYPE_NONE = 0; // 0x0 field public static final int PROJECTION_TYPE_NONE = 0; // 0x0
} }

2
core/api/test-current.txt
View File

@@ -391,7 +391,7 @@ package android.app {
method public boolean isUiModeLocked(); 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 releaseProjection(int);
method @RequiresPermission(value=android.Manifest.permission.TOGGLE_AUTOMOTIVE_PROJECTION, conditional=true) public boolean requestProjection(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_AUTOMOTIVE = 1; // 0x1
field public static final int PROJECTION_TYPE_NONE = 0; // 0x0 field public static final int PROJECTION_TYPE_NONE = 0; // 0x0
} }

2
core/java/android/app/UiModeManager.java
View File

@@ -713,7 +713,7 @@ public class UiModeManager {
*/ */
@SystemApi @SystemApi
@TestApi @TestApi
public static final int PROJECTION_TYPE_ALL = 0xffff; public static final int PROJECTION_TYPE_ALL = -1; // All bits on
/** @hide */ /** @hide */
@IntDef(prefix = {"PROJECTION_TYPE_"}, value = { @IntDef(prefix = {"PROJECTION_TYPE_"}, value = {