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

Commit 6c2f9c21 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "SystemServer: nit fix" into main

parents d9a69d80 fa012c48

framework/java/android/bluetooth/BluetoothAdapter.java

+0 −1
Original line number Diff line number Diff line
@@ -1741,7 +1741,6 @@ public final class BluetoothAdapter { 
                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                mService.factoryReset(mAttributionSource, recv);

                if (recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false)

                        && mManagerService != null

                        && mManagerService.onFactoryReset(mAttributionSource)) {

                    return true;

                }

service/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -34,9 +34,7 @@ filegroup { 
// pre-jarjar version of service-bluetooth that builds against pre-jarjar version of framework-bluetooth

java_defaults {

    name: "service-bluetooth-pre-jarjar",

    srcs: [

        ":services.bluetooth-sources",

    ],

    srcs: [":services.bluetooth-sources"],



    errorprone: {

        javacflags: [

service/aidl/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ package { 
// AIDL interface used in service-bluetooth

filegroup {

    name: "service-bluetooth-binder-aidl",

    visibility: [

        "//packages/modules/Bluetooth:__subpackages__",

    ],

    visibility: ["//packages/modules/Bluetooth:__subpackages__"],

    srcs: [

        "android/bluetooth/IBluetoothManager.aidl",

        "android/bluetooth/IBluetoothManagerCallback.aidl",

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ class BluetoothManagerService { 
                        mContext.getSystemService(UserManager.class),

                        "UserManager system service cannot be null");



        mBinder = new BluetoothServiceBinder(this, mContext, mUserManager);

        mBinder = new BluetoothServiceBinder(this, mLooper, mContext, mUserManager);

        mHandler = new BluetoothHandler(mLooper);

service/src/com/android/server/bluetooth/BluetoothServiceBinder.java

+5 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.bluetooth.IBluetoothManagerCallback; 
import android.content.AttributionSource;

import android.content.Context;

import android.os.IBinder;

import android.os.Looper;

import android.os.ParcelFileDescriptor;

import android.os.UserManager;

import android.permission.PermissionManager;
@@ -55,9 +56,12 @@ class BluetoothServiceBinder extends IBluetoothManager.Stub { 
    private final AppOpsManager mAppOpsManager;

    private final PermissionManager mPermissionManager;

    private final BtPermissionUtils mPermissionUtils;

    private final Looper mLooper;



    BluetoothServiceBinder(BluetoothManagerService bms, Context ctx, UserManager userManager) {

    BluetoothServiceBinder(

            BluetoothManagerService bms, Looper looper, Context ctx, UserManager userManager) {

        mBluetoothManagerService = bms;

        mLooper = looper;

        mContext = ctx;

        mUserManager = userManager;

        mAppOpsManager =