diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-05-25 03:01:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-25 03:01:12 +0000 |
| commit | c8571df9461e27a4c8fb3c892a9cfbbf9def6192 (patch) | |
| tree | 21410f542a32d01d9eeaa1f2edbba376bb29866f /core/java/android | |
| parent | 78803a58ea455e25b4ca245eff9a58298beda510 (diff) | |
| parent | d5b0c3f1631e1ad34fdf41fc87de5a63d6be8215 (diff) | |
Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313
Change-Id: I7d8ed0e3dd91a8c0bd54868de5333f63d2268fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/display/DisplayManager.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index 731ea9207283..eadcac91dcd7 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -108,6 +108,17 @@ public final class DisplayManager { public static final String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION"; + /** + * Display category: All displays, including disabled displays. + * <p> + * This returns all displays, including currently disabled and inaccessible displays. + * + * @see #getDisplays(String) + * @hide + */ + public static final String DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED = + "android.hardware.display.category.ALL_INCLUDING_DISABLED"; + /** @hide **/ @IntDef(prefix = "VIRTUAL_DISPLAY_FLAG_", flag = true, value = { VIRTUAL_DISPLAY_FLAG_PUBLIC, @@ -552,7 +563,8 @@ public final class DisplayManager { final int[] displayIds = mGlobal.getDisplayIds(); synchronized (mLock) { try { - if (category == null) { + if (category == null + || DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED.equals(category)) { addAllDisplaysLocked(mTempDisplays, displayIds); } else if (category.equals(DISPLAY_CATEGORY_PRESENTATION)) { addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_WIFI); |