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

Commit 8b8f7b4b authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes I0769bb44,If25df66b into main 

* changes:
  Adapter: Move Config init to AdapterService
  Adapter: Load native only with AdapterService
parents abe3ac92 375d91d8

android/app/src/com/android/bluetooth/btservice/AdapterApp.java

+0 −14
Original line number Diff line number Diff line
@@ -18,25 +18,12 @@ package com.android.bluetooth.btservice; 
import android.app.Application;

import android.util.Log;



import com.android.bluetooth.Utils;



public class AdapterApp extends Application {

    private static final String TAG = "BluetoothAdapterApp";

    private static final boolean DBG = false;

    //For Debugging only

    private static int sRefCount = 0;



    static {

        if (DBG) {

            Log.d(TAG, "Loading JNI Library");

        }

        if (Utils.isInstrumentationTestMode()) {

            Log.w(TAG, "App is instrumented. Skip loading the native");

        } else {

            System.loadLibrary("bluetooth_jni");

        }

    }



    public AdapterApp() {

        super();

        if (DBG) {
@@ -58,7 +45,6 @@ public class AdapterApp extends Application { 
        } catch (Exception e) {

            Log.e(TAG, "Migration failure: ", e);

        }

        Config.init(this);

    }



    @Override

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

+13 −0
Original line number Diff line number Diff line
@@ -173,6 +173,18 @@ public class AdapterService extends Service { 
    private static final String TAG = "BluetoothAdapterService";

    private static final boolean DBG = true;

    private static final boolean VERBOSE = false;



    static {

        if (DBG) {

            Log.d(TAG, "Loading JNI Library");

        }

        if (Utils.isInstrumentationTestMode()) {

            Log.w(TAG, "App is instrumented. Skip loading the native");

        } else {

            System.loadLibrary("bluetooth_jni");

        }

    }



    private static final int MIN_ADVT_INSTANCES_FOR_MA = 5;

    private static final int MIN_OFFLOADED_FILTERS = 10;

    private static final int MIN_OFFLOADED_SCAN_STORAGE_BYTES = 1024;
@@ -598,6 +610,7 @@ public class AdapterService extends Service { 
            })

    public void onCreate() {

        super.onCreate();

        Config.init(this);

        if (mLooper == null) {

            mLooper = Looper.getMainLooper();

        }