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

Commit 8631e554 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am ad431ad8: Merge change Ia3acc2ee into eclair 

Merge commit 'ad431ad8' into eclair-mr2

* commit 'ad431ad8':
  Fix pairings lost on reboot.
parents 949c572a ad431ad8

core/java/android/server/BluetoothEventLoop.java

+2 −2
Original line number Diff line number Diff line
@@ -292,9 +292,9 @@ class BluetoothEventLoop { 
            mBluetoothService.setProperty(name, propValues[1]);

        } else if (name.equals("Pairable") || name.equals("Discoverable")) {

            String pairable = name.equals("Pairable") ? propValues[1] :

                mBluetoothService.getProperty("Pairable");

                mBluetoothService.getPropertyInternal("Pairable");

            String discoverable = name.equals("Discoverable") ? propValues[1] :

                mBluetoothService.getProperty("Discoverable");

                mBluetoothService.getPropertyInternal("Discoverable");



            // This shouldn't happen, unless Adapter Properties are null.

            if (pairable == null || discoverable == null)

core/java/android/server/BluetoothService.java

+9 −5
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ public class BluetoothService extends IBluetooth.Stub { 
                return;

            }

            String []bonds = null;

            String val = getProperty("Devices");

            String val = getPropertyInternal("Devices");

            if (val != null) {

                bonds = val.split(",");

            }
@@ -681,7 +681,6 @@ public class BluetoothService extends IBluetooth.Stub { 
    /*package*/synchronized void getAllProperties() {



        mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        if (!isEnabledInternal()) return;

        mAdapterProperties.clear();



        String properties[] = (String [])getAdapterPropertiesNative();
@@ -807,6 +806,11 @@ public class BluetoothService extends IBluetooth.Stub { 
    }



    /*package*/ synchronized String getProperty(String name) {

        if (!isEnabledInternal()) return null;

        return getPropertyInternal(name);

    }



    /*package*/ synchronized String getPropertyInternal(String name) {

        if (!mAdapterProperties.isEmpty())

            return mAdapterProperties.get(name);

        getAllProperties();
@@ -1639,7 +1643,7 @@ public class BluetoothService extends IBluetooth.Stub { 
    }



    /*package*/ String getAddressFromObjectPath(String objectPath) {

        String adapterObjectPath = getProperty("ObjectPath");

        String adapterObjectPath = getPropertyInternal("ObjectPath");

        if (adapterObjectPath == null || objectPath == null) {

            Log.e(TAG, "getAddressFromObjectPath: AdpaterObjectPath:" + adapterObjectPath +

                    "  or deviceObjectPath:" + objectPath + " is null");
@@ -1659,7 +1663,7 @@ public class BluetoothService extends IBluetooth.Stub { 
    }



    /*package*/ String getObjectPathFromAddress(String address) {

        String path = getProperty("ObjectPath");

        String path = getPropertyInternal("ObjectPath");

        if (path == null) {

            Log.e(TAG, "Error: Object Path is null");

            return null;

core/jni/.android_server_BluetoothEventLoop.cpp.swp

deleted100644 → 0
−16 KiB

File deleted.

View file