Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1a42cfac: Use LM_SECURE when auth && encrypt.

Browse Source 
Merge commit '1a42cfac152faa98c2e3d9e9fd6889209de195fe' into eclair-plus-aosp

* commit '1a42cfac152faa98c2e3d9e9fd6889209de195fe':
  Use LM_SECURE when auth && encrypt.
This commit is contained in:
Nick Pelly
2009-09-24 19:47:08 -07:00
committed by Android Git Automerger
parent a7e508eb55 1a42cfac15
commit b2209a35af
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_bluetooth_BluetoothSocket.cpp
View File

@@ -124,11 +124,13 @@ static void initSocketNative(JNIEnv *env, jobject obj) {
switch (type) {
case TYPE_RFCOMM:
lm |= auth ? RFCOMM_LM_AUTH : 0;
lm |= encrypt? RFCOMM_LM_ENCRYPT : 0;
lm |= encrypt ? RFCOMM_LM_ENCRYPT : 0;
lm |= (auth && encrypt) ? RFCOMM_LM_SECURE : 0;
break;
case TYPE_L2CAP:
lm |= auth ? L2CAP_LM_AUTH : 0;
lm |= encrypt? L2CAP_LM_ENCRYPT : 0;
lm |= encrypt ? L2CAP_LM_ENCRYPT : 0;
lm |= (auth && encrypt) ? L2CAP_LM_SECURE : 0;
break;
}