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

Commit 22e2d77b authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Merge "Remove unused references to android.app.ActivityThread in... 

Merge "Remove unused references to android.app.ActivityThread in BluetoothAdapter" am: 202ab8ff am: e768d3d4 am: 5cf0381c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920977

Change-Id: I7a3d708119d2bf05cee4d9963559622171e1c3af
parents 1f87797c 5cf0381c

core/java/android/bluetooth/BluetoothAdapter.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ import android.annotation.SdkConstant; 
import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SuppressLint;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.app.ActivityThread;

import android.app.PropertyInvalidatedCache;

import android.app.PropertyInvalidatedCache;

import android.bluetooth.BluetoothDevice.Transport;

import android.bluetooth.BluetoothDevice.Transport;

import android.bluetooth.BluetoothProfile.ConnectionPolicy;

import android.bluetooth.BluetoothProfile.ConnectionPolicy;
@@ -990,7 +989,6 @@ public final class BluetoothAdapter { 
        if (!isBleScanAlwaysAvailable()) {

        if (!isBleScanAlwaysAvailable()) {

            return false;

            return false;

        }

        }

        String packageName = ActivityThread.currentPackageName();

        try {

        try {

            return mManagerService.disableBle(mAttributionSource, mToken);

            return mManagerService.disableBle(mAttributionSource, mToken);

        } catch (RemoteException e) {

        } catch (RemoteException e) {
@@ -1037,7 +1035,6 @@ public final class BluetoothAdapter { 
        if (!isBleScanAlwaysAvailable()) {

        if (!isBleScanAlwaysAvailable()) {

            return false;

            return false;

        }

        }

        String packageName = ActivityThread.currentPackageName();

        try {

        try {

            return mManagerService.enableBle(mAttributionSource, mToken);

            return mManagerService.enableBle(mAttributionSource, mToken);

        } catch (RemoteException e) {

        } catch (RemoteException e) {