Skip to content

Commit 521b011

Browse files
adampAndroid Git Automerger
authored andcommitted
am b341959: Merge "QuickSettings - fail gracefully if we can\'t query the profile data" into jb-mr1-dev
* commit 'b3419595c78401c51966f3b104c25eef155ed9a2': QuickSettings - fail gracefully if we can't query the profile data
2 parents f3c2eb7 + b341959 commit 521b011

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,11 @@ protected Pair<String, BitmapDrawable> doInBackground(Void... params) {
207207
Profile.CONTENT_URI, new String[] {Phone._ID, Phone.DISPLAY_NAME},
208208
null, null, null);
209209

210+
if (cursor == null) {
211+
// Info not available. Should become available later.
212+
return new Pair<String, BitmapDrawable>(null, null);
213+
}
214+
210215
String name = null;
211216
try {
212217
if (cursor.moveToFirst()) {

0 commit comments

Comments
 (0)