diff options
| author | Matthew Xie <mattx@google.com> | 2014-06-28 01:05:09 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2014-06-28 01:05:09 -0700 |
| commit | 21492655012d6d3d521b8a49797366b434115bcf (patch) | |
| tree | a0a372e2af50d9e3c26f429d091540fb9893c294 /src/com/android/bluetooth/pan | |
| parent | 58a733190a0004177fee1c73dd829c2a602514a8 (diff) | |
| download | android_packages_apps_Bluetooth-21492655012d6d3d521b8a49797366b434115bcf.tar.gz android_packages_apps_Bluetooth-21492655012d6d3d521b8a49797366b434115bcf.tar.bz2 android_packages_apps_Bluetooth-21492655012d6d3d521b8a49797366b434115bcf.zip | |
fix a merge error in PanService
Change-Id: I63734e44ca661166da9091fae622a9e54bd24431
Diffstat (limited to 'src/com/android/bluetooth/pan')
| -rwxr-xr-x | src/com/android/bluetooth/pan/PanService.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/bluetooth/pan/PanService.java b/src/com/android/bluetooth/pan/PanService.java index 9422507de..2443864f2 100755 --- a/src/com/android/bluetooth/pan/PanService.java +++ b/src/com/android/bluetooth/pan/PanService.java @@ -109,10 +109,6 @@ public class PanService extends ProfileService { SharedPreferences tetherSetting = getSharedPreferences(PAN_PREFERENCE_FILE, 0); mTetherOn = tetherSetting.getBoolean(PAN_TETHER_SETTING, false); - // Set mTetherOn based on the last saved tethering preference while starting the Pan service - SharedPreferences tetherSetting = getSharedPreferences(PAN_PREFERENCE_FILE, 0); - mTetherOn = tetherSetting.getBoolean(PAN_TETHER_SETTING, false); - return true; } |