diff options
| author | Ajay Panicker <apanicke@google.com> | 2016-03-17 17:12:08 -0700 |
|---|---|---|
| committer | Ajay Panicker <apanicke@google.com> | 2016-05-04 12:47:16 -0700 |
| commit | af5b1764daa3b212d471f000d7091ac07c040453 (patch) | |
| tree | cf36eb73bbdaec4d7a9722cea78e1e34b525da8b /src/com | |
| parent | e2dca1a7cf3fa6b4d1d8c5769f5d0e052726c699 (diff) | |
| download | android_packages_apps_Bluetooth-af5b1764daa3b212d471f000d7091ac07c040453.tar.gz android_packages_apps_Bluetooth-af5b1764daa3b212d471f000d7091ac07c040453.tar.bz2 android_packages_apps_Bluetooth-af5b1764daa3b212d471f000d7091ac07c040453.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 'src/com')
| -rw-r--r-- | src/com/android/bluetooth/btservice/AdapterService.java | 2 | ||||
| -rw-r--r-- | src/com/android/bluetooth/btservice/AdapterState.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java index a26b515d1..f7721b3ef 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -2099,7 +2099,7 @@ public class AdapterService extends Service { private native static void classInitNative(); private native boolean initNative(); private native void cleanupNative(); - /*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 555e175e8..b47d3242b 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; @@ -360,7 +361,8 @@ final class AdapterState extends StateMachine { removeMessages(BLE_START_TIMEOUT); //Enable - if (!adapterService.enableNative()) { + boolean isGuest = UserManager.get(mAdapterService).isGuestUser(); + if (!adapterService.enableNative(isGuest)) { errorLog("Error while turning Bluetooth on"); notifyAdapterStateChange(BluetoothAdapter.STATE_OFF); transitionTo(mOffState); |