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

Merge "Allowing SurfaceViewHost to show up in layout inspector" into tm-dev am: 579f8a6234

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

Change-Id: I2b858314fee2bc5d3602bdedf1f9ed8b6d0ebf3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-07 09:56:01 +00:00
committed by Automerger Merge Worker
parent d49c2cea35 579f8a6234
commit e905f440ee
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/WindowManagerGlobal.java
View File

@@ -216,10 +216,14 @@ public final class WindowManagerGlobal {
public String[] getViewRootNames() { public String[] getViewRootNames() {
synchronized (mLock) { synchronized (mLock) {
final int numRoots = mRoots.size(); final int numRoots = mRoots.size();
String[] mViewRoots = new String[numRoots]; final int windowlessRoots = mWindowlessRoots.size();
String[] mViewRoots = new String[numRoots + windowlessRoots];
for (int i = 0; i < numRoots; ++i) { for (int i = 0; i < numRoots; ++i) {
mViewRoots[i] = getWindowName(mRoots.get(i)); mViewRoots[i] = getWindowName(mRoots.get(i));
} }
for (int i = 0; i < windowlessRoots; ++i) {
mViewRoots[i + numRoots] = getWindowName(mWindowlessRoots.get(i));
}
return mViewRoots; return mViewRoots;
} }
} }
@@ -288,6 +292,10 @@ public final class WindowManagerGlobal {
final ViewRootImpl root = mRoots.get(i); final ViewRootImpl root = mRoots.get(i);
if (name.equals(getWindowName(root))) return root.getView(); if (name.equals(getWindowName(root))) return root.getView();
} }
for (int i = mWindowlessRoots.size() - 1; i >= 0; --i) {
final ViewRootImpl root = mWindowlessRoots.get(i);
if (name.equals(getWindowName(root))) return root.getView();
}
} }
return null; return null;