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

Commit 4d612ad8 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Gerrit Code Review
Browse files

Merge "Replaced Bluetooth SystemProperties.set by sysprop"

parents c2bc642b 807dc12c

core/java/android/bluetooth/BluetoothAdapter.java

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

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ResultReceiver;

import android.os.ServiceManager;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.sysprop.BluetoothProperties;

import android.util.Log;

import android.util.Log;

import android.util.Pair;

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

                return true;

            }

            }

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

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

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

            BluetoothProperties.factory_reset(true);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

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

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

        } finally {

        } finally {