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

Remove StatusBar#getStatusBarView

Browse Source 
StatusBar shouldn't be handing out references to StatusBarView, since
PhoneStatusBarView doesn't have the same lifetime as StatusBar.java. All
calls to this method have been removed so we can just delete it now.

Bug: 209005990
Test: atest SytemUITests
Change-Id: Ib277941d739290445668589932fb65b1b94fb154
This commit is contained in:
Evan Laird
2021-12-09 14:38:25 -05:00
parent 3822f89d64
commit 4a7e6f84d3
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -341,7 +341,7 @@ public class StatusBar extends CoreStartable implements
mStatusBarWindowState = state;
mStatusBarWindowHidden = state == WINDOW_STATE_HIDDEN;
mStatusBarHideIconsForBouncerManager.setStatusBarWindowHidden(mStatusBarWindowHidden);
if (getStatusBarView() != null) {
if (mStatusBarView != null) {
// Should #updateHideIconsForBouncer always be called, regardless of whether we have a
// status bar view? If so, we can make #updateHideIconsForBouncer private.
mStatusBarHideIconsForBouncerManager.updateHideIconsForBouncer(/* animate= */ false);
@@ -1124,23 +1124,18 @@ public class StatusBar extends CoreStartable implements
// Set up CollapsedStatusBarFragment and PhoneStatusBarView
StatusBarInitializer initializer = mStatusBarComponent.getStatusBarInitializer();
initializer.setStatusBarViewUpdatedListener(
new StatusBarInitializer.OnStatusBarViewUpdatedListener() {
@Override
public void onStatusBarViewUpdated(
@NonNull PhoneStatusBarView statusBarView,
@NonNull PhoneStatusBarViewController statusBarViewController) {
mStatusBarView = statusBarView;
mPhoneStatusBarViewController = statusBarViewController;
mNotificationShadeWindowViewController.setStatusBarView(mStatusBarView);
// Ensure we re-propagate panel expansion values to the panel controller and
// any listeners it may have, such as PanelBar. This will also ensure we
// re-display the notification panel if necessary (for example, if
// a heads-up notification was being displayed and should continue being
// displayed).
mNotificationPanelViewController.updatePanelExpansionAndVisibility();
setBouncerShowingForStatusBarComponents(mBouncerShowing);
checkBarModes();
}
(statusBarView, statusBarViewController) -> {
mStatusBarView = statusBarView;
mPhoneStatusBarViewController = statusBarViewController;
mNotificationShadeWindowViewController.setStatusBarView(mStatusBarView);
// Ensure we re-propagate panel expansion values to the panel controller and
// any listeners it may have, such as PanelBar. This will also ensure we
// re-display the notification panel if necessary (for example, if
// a heads-up notification was being displayed and should continue being
// displayed).
mNotificationPanelViewController.updatePanelExpansionAndVisibility();
setBouncerShowingForStatusBarComponents(mBouncerShowing);
checkBarModes();
});
initializer.initializeStatusBar(mStatusBarComponent);
@@ -1578,10 +1573,6 @@ public class StatusBar extends CoreStartable implements
Trace.endSection();
}
protected PhoneStatusBarView getStatusBarView() {
return mStatusBarView;
}
public NotificationShadeWindowView getNotificationShadeWindowView() {
return mNotificationShadeWindowView;
}