summaryrefslogtreecommitdiffstats
path: root/jni
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-03-17 17:12:08 -0700
committerThe Android Automerger <android-build@google.com>2016-05-27 11:31:36 -0700
commit122feb9a0b04290f55183ff2f0384c6c53756bd8 (patch)
tree1f9d7dee2e31ba8ab9e3b4bd3a2478344cf2116d /jni
parenta283d524475da1b9ce9013eb2c8709bc7bd9dcfc (diff)
downloadandroid_packages_apps_Bluetooth-122feb9a0b04290f55183ff2f0384c6c53756bd8.tar.gz
android_packages_apps_Bluetooth-122feb9a0b04290f55183ff2f0384c6c53756bd8.tar.bz2
android_packages_apps_Bluetooth-122feb9a0b04290f55183ff2f0384c6c53756bd8.zip
Add guest mode functionality (3/3)
Add a flag to enable() to start Bluetooth in restricted mode. In restricted mode, all devices that are paired during restricted mode are deleted upon leaving restricted mode. Right now restricted mode is only entered while a guest user is active. Bug: 27410683 Change-Id: If4a8855faf362d7f6de509d7ddc7197d1ac75cee
Diffstat (limited to 'jni')
-rwxr-xr-xjni/com_android_bluetooth_btservice_AdapterService.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp
index b8e9a97b3..ad5288eff 100755
--- a/jni/com_android_bluetooth_btservice_AdapterService.cpp
+++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp
@@ -702,13 +702,12 @@ static bool cleanupNative(JNIEnv *env, jobject obj) {
return JNI_TRUE;
}
-static jboolean enableNative(JNIEnv* env, jobject obj) {
+static jboolean enableNative(JNIEnv* env, jobject obj, jboolean isGuest) {
ALOGV("%s:",__FUNCTION__);
jboolean result = JNI_FALSE;
if (!sBluetoothInterface) return result;
-
- int ret = sBluetoothInterface->enable();
+ int ret = sBluetoothInterface->enable(isGuest == JNI_TRUE ? 1 : 0);
result = (ret == BT_STATUS_SUCCESS || ret == BT_STATUS_DONE) ? JNI_TRUE : JNI_FALSE;
return result;
}
@@ -1156,7 +1155,7 @@ static JNINativeMethod sMethods[] = {
{"classInitNative", "()V", (void *) classInitNative},
{"initNative", "()Z", (void *) initNative},
{"cleanupNative", "()V", (void*) cleanupNative},
- {"enableNative", "()Z", (void*) enableNative},
+ {"enableNative", "(Z)Z", (void*) enableNative},
{"disableNative", "()Z", (void*) disableNative},
{"setAdapterPropertyNative", "(I[B)Z", (void*) setAdapterPropertyNative},
{"getAdapterPropertiesNative", "()Z", (void*) getAdapterPropertiesNative},