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

Commit 9102f456 authored by Roopa Sattiraju's avatar Roopa Sattiraju Committed by Android (Google) Code Review
Browse files

Merge "Changing server location to com.android.server.bluetooth"

parents 52144578 6f436808

service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.bluetooth;



import android.annotation.RequiresPermission;

import android.content.Context;
@@ -37,7 +37,7 @@ import com.android.internal.annotations.VisibleForTesting; 
 *   2. Bluetooth Hearing Aid profile is connected.

 *   3. Bluetooth LE Audio is connected

 */

class BluetoothAirplaneModeListener {

public class BluetoothAirplaneModeListener {

    private static final String TAG = "BluetoothAirplaneModeListener";

    @VisibleForTesting static final String TOAST_COUNT = "bluetooth_airplane_toast_count";

service/java/com/android/server/bluetooth/BluetoothDeviceConfigListener.java

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.bluetooth;



import android.provider.DeviceConfig;

import android.util.Log;
@@ -30,7 +30,7 @@ import java.util.ArrayList; 
 *   1. Bluetooth A2DP is connected.

 *   2. Bluetooth Hearing Aid profile is connected.

 */

class BluetoothDeviceConfigListener {

public class BluetoothDeviceConfigListener {

    private static final String TAG = "BluetoothDeviceConfigListener";



    private final BluetoothManagerService mService;

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

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.bluetooth;



import static android.Manifest.permission.BLUETOOTH_CONNECT;

import static android.os.PowerExemptionManager.TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED;
@@ -88,6 +88,7 @@ import android.util.proto.ProtoOutputStream; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.modules.utils.SynchronousResultReceiver;

import com.android.server.BluetoothManagerServiceDumpProto;



import java.io.FileDescriptor;

import java.io.FileOutputStream;
@@ -104,7 +105,7 @@ import java.util.concurrent.ConcurrentHashMap; 
import java.util.concurrent.TimeoutException;

import java.util.concurrent.locks.ReentrantReadWriteLock;



class BluetoothManagerService extends IBluetoothManager.Stub {

public class BluetoothManagerService extends IBluetoothManager.Stub {

    private static final String TAG = "BluetoothManagerService";

    private static final boolean DBG = true;

service/java/com/android/server/bluetooth/BluetoothModeChangeHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.bluetooth;



import android.annotation.RequiresPermission;

import android.bluetooth.BluetoothA2dp;

service/java/com/android/server/bluetooth/BluetoothService.java

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.bluetooth;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -22,9 +22,10 @@ import android.bluetooth.BluetoothAdapter; 
import android.content.Context;

import android.os.UserManager;



import com.android.server.SystemService;

import com.android.server.SystemService.TargetUser;



class BluetoothService extends SystemService {

public class BluetoothService extends SystemService {

    private BluetoothManagerService mBluetoothManagerService;

    private boolean mInitialized = false;