commit f5505ac184173807652a1e9c7045a3d0099fe5e2
author Jakub Pawlowski <jpawlowski@google.com> Thu Mar 23 01:17:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 23 01:17:43 2017 +0000
tree 3fa188b1a0637eaa3a6d114b1f84f990b530d346
parent 048d5aaff9f9b545c09dd22042ae6d96137c5f7c
parent 8afb5229a27e775f16f920c43db30061a7a96593

Merge "Bluetooth 5 Enable->Enabled (2/2)"

jni/com_android_bluetooth_gatt.cpp

diff --git a/jni/com_android_bluetooth_gatt.cpp b/jni/com_android_bluetooth_gatt.cpp
index 259cf95..9322b87 100644
--- a/jni/com_android_bluetooth_gatt.cpp
+++ b/jni/com_android_bluetooth_gatt.cpp
@@ -190,7 +190,7 @@
 static jmethodID method_onAdvertisingParametersUpdated;
 static jmethodID method_onPeriodicAdvertisingParametersUpdated;
 static jmethodID method_onPeriodicAdvertisingDataSet;
-static jmethodID method_onPeriodicAdvertisingEnable;
+static jmethodID method_onPeriodicAdvertisingEnabled;
 
 /**
  * Static variables
@@ -1572,8 +1572,8 @@
       clazz, "onPeriodicAdvertisingParametersUpdated", "(II)V");
   method_onPeriodicAdvertisingDataSet =
       env->GetMethodID(clazz, "onPeriodicAdvertisingDataSet", "(II)V");
-  method_onPeriodicAdvertisingEnable =
-      env->GetMethodID(clazz, "onPeriodicAdvertisingEnable", "(IZI)V");
+  method_onPeriodicAdvertisingEnabled =
+      env->GetMethodID(clazz, "onPeriodicAdvertisingEnabled", "(IZI)V");
 }
 
 static void advertiseInitializeNative(JNIEnv* env, jobject object) {
@@ -1820,7 +1820,7 @@
   CallbackEnv sCallbackEnv(__func__);
   if (!sCallbackEnv.valid()) return;
   sCallbackEnv->CallVoidMethod(mCallbacksObj,
-                               method_onPeriodicAdvertisingEnable,
+                               method_onPeriodicAdvertisingEnabled,
                                advertiser_id, enable, status);
 }
 

src/com/android/bluetooth/gatt/AdvertiseManager.java

diff --git a/src/com/android/bluetooth/gatt/AdvertiseManager.java b/src/com/android/bluetooth/gatt/AdvertiseManager.java
index 2b981ec..73534cf 100644
--- a/src/com/android/bluetooth/gatt/AdvertiseManager.java
+++ b/src/com/android/bluetooth/gatt/AdvertiseManager.java
@@ -328,9 +328,10 @@
         callback.onPeriodicAdvertisingDataSet(advertiser_id, status);
     }
 
-    void onPeriodicAdvertisingEnable(int advertiser_id, boolean enable, int status)
+    void onPeriodicAdvertisingEnabled(int advertiser_id, boolean enable, int status)
             throws Exception {
-        logd("onPeriodicAdvertisingEnable() advertiser_id=" + advertiser_id + ", status=" + status);
+        logd("onPeriodicAdvertisingEnabled() advertiser_id=" + advertiser_id + ", status="
+                + status);
 
         Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiser_id);
         if (entry == null) {
@@ -339,7 +340,7 @@
         }
 
         IAdvertisingSetCallback callback = entry.getValue().callback;
-        callback.onPeriodicAdvertisingEnable(advertiser_id, enable, status);
+        callback.onPeriodicAdvertisingEnabled(advertiser_id, enable, status);
     }
 
     private void logd(String s) {