From de22e1561533a22517107b33abf19f44f9fede7a Mon Sep 17 00:00:00 2001 From: Kurt Dresner Date: Mon, 26 Apr 2021 16:19:21 +0000 Subject: Make PROJECTION_TYPE_ALL=-1 so that all bits are on. Bug: 175130323 Bug: 186462292 Change-Id: I591c22c36760ea3162928fa4c80726a206e86214 --- core/api/system-current.txt | 2 +- core/api/test-current.txt | 2 +- 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 fede5a5f505a..ba238e12e034 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 4e929a8067b0..0c4ee06fa926 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -390,7 +390,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 = { -- cgit v1.2.3-59-g8ed1b