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

This commit is contained in:
Adam Powell
2012-10-07 16:05:34 -07:00
committed by Android (Google) Code Review

View File

@@ -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()) {