From 998ce931337b56eb39b3e67fc78753aef5507624 Mon Sep 17 00:00:00 2001
From: Steven Luo <steven+android@steven676.net>
Date: Thu, 1 Aug 2013 11:18:00 -0700
Subject: Update BT network interface name for Android 4.2

Change-Id: Id90d02e5707872a6a02400d60783e3647ad10a77
---
 init.herring.rc                                        | 4 ++--
 overlay/frameworks/base/core/res/res/values/config.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.herring.rc b/init.herring.rc
index accca47..9a5bc7d 100755
--- a/init.herring.rc
+++ b/init.herring.rc
@@ -120,7 +120,7 @@ service dhcpcd_uwbr0 /system/bin/dhcpcd -ABDKL
     oneshot
 
 # bluetooth
-service dhcpcd_bnep0 /system/bin/dhcpcd -ABKL
+service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
     class main
     disabled
     oneshot
@@ -139,7 +139,7 @@ service iprenew_uwbr0 /system/bin/dhcpcd -n
     oneshot
 
 # bluetooth
-service iprenew_bnep0 /system/bin/dhcpcd -n
+service iprenew_bt-pan /system/bin/dhcpcd -n
     class main
     disabled
     oneshot
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6b3ad2c..ffe5e3e 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -168,7 +168,7 @@
          bluetooth interfaces.  If the device doesn't want to support tethering over bluetooth this
          should be empty. -->
     <string-array translatable="false" name="config_tether_bluetooth_regexs">
-        <item>"bnep\\d"</item>
+        <item>"bt-pan"</item>
     </string-array>
 
     <!-- Vibrator pattern for a very short but reliable vibration for soft keyboard tap -->
-- 
cgit v1.1