From 9b77e785aaa02479623d14d4dc9d1f6931fdbd1f Mon Sep 17 00:00:00 2001 From: Ajay Panicker Date: Thu, 17 Mar 2016 17:12:08 -0700 Subject: 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. CYNGNOS-3020 Bug: 27410683 Change-Id: If4a8855faf362d7f6de509d7ddc7197d1ac75cee (cherry picked from commit e1ca5cccd6c2b37f783aa0ee2d9371108ad5c855) --- src/com/android/bluetooth/btservice/AdapterService.java | 2 +- src/com/android/bluetooth/btservice/AdapterState.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/com/android/bluetooth') diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java index 54d883c82..f84409c93 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -2167,7 +2167,7 @@ public class AdapterService extends Service { private native boolean initNative(); private native void cleanupNative(); /*package*/ native void ssrcleanupNative(boolean cleanup); - /*package*/ native boolean enableNative(); + /*package*/ native boolean enableNative(boolean startRestricted); /*package*/ native boolean disableNative(); /*package*/ native boolean setAdapterPropertyNative(int type, byte[] val); /*package*/ native boolean getAdapterPropertiesNative(); diff --git a/src/com/android/bluetooth/btservice/AdapterState.java b/src/com/android/bluetooth/btservice/AdapterState.java index 3469068c4..8127dd807 100644 --- a/src/com/android/bluetooth/btservice/AdapterState.java +++ b/src/com/android/bluetooth/btservice/AdapterState.java @@ -20,6 +20,7 @@ import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.Intent; import android.os.Message; +import android.os.UserManager; import android.util.Log; import com.android.internal.util.State; @@ -258,9 +259,9 @@ final class AdapterState extends StateMachine { removeMessages(START_TIMEOUT); //Enable - boolean ret = adapterService.enableNative(); - if (!ret) { - Log.e(TAG, "Error while turning Bluetooth On"); + boolean isGuest = UserManager.get(mAdapterService).isGuestUser(); + if (!adapterService.enableNative(isGuest)) { + Log.e(TAG, "Error while turning Bluetooth on"); notifyAdapterStateChange(BluetoothAdapter.STATE_OFF); transitionTo(mOffState); } else { -- cgit v1.2.3