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

am 00553835: Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev

Browse Source 
* commit '0055383554983842c5d7bab25a981c6eb804a38c':
  Attempt to fix NPE in keyguard
This commit is contained in:
Jim Miller
2013-05-09 23:40:30 -07:00
committed by Android Git Automerger
parent e8c9b39ec9 0055383554
commit 8f1b2e0b7f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
View File

@@ -326,10 +326,15 @@ public class KeyguardHostView extends KeyguardViewBase {
}
private int getWidgetPosition(int id) {
final int children = mAppWidgetContainer.getChildCount();
final KeyguardWidgetPager appWidgetContainer = mAppWidgetContainer;
final int children = appWidgetContainer.getChildCount();
for (int i = 0; i < children; i++) {
if (mAppWidgetContainer.getWidgetPageAt(i).getContent().getId() == id) {
final View content = appWidgetContainer.getWidgetPageAt(i).getContent();
if (content != null && content.getId() == id) {
return i;
} else if (content == null) {
// Attempt to track down bug #8886916
Log.w(TAG, "*** Null content at " + "i=" + i + ",id=" + id + ",N=" + children);
}
}
return -1;