PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix settings NPE crash on launch." into honeycomb

Browse Source
This commit is contained in:
Jake Hamby
2011-01-27 14:05:44 -08:00
committed by Android (Google) Code Review
parent c5708925c6 632a10f470
commit 6d509d2f35
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
View File

@@ -30,6 +30,7 @@ import android.os.Handler;
import android.os.ParcelUuid; import android.os.ParcelUuid;
import android.util.Log; import android.util.Log;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
@@ -466,7 +467,11 @@ abstract class LocalBluetoothProfileManager {
@Override @Override
public List<BluetoothDevice> getConnectedDevices() { public List<BluetoothDevice> getConnectedDevices() {
return mService.getConnectedDevices(); if (mService != null) {
return mService.getConnectedDevices();
} else {
return new ArrayList<BluetoothDevice>();
}
} }
@Override @Override