diff options
| author | 2021-04-30 18:23:24 +0000 | |
|---|---|---|
| committer | 2021-04-30 18:23:24 +0000 | |
| commit | 3a4ecbf88f3d6fbb74f7deaa58b40ebbdb7107a4 (patch) | |
| tree | b601ea039f56c1cd834b5a4fec5f9958f4122e2c | |
| parent | 5177dab6e14a786111ae035b6a4beb87476d34e1 (diff) | |
| parent | de22e1561533a22517107b33abf19f44f9fede7a (diff) | |
Merge "Make PROJECTION_TYPE_ALL=-1 so that all bits are on." into sc-dev
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/UiModeManager.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 99a7998e62f5..c7960dd406ed 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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 } diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 61a9954c6336..875a9e7cd2e0 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -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 } diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java index 9b99ab8e31cb..24fd04bedeae 100644 --- a/core/java/android/app/UiModeManager.java +++ b/core/java/android/app/UiModeManager.java @@ -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 = { |