commit e396c2241ff629bcfd60bd3caf3fe2da7637dee6
author Ajay Panicker <apanicke@google.com> Wed Aug 05 18:26:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 05 18:26:05 2015 +0000
tree 283df27857292e77e505d0b90156eb9970b27f3d
parent 4734d829cd72acc70f24af88a3780c29d410af2d
parent f1ffec39b64d85b361f7814690fd5eec0a176f51

am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit 'f1ffec39b64d85b361f7814690fd5eec0a176f51':
  Implement Bluetooth settings factory reset (5/5)

src/com/android/settings/ResetNetworkConfirm.java

diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 7762b89..db4b9a5 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -18,6 +18,7 @@
 
 import android.app.Fragment;
 import android.content.Context;
+import android.bluetooth.BluetoothManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkPolicyManager;
 import android.net.wifi.WifiManager;
@@ -93,6 +94,12 @@
                 policyManager.factoryReset(subscriberId);
             }
 
+            BluetoothManager btManager = (BluetoothManager)
+                    context.getSystemService(Context.BLUETOOTH_SERVICE);
+            if (btManager != null) {
+                btManager.getAdapter().factoryReset();
+            }
+
             Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                     .show();
         }