Merge "DO NOT MERGE: Make NIAP a Global Setting toggle." into qt-qpr1-dev
diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp
index 0ac85f4..06914e1 100644
--- a/jni/com_android_bluetooth_btservice_AdapterService.cpp
+++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp
@@ -684,7 +684,7 @@
}
static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest,
- jboolean isSingleUserMode) {
+ jboolean isNiapMode) {
ALOGV("%s", __func__);
android_bluetooth_UidTraffic.clazz =
@@ -700,7 +700,7 @@
int ret = sBluetoothInterface->init(&sBluetoothCallbacks,
isGuest == JNI_TRUE ? 1 : 0,
- isSingleUserMode == JNI_TRUE ? 1 : 0);
+ isNiapMode == JNI_TRUE ? 1 : 0);
if (ret != BT_STATUS_SUCCESS) {
ALOGE("Error while setting the callbacks: %d\n", ret);
sBluetoothInterface = NULL;
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 2d3d69e..009e42c 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -393,7 +393,7 @@
mAdapterProperties = new AdapterProperties(this);
mAdapterStateMachine = AdapterState.make(this);
mJniCallbacks = new JniCallbacks(this, mAdapterProperties);
- initNative(isGuest(), isSingleUserMode());
+ initNative(isGuest(), isNiapMode());
mNativeAvailable = true;
mCallbacks = new RemoteCallbackList<IBluetoothCallback>();
mAppOps = getSystemService(AppOpsManager.class);
@@ -2871,8 +2871,8 @@
return UserManager.get(this).isGuestUser();
}
- private boolean isSingleUserMode() {
- return UserManager.get(this).hasUserRestriction(UserManager.DISALLOW_ADD_USER);
+ private boolean isNiapMode() {
+ return Settings.Global.getInt(getContentResolver(), "niap_mode", 0) == 1;
}
/**
@@ -2891,7 +2891,7 @@
static native void classInitNative();
- native boolean initNative(boolean startRestricted, boolean isSingleUserMode);
+ native boolean initNative(boolean startRestricted, boolean isNiapMode);
native void cleanupNative();
diff --git a/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java b/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java
index 82fa163..2d58a60 100644
--- a/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java
+++ b/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java
@@ -101,7 +101,7 @@
}
Assert.assertNotNull(Looper.myLooper());
AdapterService adapterService = new AdapterService();
- adapterService.initNative(false /* is_restricted */, false /* is_single_user_mode */);
+ adapterService.initNative(false /* is_restricted */, false /* is_niap_mode */);
adapterService.cleanupNative();
HashMap<String, HashMap<String, String>> adapterConfig = TestUtils.readAdapterConfig();
Assert.assertNotNull(adapterConfig);
diff --git a/tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java b/tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java
index 6567398..3fea6f5 100644
--- a/tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java
+++ b/tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java
@@ -96,7 +96,7 @@
mProfiles = Config.getSupportedProfiles();
- mMockAdapterService.initNative(false /* is_restricted */, false /* is_single_user_mode */);
+ mMockAdapterService.initNative(false /* is_restricted */, false /* is_niap_mode */);
TestUtils.setAdapterService(mMockAdapterService);