Skip to content

Commit 82b517b

Browse files
author
Jim Miller
committed
Fix potential null pointer exeption in keyguard
The code was adding default widgets before setting mViewStateManager, which means the callback from the transport control might access mViewStateManager before it's set. Change-Id: I985a3c8062d0660519cb4a4c8c1b42c7c90f4ac7
1 parent c8f7c5e commit 82b517b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,11 @@ protected void onFinishInflate() {
153153
mAppWidgetContainer.setCallbacks(mWidgetCallbacks);
154154
mAppWidgetContainer.setMinScale(0.5f);
155155

156+
mViewStateManager = new KeyguardViewStateManager();
157+
156158
addDefaultWidgets();
157159
addWidgetsFromSettings();
158160

159-
mViewStateManager = new KeyguardViewStateManager();
160161
SlidingChallengeLayout slider =
161162
(SlidingChallengeLayout) findViewById(R.id.sliding_layout);
162163
if (slider != null) {

0 commit comments

Comments
 (0)