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

Commit 3abdebea authored by Satish Kodishala's avatar Satish Kodishala Committed by Linux Build Service Account
Browse files

Revert "Change the routing path of bluetooth headset connections." 

Changes the way to bind to HeadsetService. Changes are causing
memory leaks and stability issues.

This reverts commit e8b98925.

CRs-fixed: 934279
Change-Id: Ic2820d2e51581a6c9987028265a90fccd64e3c68

Bluetooth: Fix for CTS failure

CTS checks for caller identity. Return true if foreground user
is calling BT APIs.

CRs-fixed: 939173
Change-Id: I9b7636e9769c071363a3a402c447c24281c8cc9d

BT: Allow user processes to bind to HeadsetService in guest login

In guest login, allow binding to HeadsetService for user processes.

CRs-Fixed: 959566
Change-Id: I7d35b89ddc20ebc7db9dcffb21a715108d842923
parent c734627c

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothA2dpSink.aidl \

	core/java/android/bluetooth/IBluetoothAvrcpController.aidl \

	core/java/android/bluetooth/IBluetoothCallback.aidl \

	core/java/android/bluetooth/IBluetoothProfileServiceConnection.aidl \

	core/java/android/bluetooth/IBluetoothHeadset.aidl \

	core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \

	core/java/android/bluetooth/IBluetoothHealth.aidl \

core/java/android/bluetooth/BluetoothHeadset.java

+38 −55
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ import android.annotation.SdkConstant; 
import android.annotation.SdkConstant.SdkConstantType;

import android.content.ComponentName;

import android.content.Context;

import android.os.Handler;

import android.content.Intent;

import android.content.ServiceConnection;

import android.os.IBinder;

import android.os.Looper;

import android.os.Message;

import android.os.RemoteException;

import android.os.UserHandle;

import android.util.Log;



