From b148bc844e5eddb07bef2fd1b4b754716decb43e Mon Sep 17 00:00:00 2001
From: Jaikumar Ganesh <jaikumar@google.com>
Date: Fri, 20 Nov 2009 13:41:07 -0800
Subject: [PATCH] Fix pairings lost on reboot.

Bug:2277376
Dr No:Eastham
---
 .../java/android/server/BluetoothEventLoop.java |   4 ++--
 core/java/android/server/BluetoothService.java  |  14 +++++++++-----
 .../.android_server_BluetoothEventLoop.cpp.swp  | Bin 16384 -> 0 bytes
 3 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 core/jni/.android_server_BluetoothEventLoop.cpp.swp

diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java
index c0b9a6843ea17..cb3b6ee0ee011 100644
--- a/core/java/android/server/BluetoothEventLoop.java
+++ b/core/java/android/server/BluetoothEventLoop.java
@@ -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)
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index 809e23034bc1c..db9f34a68c386 100644
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -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();
@@ -806,7 +805,12 @@ public class BluetoothService extends IBluetooth.Stub {
         return true;
     }
 
-    /*package*/ synchronized String getProperty (String name) {
+    /*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;
diff --git a/core/jni/.android_server_BluetoothEventLoop.cpp.swp b/core/jni/.android_server_BluetoothEventLoop.cpp.swp
deleted file mode 100644
index d36e403a79a8413ea9aeced90eb669b2bc99e6ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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
L#pPL=H^~11zgfR)