Merge "Fix delegate.onStop/onStart not always being called" into main (10d1fca8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -341,6 +341,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh
		mSysUiState.setFlag(QuickStepContract.SYSUI_STATE_DIALOG_SHOWING, true)
		.commitUpdate(mContext.getDisplayId());

		mDelegate.onStart(this);
		start();
		}

		@@ -349,7 +350,8 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh
		* should override this method instead.
		*/
		protected void start() {
		mDelegate.onStart(this);
		// IMPORTANT: Please do not add anything here, since subclasses are likely to override this.
		// Instead, add things to onStop above.
		}

		@Override
		@@ -365,6 +367,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh
		mSysUiState.setFlag(QuickStepContract.SYSUI_STATE_DIALOG_SHOWING, false)
		.commitUpdate(mContext.getDisplayId());

		mDelegate.onStop(this);
		stop();
		}

		@@ -373,7 +376,8 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh
		* should override this method instead.
		*/
		protected void stop() {
		mDelegate.onStop(this);
		// IMPORTANT: Please do not add anything here, since subclasses are likely to override this.
		// Instead, add things to onStop above.
		}

		@Override