import java.util.ArrayList;
@@ -243,8 +243,6 @@ public final class BluetoothHeadset implements BluetoothProfile { 
     */

    public static final int STATE_AUDIO_CONNECTED = 12;



    private static final int MESSAGE_HEADSET_SERVICE_CONNECTED = 100;

    private static final int MESSAGE_HEADSET_SERVICE_DISCONNECTED = 101;



    private Context mContext;

    private ServiceListener mServiceListener;
@@ -257,7 +255,14 @@ public final class BluetoothHeadset implements BluetoothProfile { 
                    if (DBG) Log.d(TAG, "onBluetoothStateChange: up=" + up);

                    if (!up) {

                        if (VDBG) Log.d(TAG,"Unbinding service...");

                        doUnbind();

                        synchronized (mConnection) {

                            try {

                                mService = null;

                                mContext.unbindService(mConnection);

                            } catch (Exception re) {

                                Log.e(TAG,"",re);

                            }

                        }

                    } else {

                        synchronized (mConnection) {

                            try {
@@ -294,26 +299,15 @@ public final class BluetoothHeadset implements BluetoothProfile { 
    }



    boolean doBind() {

        try {

            return mAdapter.getBluetoothManager().bindBluetoothProfileService(

                    BluetoothProfile.HEADSET, mConnection);

        } catch (RemoteException e) {

            Log.e(TAG, "Unable to bind HeadsetService", e);

        }

        Intent intent = new Intent(IBluetoothHeadset.class.getName());

        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

        if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0,

                UserHandle.CURRENT_OR_SELF)) {

            Log.e(TAG, "Could not bind to Bluetooth Headset Service with " + intent);

            return false;

        }



    void doUnbind() {

        synchronized (mConnection) {

            if (mService != null) {

                try {

                    mAdapter.getBluetoothManager().unbindBluetoothProfileService(

                            BluetoothProfile.HEADSET, mConnection);

                } catch (RemoteException e) {

                    Log.e(TAG,"Unable to unbind HeadsetService", e);

                }

            }

        }

        return true;

    }



    /**
@@ -333,8 +327,18 @@ public final class BluetoothHeadset implements BluetoothProfile { 
                Log.e(TAG,"",e);

            }

        }



        synchronized (mConnection) {

            if (mService != null) {

                try {

                    mService = null;

                    mContext.unbindService(mConnection);

                } catch (Exception re) {

                    Log.e(TAG,"",re);

                }

            }

        }

        mServiceListener = null;

        doUnbind();

    }



    /**
@@ -990,21 +994,21 @@ public final class BluetoothHeadset implements BluetoothProfile { 
        return false;

    }



    private final IBluetoothProfileServiceConnection mConnection

            = new IBluetoothProfileServiceConnection.Stub()  {

        @Override

    private final ServiceConnection mConnection = new ServiceConnection() {

        public void onServiceConnected(ComponentName className, IBinder service) {

            if (DBG) Log.d(TAG, "Proxy object connected");

            mService = IBluetoothHeadset.Stub.asInterface(service);

            mHandler.sendMessage(mHandler.obtainMessage(

                    MESSAGE_HEADSET_SERVICE_CONNECTED));



            if (mServiceListener != null) {

                mServiceListener.onServiceConnected(BluetoothProfile.HEADSET, BluetoothHeadset.this);

            }

        }

        @Override

        public void onServiceDisconnected(ComponentName className) {

            if (DBG) Log.d(TAG, "Proxy object disconnected");

            mService = null;

            mHandler.sendMessage(mHandler.obtainMessage(

                    MESSAGE_HEADSET_SERVICE_DISCONNECTED));

            if (mServiceListener != null) {

                mServiceListener.onServiceDisconnected(BluetoothProfile.HEADSET);

            }

        }

    };
@@ -1028,25 +1032,4 @@ public final class BluetoothHeadset implements BluetoothProfile { 
    private static void log(String msg) {

        Log.d(TAG, msg);

    }



    private final Handler mHandler = new Handler(Looper.getMainLooper()) {

        @Override

        public void handleMessage(Message msg) {

            switch (msg.what) {

                case MESSAGE_HEADSET_SERVICE_CONNECTED: {

                    if (mServiceListener != null) {

                        mServiceListener.onServiceConnected(BluetoothProfile.HEADSET,

                                BluetoothHeadset.this);

                    }

                    break;

                }

                case MESSAGE_HEADSET_SERVICE_DISCONNECTED: {

                    if (mServiceListener != null) {

                        mServiceListener.onServiceDisconnected(BluetoothProfile.HEADSET);

                    }

                    break;

                }

            }

        }

    };

}

core/java/android/bluetooth/IBluetoothManager.aidl

+0 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.bluetooth; 
import android.bluetooth.IBluetooth;

import android.bluetooth.IBluetoothGatt;

import android.bluetooth.IBluetoothManagerCallback;

import android.bluetooth.IBluetoothProfileServiceConnection;

import android.bluetooth.IBluetoothStateChangeCallback;



/**
@@ -39,9 +38,6 @@ interface IBluetoothManager 
    boolean disable(boolean persist);

    IBluetoothGatt getBluetoothGatt();



    boolean bindBluetoothProfileService(int profile, IBluetoothProfileServiceConnection proxy);

    void unbindBluetoothProfileService(int profile, IBluetoothProfileServiceConnection proxy);



    String getAddress();

    String getName();

core/java/android/bluetooth/IBluetoothProfileServiceConnection.aidl

deleted100755 → 0
+0 −30
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.bluetooth;



import android.content.ComponentName;

import android.os.IBinder;



/**

 * Callback for bluetooth profile connections.

 *

 * {@hide}

 */

interface IBluetoothProfileServiceConnection {

    void onServiceConnected(in ComponentName comp, in IBinder service);

    void onServiceDisconnected(in ComponentName comp);

}

services/core/java/com/android/server/BluetoothManagerService.java

+1 −240
Original line number Diff line number Diff line
@@ -19,14 +19,12 @@ package com.android.server; 
import android.Manifest;

import android.app.ActivityManager;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.IBluetooth;

import android.bluetooth.IBluetoothCallback;

import android.bluetooth.IBluetoothGatt;

import android.bluetooth.IBluetoothHeadset;

import android.bluetooth.IBluetoothManager;

import android.bluetooth.IBluetoothManagerCallback;

import android.bluetooth.IBluetoothProfileServiceConnection;

import android.bluetooth.IBluetoothStateChangeCallback;

import android.content.BroadcastReceiver;

import android.content.ComponentName;
@@ -78,8 +76,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    private static final int ERROR_RESTART_TIME_MS = 3000;

    //Maximum msec to delay MESSAGE_USER_SWITCHED

    private static final int USER_SWITCHED_TIME_MS = 200;

    // Delay for the addProxy function in msec

    private static final int ADD_PROXY_DELAY_MS = 100;



    private static final int MESSAGE_ENABLE = 1;

    private static final int MESSAGE_DISABLE = 2;
@@ -96,8 +92,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    private static final int MESSAGE_GET_NAME_AND_ADDRESS = 200;

    private static final int MESSAGE_USER_SWITCHED = 300;

    private static final int MESSAGE_USER_UNLOCKED = 301;

    private static final int MESSAGE_ADD_PROXY_DELAYED = 400;

    private static final int MESSAGE_BIND_PROFILE_SERVICE = 401;

    private static final int MAX_SAVE_RETRIES = 3;

    private static final int MAX_ERROR_RESTART_RETRIES = 6;
@@ -146,11 +140,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    private int mErrorRecoveryRetryCounter;

    private final int mSystemUiUid;



    // Save a ProfileServiceConnections object for each of the bound

    // bluetooth profile services

    private final Map <Integer, ProfileServiceConnections> mProfileServices =

            new HashMap <Integer, ProfileServiceConnections>();



    private void registerForAirplaneMode(IntentFilter filter) {

        final ContentResolver resolver = mContext.getContentResolver();

        final String airplaneModeRadios = Settings.Global.getString(resolver,
@@ -718,69 +707,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        return mBluetoothGatt;

    }



    @Override

    public boolean bindBluetoothProfileService(int bluetoothProfile,

            IBluetoothProfileServiceConnection proxy) {

        if (!mEnable) {

            if (DBG) {

                Slog.d(TAG, "Trying to bind to profile: " + bluetoothProfile +

                        ", while Bluetooth was disabled");

            }

            return false;

        }

        synchronized (mProfileServices) {

            ProfileServiceConnections psc = mProfileServices.get(new Integer(bluetoothProfile));

            if (psc == null) {

                if (DBG) {

                    Slog.d(TAG, "Creating new ProfileServiceConnections object for"

                            + " profile: " + bluetoothProfile);

                }



                if (bluetoothProfile != BluetoothProfile.HEADSET) return false;



                Intent intent = new Intent(IBluetoothHeadset.class.getName());

                psc = new ProfileServiceConnections(intent);

                if (!psc.bindService()) return false;



                mProfileServices.put(new Integer(bluetoothProfile), psc);

            }

        }



        // Introducing a delay to give the client app time to prepare

        Message addProxyMsg = mHandler.obtainMessage(MESSAGE_ADD_PROXY_DELAYED);

        addProxyMsg.arg1 = bluetoothProfile;

        addProxyMsg.obj = proxy;

        mHandler.sendMessageDelayed(addProxyMsg, ADD_PROXY_DELAY_MS);

        return true;

    }



    @Override

    public void unbindBluetoothProfileService(int bluetoothProfile,

            IBluetoothProfileServiceConnection proxy) {

        synchronized (mProfileServices) {

            ProfileServiceConnections psc = mProfileServices.get(new Integer(bluetoothProfile));

            if (psc == null) {

                return;

            }

            psc.removeProxy(proxy);

        }

    }



    private void unbindAllBluetoothProfileServices() {

        synchronized (mProfileServices) {

            for (Integer i : mProfileServices.keySet()) {

                ProfileServiceConnections psc = mProfileServices.get(i);

                try {

                    mContext.unbindService(psc);

                } catch (IllegalArgumentException e) {

                    Slog.e(TAG, "Unable to unbind service with intent: " + psc.mIntent, e);

                }

                psc.removeAllProxies();

            }

            mProfileServices.clear();

        }

    }



    /**

     * Send enable message and set adapter name and address. Called when the boot phase becomes

     * PHASE_SYSTEM_SERVICES_READY.
@@ -813,148 +739,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        mHandler.obtainMessage(MESSAGE_USER_UNLOCKED, userHandle, 0).sendToTarget();

    }



    /**

     * This class manages the clients connected to a given ProfileService

     * and maintains the connection with that service.

     */

    final private class ProfileServiceConnections implements ServiceConnection,

            IBinder.DeathRecipient {

        final RemoteCallbackList<IBluetoothProfileServiceConnection> mProxies =

                new RemoteCallbackList <IBluetoothProfileServiceConnection>();

        IBinder mService;

        ComponentName mClassName;

        Intent mIntent;

        boolean mInvokingProxyCallbacks = false;



        ProfileServiceConnections(Intent intent) {

            mService = null;

            mClassName = null;

            mIntent = intent;

        }



        private boolean bindService() {

            if (mIntent != null && mService == null &&

                    doBind(mIntent, this, 0, UserHandle.CURRENT_OR_SELF)) {

                Message msg = mHandler.obtainMessage(MESSAGE_BIND_PROFILE_SERVICE);

                msg.obj = this;

                mHandler.sendMessageDelayed(msg, TIMEOUT_BIND_MS);

                return true;

            }

            Slog.w(TAG, "Unable to bind with intent: " + mIntent);

            return false;

        }



        private void addProxy(IBluetoothProfileServiceConnection proxy) {

            mProxies.register(proxy);

            if (mService != null) {

                try{

                    proxy.onServiceConnected(mClassName, mService);

                } catch (RemoteException e) {

                    Slog.e(TAG, "Unable to connect to proxy", e);

                }

            } else {

                if (!mHandler.hasMessages(MESSAGE_BIND_PROFILE_SERVICE, this)) {

                    Message msg = mHandler.obtainMessage(MESSAGE_BIND_PROFILE_SERVICE);

                    msg.obj = this;

                    mHandler.sendMessage(msg);

                }

            }

        }



        private void removeProxy(IBluetoothProfileServiceConnection proxy) {

            if (proxy != null) {

                if (mProxies.unregister(proxy)) {

                    try {

                        proxy.onServiceDisconnected(mClassName);

                    } catch (RemoteException e) {

                        Slog.e(TAG, "Unable to disconnect proxy", e);

                    }

                }

            } else {

                Slog.w(TAG, "Trying to remove a null proxy");

            }

        }



        private void removeAllProxies() {

            onServiceDisconnected(mClassName);

            mProxies.kill();

        }



        @Override

        public void onServiceConnected(ComponentName className, IBinder service) {

            // remove timeout message

            mHandler.removeMessages(MESSAGE_BIND_PROFILE_SERVICE, this);

            mService = service;

            mClassName = className;

            try {

                mService.linkToDeath(this, 0);

            } catch (RemoteException e) {

                Slog.e(TAG, "Unable to linkToDeath", e);

            }



            if (mInvokingProxyCallbacks) {

                Slog.e(TAG, "Proxy callbacks already in progress.");

                return;

            }

            mInvokingProxyCallbacks = true;



            final int n = mProxies.beginBroadcast();

            try {

                for (int i = 0; i < n; i++) {

                    try {

                        mProxies.getBroadcastItem(i).onServiceConnected(className, service);

                    } catch (RemoteException e) {

                        Slog.e(TAG, "Unable to connect to proxy", e);

                    }

                }

            } finally {

                mProxies.finishBroadcast();

                mInvokingProxyCallbacks = false;

            }

        }



        @Override

        public void onServiceDisconnected(ComponentName className) {

            if (mService == null) return;

            mService.unlinkToDeath(this, 0);

            mService = null;

            mClassName = null;



            if (mInvokingProxyCallbacks) {

                Slog.e(TAG, "Proxy callbacks already in progress.");

                return;

            }

            mInvokingProxyCallbacks = true;



            final int n = mProxies.beginBroadcast();

            try {

                for (int i = 0; i < n; i++) {

                    try {

                        mProxies.getBroadcastItem(i).onServiceDisconnected(className);

                    } catch (RemoteException e) {

                        Slog.e(TAG, "Unable to disconnect from proxy", e);

                    }

                }

            } finally {

                mProxies.finishBroadcast();

                mInvokingProxyCallbacks = false;

            }

        }



        @Override

        public void binderDied() {

            if (DBG) {

                Slog.w(TAG, "Profile service for profile: " + mClassName

                        + " died.");

            }

            onServiceDisconnected(mClassName);

            // Trigger rebind

            Message msg = mHandler.obtainMessage(MESSAGE_BIND_PROFILE_SERVICE);

            msg.obj = this;

            mHandler.sendMessageDelayed(msg, TIMEOUT_BIND_MS);

        }

    }



    private void sendBluetoothStateCallback(boolean isUp) {

        try {

            int n = mStateChangeCallbacks.beginBroadcast();
@@ -1241,28 +1025,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                    }

                    break;

                }

                case MESSAGE_ADD_PROXY_DELAYED:

                {

                    ProfileServiceConnections psc = mProfileServices.get(

                            new Integer(msg.arg1));

                    if (psc == null) {

                        break;

                    }

                    IBluetoothProfileServiceConnection proxy =

                            (IBluetoothProfileServiceConnection) msg.obj;

                    psc.addProxy(proxy);

                    break;

                }

                case MESSAGE_BIND_PROFILE_SERVICE:

                {

                    ProfileServiceConnections psc = (ProfileServiceConnections) msg.obj;

                    removeMessages(MESSAGE_BIND_PROFILE_SERVICE, msg.obj);

                    if (psc == null) {

                        break;

                    }

                    psc.bindService();

                    break;

                }

                case MESSAGE_BLUETOOTH_SERVICE_CONNECTED:

                {

                    if (DBG) Slog.d(TAG,"MESSAGE_BLUETOOTH_SERVICE_CONNECTED: " + msg.arg1);
@@ -1487,7 +1249,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                            bluetoothStateChangeHandler(mState, BluetoothAdapter.STATE_ON);

                        }



                        unbindAllBluetoothProfileServices();

                        // disable

                        handleDisable();

                        // Pbap service need receive STATE_TURNING_OFF intent to close