Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9fbe54e authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Revert "Add guest mode functionality (1/5)" 

am: fa088217

* commit 'fa088217':
  Revert "Add guest mode functionality (1/5)"
parents e1f79a46 fa088217

jni/com_android_bluetooth_btservice_AdapterService.cpp

+4 −3
Original line number Diff line number Diff line
@@ -744,12 +744,13 @@ static bool cleanupNative(JNIEnv *env, jobject obj) { 
    return JNI_TRUE;

}



static jboolean enableNative(JNIEnv* env, jobject obj, jboolean isGuest) {

static jboolean enableNative(JNIEnv* env, jobject obj) {

    ALOGV("%s:",__FUNCTION__);



    jboolean result = JNI_FALSE;

    if (!sBluetoothInterface) return result;

    int ret = sBluetoothInterface->enable(isGuest == JNI_TRUE ? 1 : 0);



    int ret = sBluetoothInterface->enable();

    result = (ret == BT_STATUS_SUCCESS || ret == BT_STATUS_DONE) ? JNI_TRUE : JNI_FALSE;

    return result;

}
@@ -1269,7 +1270,7 @@ static JNINativeMethod sMethods[] = { 
    {"classInitNative", "()V", (void *) classInitNative},

    {"initNative", "()Z", (void *) initNative},

    {"cleanupNative", "()V", (void*) cleanupNative},

    {"enableNative", "(Z)Z",  (void*) enableNative},

    {"enableNative", "()Z",  (void*) enableNative},

    {"disableNative", "()Z",  (void*) disableNative},

    {"setAdapterPropertyNative", "(I[B)Z", (void*) setAdapterPropertyNative},

    {"getAdapterPropertiesNative", "()Z", (void*) getAdapterPropertiesNative},

src/com/android/bluetooth/btservice/AdapterService.java

+1 −1
Original line number Diff line number Diff line
@@ -2392,7 +2392,7 @@ public class AdapterService extends Service { 
    private native static void classInitNative();

    private native boolean initNative();

    private native void cleanupNative();

    /*package*/ native boolean enableNative(boolean startRestricted);

    /*package*/ native boolean enableNative();

    /*package*/ native boolean disableNative();

    /*package*/ native boolean setAdapterPropertyNative(int type, byte[] val);

    /*package*/ native boolean getAdapterPropertiesNative();

src/com/android/bluetooth/btservice/AdapterState.java

+1 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 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;
@@ -361,8 +360,7 @@ final class AdapterState extends StateMachine { 
                    removeMessages(BLE_START_TIMEOUT);



                    //Enable

                    boolean isGuest = UserManager.get(mAdapterService).isGuestUser();

                    if (!adapterService.enableNative(isGuest)) {

                    if (!adapterService.enableNative()) {

                        errorLog("Error while turning Bluetooth on");

                        notifyAdapterStateChange(BluetoothAdapter.STATE_OFF);

                        transitionTo(mOffState);