diff options
| author | Riddle Hsu <riddlehsu@google.com> | 2018-10-31 18:58:28 +0800 |
|---|---|---|
| committer | Riddle Hsu <riddlehsu@google.com> | 2018-11-02 14:38:37 +0800 |
| commit | 4e61177c5f44a259dd82710350fb5bcd100d5da3 (patch) | |
| tree | d99f7bb197c7c5997a72746747ca3d29578116bf /services/art-profile | |
| parent | a17b785a64acfe27b2ce135cb43c071af713e83b (diff) | |
Consolidate the update of display orientation and configuration
Also prevent potential NPE by removing
WMS.updateOrientationFromAppTokensLocked which doesn't check
whether the display is valid.
Bug: 118685343
Test: atest ActivityManagerMultiDisplayTests
Change-Id: I142b37acb4f7e04dc9386f67ca24fc32fe2d81b9
Diffstat (limited to 'services/art-profile')
| -rw-r--r-- | services/art-profile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/art-profile b/services/art-profile index 742ca1c94a77..bdd49de3ef02 100644 --- a/services/art-profile +++ b/services/art-profile @@ -2271,6 +2271,7 @@ HPLcom/android/server/wm/DisplayContent;->lambda$new$8(Lcom/android/server/wm/Di HPLcom/android/server/wm/DisplayContent;->prepareSurfaces()V HPLcom/android/server/wm/DisplayContent;->resetAnimationBackgroundAnimator()V HPLcom/android/server/wm/DisplayContent;->skipTraverseChild(Lcom/android/server/wm/WindowContainer;)Z +HPLcom/android/server/wm/DisplayContent;->updateOrientationFromAppTokens(Z)Z HPLcom/android/server/wm/DisplayContent;->updateTouchExcludeRegion()V HPLcom/android/server/wm/DockedStackDividerController;->isResizing()Z HPLcom/android/server/wm/DragDropController;->dragDropActiveLocked()Z @@ -2451,7 +2452,6 @@ HPLcom/android/server/wm/WindowManagerService;->relayoutWindow(Lcom/android/serv HPLcom/android/server/wm/WindowManagerService;->resetPriorityAfterLockedSection()V HPLcom/android/server/wm/WindowManagerService;->scheduleAnimationLocked()V HPLcom/android/server/wm/WindowManagerService;->traceStateLocked(Ljava/lang/String;)V -HPLcom/android/server/wm/WindowManagerService;->updateOrientationFromAppTokensLocked(IZ)Z HPLcom/android/server/wm/WindowManagerService;->windowForClientLocked(Lcom/android/server/wm/Session;Landroid/os/IBinder;Z)Lcom/android/server/wm/WindowState; HPLcom/android/server/wm/WindowManagerThreadPriorityBooster;->boost()V HPLcom/android/server/wm/WindowManagerThreadPriorityBooster;->reset()V @@ -18137,6 +18137,7 @@ PLcom/android/server/wm/DisplayContent;->updateBaseDisplayMetricsIfNeeded()V PLcom/android/server/wm/DisplayContent;->updateBounds()V PLcom/android/server/wm/DisplayContent;->updateDisplayAndOrientation(I)Landroid/view/DisplayInfo; PLcom/android/server/wm/DisplayContent;->updateDisplayInfo()V +PLcom/android/server/wm/DisplayContent;->updateOrientationFromAppTokens()Z PLcom/android/server/wm/DisplayContent;->updateRotationUnchecked()Z PLcom/android/server/wm/DisplayContent;->updateRotationUnchecked(Z)Z PLcom/android/server/wm/DisplayContent;->updateStackBoundsAfterConfigChange(Ljava/util/List;)V @@ -18906,7 +18907,6 @@ PLcom/android/server/wm/WindowManagerService;->updateFocusedWindowLocked(IZ)Z PLcom/android/server/wm/WindowManagerService;->updateNonSystemOverlayWindowsVisibilityIfNeeded(Lcom/android/server/wm/WindowState;Z)V PLcom/android/server/wm/WindowManagerService;->updateOrientationFromAppTokens(Landroid/content/res/Configuration;Landroid/os/IBinder;I)Landroid/content/res/Configuration; PLcom/android/server/wm/WindowManagerService;->updateOrientationFromAppTokens(Landroid/content/res/Configuration;Landroid/os/IBinder;IZ)Landroid/content/res/Configuration; -PLcom/android/server/wm/WindowManagerService;->updateOrientationFromAppTokensLocked(I)Z PLcom/android/server/wm/WindowManagerService;->updateOrientationFromAppTokensLocked(Landroid/content/res/Configuration;Landroid/os/IBinder;IZ)Landroid/content/res/Configuration; PLcom/android/server/wm/WindowManagerService;->updatePointerIcon(Landroid/view/IWindow;)V PLcom/android/server/wm/WindowManagerService;->updateRotation(ZZ)V |