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

Commit 2d65acb4 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Gerrit Code Review
Browse files

Merge "Replaced Bluetooth SystemProperties.set by sysprop"

parents 7c3c05e7 cc2d01f2

framework/java/android/bluetooth/BluetoothAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import android.os.ParcelUuid; 
import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.sysprop.BluetoothProperties;

import android.util.Log;

import android.util.Pair;
@@ -1337,7 +1337,7 @@ public final class BluetoothAdapter { 
                return true;

            }

            Log.e(TAG, "factoryReset(): Setting persist.bluetooth.factoryreset to retry later");

            SystemProperties.set("persist.bluetooth.factoryreset", "true");

            BluetoothProperties.factory_reset(true);

        } catch (RemoteException e) {

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

        } finally {