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

Commit 1ab87253 authored by Ivan Podogov's avatar Ivan Podogov
Browse files

resolve merge conflicts of 43dc6e79 to master 

Test: make
Change-Id: I7d49e2c1480e3296f8de25d5e8e94db7b58dd8f5
parents 9b011937 43dc6e79

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

+11 −15
Original line number Diff line number Diff line
@@ -826,8 +826,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                        + " not in uid " + callingUid);

            }



            // Legacy apps in permission review mode trigger a user prompt

            if (applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {

            Intent intent = new Intent(intentAction);

            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName);

            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
@@ -840,11 +838,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                return false;

            }

            return true;

            }

        } catch (PackageManager.NameNotFoundException e) {

            throw new RemoteException(e.getMessage());

        }

        return false;

    }



    public void unbindAndFinish() {