am 3e6d426d: Merge "Handle case where user info might not be available." into jb-mr1-dev

* commit '3e6d426d8d28e172af6b62c7b9e4b70c25c5facb': Handle case where user info might not be available.
2012-09-09 17:33:49 -07:00
parent e7d87ac0c5 3e6d426d8d
commit 125fce7066
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
@@ -404,7 +404,7 @@ class QuickSettings {
                    @Override
                    public void onLoadComplete(Loader<Cursor> loader,
                            Cursor cursor) {
-                        if (cursor.moveToFirst()) {
+                        if (cursor != null && cursor.moveToFirst()) {
                            String name = cursor.getString(0); // DISPLAY_NAME
                            mModel.setUserTileInfo(name);
                            /*