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

Merge "Enable usage-after-release tracking in the Shell" into udc-dev am: 018ea2e75b

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

Change-Id: I95e9b19151c926b4be02f593d8f58dad4befae70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2023-03-02 23:50:34 +00:00
committed by Automerger Merge Worker
parent fcbb1fc6d1 018ea2e75b
commit b31a3b1626
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/sysui/ShellInit.java
View File

@@ -21,6 +21,7 @@ import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_INIT;
import android.os.Build; import android.os.Build;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Pair; import android.util.Pair;
import android.view.SurfaceControl;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -75,6 +76,7 @@ public class ShellInit {
@VisibleForTesting @VisibleForTesting
public void init() { public void init() {
ProtoLog.v(WM_SHELL_INIT, "Initializing Shell Components: %d", mInitCallbacks.size()); ProtoLog.v(WM_SHELL_INIT, "Initializing Shell Components: %d", mInitCallbacks.size());
SurfaceControl.setDebugUsageAfterRelease(true);
// Init in order of registration // Init in order of registration
for (int i = 0; i < mInitCallbacks.size(); i++) { for (int i = 0; i < mInitCallbacks.size(); i++) {
final Pair<String, Runnable> info = mInitCallbacks.get(i); final Pair<String, Runnable> info = mInitCallbacks.get(i);

6
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
View File

@@ -1007,7 +1007,11 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
private void notifyNavigationBarSurface() { private void notifyNavigationBarSurface() {
ViewRootImpl viewRoot = mView.getViewRootImpl(); ViewRootImpl viewRoot = mView.getViewRootImpl();
SurfaceControl surface = viewRoot != null ? viewRoot.getSurfaceControl() : null; SurfaceControl surface = viewRoot != null
&& viewRoot.getSurfaceControl() != null
&& viewRoot.getSurfaceControl().isValid()
? viewRoot.getSurfaceControl()
: null;
mOverviewProxyService.onNavigationBarSurfaceChanged(surface); mOverviewProxyService.onNavigationBarSurfaceChanged(surface);
} }