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

Commit 4bd47c02 authored by Bill Yi's avatar Bill Yi Committed by Gerrit Code Review
Browse files

Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE"

parents 91fb9876 cb76c9c1

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 
}



static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest,

                       jboolean isSingleUserMode) {

                       jboolean isNiapMode) {

  ALOGV("%s", __func__);



  android_bluetooth_UidTraffic.clazz =
@@ -696,7 +696,7 @@ static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest, 


  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;

android/app/res/values-ky/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
    <string name="not_exist_file_desc" msgid="4059531573790529229">"Мындай файл жок. \n"</string>

    <string name="enabling_progress_title" msgid="436157952334723406">"Күтө туруңуз…"</string>

    <string name="enabling_progress_content" msgid="4601542238119927904">"Bluetooth жандырылууда…"</string>

    <string name="bt_toast_1" msgid="972182708034353383">"Файл алынат. Эскертмелер тактасынан жүрүшүн байкап турсаңыз болот."</string>

    <string name="bt_toast_1" msgid="972182708034353383">"Файл алынат. Билдирмелер тактасынан жүрүшүн байкап турсаңыз болот."</string>

    <string name="bt_toast_2" msgid="8602553334099066582">"Файлды алуу мүмкүн эмес."</string>

    <string name="bt_toast_3" msgid="6707884165086862518">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" жөнөткөн файлды алуу токтотулду"</string>

    <string name="bt_toast_4" msgid="4678812947604395649">"Кийинкиге файл жөнөтүлүүдө: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>

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

+6 −4
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ public class AdapterService extends Service { 
        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);
@@ -1744,6 +1744,8 @@ public class AdapterService extends Service { 
                return false;

            }



            enforceBluetoothPrivilegedPermission(service);



            service.setPhonebookAccessPermission(device, value);

            return true;

        }
@@ -2982,8 +2984,8 @@ public class AdapterService extends Service { 
        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;

    }



    /**
@@ -3002,7 +3004,7 @@ public class AdapterService extends Service { 


    static native void classInitNative();



    native boolean initNative(boolean startRestricted, boolean isSingleUserMode);

    native boolean initNative(boolean startRestricted, boolean isNiapMode);



    native void cleanupNative();

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class AdapterServiceTest { 
        }

        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);

android/app/tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class ProfileServiceTest { 


        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);