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

Commit b47f68cf authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Android (Google) Code Review
Browse files

Merge "Replaced Bluetooth SystemProperties.set by sysprop"

parents 484a8790 f636a314

core/java/android/bluetooth/BluetoothAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,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;
@@ -1351,7 +1351,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 {