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

Commit e8f6decd authored by William Escande's avatar William Escande
Browse files

SystemServer: implement getState for general purpose 

Fetching the Bluetooth state cannot be a oneway call, but some system
process are making the call anyway.
By moving the getter into the SystemServer, we are ensuring that the non
oneway call can be executed.

Bug: 362569584
Flag: com.android.bluetooth.flags.get_state_from_system_server
Test: atest ServiceBluetoothRoboTests
Change-Id: I016b5a147fbdc5d4667696616d504cbaf453b255
parent fad292f4

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

+10 −1
Original line number Diff line number Diff line
@@ -1153,6 +1153,10 @@ public class AdapterService extends Service { 
    }



    private void invalidateBluetoothGetStateCache() {

        if (Flags.getStateFromSystemServer()) {

            // State is managed by the system server

            return;

        }

        BluetoothAdapter.invalidateBluetoothGetStateCache();

    }
@@ -1482,7 +1486,9 @@ public class AdapterService extends Service { 
        BluetoothAdapter.invalidateGetProfileConnectionStateCache();

        BluetoothAdapter.invalidateIsOffloadedFilteringSupportedCache();

        BluetoothDevice.invalidateBluetoothGetBondStateCache();

        if (!Flags.getStateFromSystemServer()) {

            BluetoothAdapter.invalidateBluetoothGetStateCache();

        }

        BluetoothAdapter.invalidateGetAdapterConnectionStateCache();

        BluetoothMap.invalidateBluetoothGetConnectionStateCache();

        BluetoothSap.invalidateBluetoothGetConnectionStateCache();
@@ -2240,6 +2246,9 @@ public class AdapterService extends Service { 


        AdapterServiceBinder(AdapterService svc) {

            mService = svc;

            if (Flags.getStateFromSystemServer()) {

                return;

            }

            mService.invalidateBluetoothGetStateCache();

            BluetoothAdapter.getDefaultAdapter().disableBluetoothGetStateCache();

        }

framework/java/android/bluetooth/BluetoothAdapter.java

+36 −1
Original line number Diff line number Diff line
@@ -1468,7 +1468,6 @@ public final class BluetoothAdapter { 
            super(8, IpcDataCache.MODULE_BLUETOOTH, api, api, query);

        }

    }

    ;



    /**

     * Invalidate a bluetooth cache. This method is just a short-hand wrapper that enforces the
@@ -1492,24 +1491,60 @@ public final class BluetoothAdapter { 
                }

            };



    private static final IpcDataCache.QueryHandler<IBluetoothManager, Integer>

            sBluetoothGetSystemStateQuery =

                    new IpcDataCache.QueryHandler<>() {

                        @RequiresNoPermission

                        @Override

                        public @InternalAdapterState Integer apply(IBluetoothManager serviceQuery) {

                            try {

                                return serviceQuery.getState();

                            } catch (RemoteException e) {

                                throw e.rethrowAsRuntimeException();

                            }

                        }

                    };



    private static final String GET_STATE_API = "BluetoothAdapter_getState";



    /** @hide */

    public static final String GET_SYSTEM_STATE_API = IBluetoothManager.GET_SYSTEM_STATE_API;



    private static final IpcDataCache<IBluetooth, Integer> sBluetoothGetStateCache =

            new BluetoothCache<>(GET_STATE_API, sBluetoothGetStateQuery);



    private static final IpcDataCache<IBluetoothManager, Integer> sBluetoothGetSystemStateCache =

            new BluetoothCache<>(GET_SYSTEM_STATE_API, sBluetoothGetSystemStateQuery);



    /** @hide */

    @RequiresNoPermission

    public void disableBluetoothGetStateCache() {

        if (Flags.getStateFromSystemServer()) {

            throw new IllegalStateException("getStateFromSystemServer is enabled");

        }

        sBluetoothGetStateCache.disableForCurrentProcess();

    }



    /** @hide */

    public static void invalidateBluetoothGetStateCache() {

        if (Flags.getStateFromSystemServer()) {

            throw new IllegalStateException("getStateFromSystemServer is enabled");

        }

        invalidateCache(GET_STATE_API);

    }



    /** Fetch the current bluetooth state. If the service is down, return OFF. */

    private @InternalAdapterState int getStateInternal() {

        if (Flags.getStateFromSystemServer()) {

            try {

                return sBluetoothGetSystemStateCache.query(mManagerService);

            } catch (RuntimeException runtime) {

                if (runtime.getCause() instanceof RemoteException e) {

                    throw e.rethrowFromSystemServer();

                }

                throw runtime;

            }

        }

        mServiceLock.readLock().lock();

        try {

            if (mService != null) {

service/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ android_robolectric_test { 
        "mockito-robolectric-prebuilt",

        "modules-utils-expresslog",

        "platform-test-annotations",

        "service-bluetooth-binder-aidl",

        "testng",

        "truth",

    ],

service/aidl/android/bluetooth/IBluetoothManager.aidl

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ interface IBluetoothManager 
    boolean enableNoAutoConnect(in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED}, conditional=true)")

    boolean disable(in AttributionSource attributionSource, boolean persist);



    const String GET_SYSTEM_STATE_API = "BluetoothAdapter_getSystemState";



    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")

    int getState();

service/src/AdapterState.kt

+9 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ package com.android.server.bluetooth 


import android.bluetooth.BluetoothAdapter

import android.bluetooth.BluetoothAdapter.STATE_OFF

import android.bluetooth.IBluetoothManager.GET_SYSTEM_STATE_API

import android.os.IpcDataCache

import com.android.bluetooth.flags.Flags

import kotlin.time.Duration

import kotlin.time.toKotlinDuration

import kotlinx.coroutines.flow.MutableSharedFlow
@@ -34,7 +37,12 @@ class BluetoothAdapterState { 
        set(STATE_OFF)

    }



    fun set(s: Int) = runBlocking { _uiState.emit(s) }

    fun set(s: Int) = runBlocking {

        _uiState.emit(s)

        if (Flags.getStateFromSystemServer()) {

            IpcDataCache.invalidateCache(IpcDataCache.MODULE_BLUETOOTH, GET_SYSTEM_STATE_API)

        }

    }



    fun get(): Int = _uiState.replayCache.get(0)