Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"

am: a67ca4cfd7

Change-Id: I7a2a4d76d1e0092188121d390c75c12eac20cdab

diff --cc src/com/android/settings/network/TetherProvisioningActivity.java
Simple merge

diff --cc src/com/android/settings/wifi/tether/TetherService.java
index 058bba7,235c2cc..e01a246
--- 1/src/com/android/settings/wifi/tether/TetherService.java
--- 2/src/com/android/settings/wifi/tether/TetherService.java
+++ b/src/com/android/settings/wifi/tether/TetherService.java
@@@ -85,10 -85,10 +85,10 @@@ public class TetherService extends Serv
      public void onCreate() {
          super.onCreate();
          if (DEBUG) Log.d(TAG, "Creating TetherService");
 -        String provisionResponse = getResourceForDefaultDataSubId().getString(
 +        String provisionResponse = getResourceForActiveDataSubId().getString(
                  com.android.internal.R.string.config_mobile_hotspot_provision_response);
          registerReceiver(mReceiver, new IntentFilter(provisionResponse),
-                 android.Manifest.permission.CONNECTIVITY_INTERNAL, null);
+                 android.Manifest.permission.TETHER_PRIVILEGED, null);
          SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
          mCurrentTethers = stringToTethers(prefs.getString(KEY_TETHERS, ""));
          mCurrentTypeIndex = 0;

diff --cc tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
Simple merge