Merge "Protect against crash in fragment startup race" (630c5879) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1226,7 +1226,7 @@ public class NotificationPanelView extends PanelView implements
		}

		private String getKeyguardOrLockScreenString() {
		if (mQs.isCustomizing()) {
		if (mQs != null && mQs.isCustomizing()) {
		return getContext().getString(R.string.accessibility_desc_quick_settings_edit);
		} else if (mStatusBarState == StatusBarState.KEYGUARD) {
		return getContext().getString(R.string.accessibility_desc_lock_screen);