Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 521b011c authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am b3419595: Merge "QuickSettings - fail gracefully if we can\'t query the... 

am b3419595: Merge "QuickSettings - fail gracefully if we can\'t query the profile data" into jb-mr1-dev

* commit 'b3419595':
  QuickSettings - fail gracefully if we can't query the profile data
parents f3c2eb79 b3419595

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

+5 −0
Original line number Diff line number Diff line
@@ -207,6 +207,11 @@ class QuickSettings { 
                        Profile.CONTENT_URI, new String[] {Phone._ID, Phone.DISPLAY_NAME},

                        null, null, null);



                if (cursor == null) {

                    // Info not available. Should become available later.

                    return new Pair<String, BitmapDrawable>(null, null);

                }



                String name = null;

                try {

                    if (cursor.moveToFirst()) {