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

am 6d509d2f: Merge "Fix settings NPE crash on launch." into honeycomb

Browse Source 
* commit '6d509d2f35e39bcdc9c8fc01bf66b63d61c84192':
  Fix settings NPE crash on launch.
This commit is contained in:
Jake Hamby
2011-01-27 15:03:40 -08:00
committed by Android Git Automerger
parent 8d2633075f 6d509d2f35
commit f2941db77a
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.util.Log;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -466,7 +467,11 @@ abstract class LocalBluetoothProfileManager {
@Override
public List<BluetoothDevice> getConnectedDevices() {
return mService.getConnectedDevices();
if (mService != null) {
return mService.getConnectedDevices();
} else {
return new ArrayList<BluetoothDevice>();
}
}
@Override