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

Commit 3fac6d37 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Replaced Bluetooth SystemProperties.set by sysprop" am: 4d612ad8 am:... 

Merge "Replaced Bluetooth SystemProperties.set by sysprop" am: 4d612ad8 am: a9e66907 am: c7484033

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

Change-Id: I6b6d7c76f16d392a18ab5aadf1d351a72a693e8c
parents 7cc80be6 c7484033

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 {