PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am: a67ca4cfd7 am: 3a728ae13b

Browse Source 
am: a6dadc465b

Change-Id: I08a04f4e627ce876a3cabd194a9838a0b5ce8459
This commit is contained in:
Paul Hu
2019-10-01 03:15:14 -07:00
committed by android-build-merger
parent beb37b072f a6dadc465b
commit 67fe04814d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/TetherProvisioningActivity.java
View File

@@ -32,7 +32,7 @@ import com.android.settings.Utils;
/** /**
* Activity which acts as a proxy to the tether provisioning app for sanity checks and permission * Activity which acts as a proxy to the tether provisioning app for sanity checks and permission
* restrictions. Specifically, the provisioning apps require * restrictions. Specifically, the provisioning apps require
* {@link android.permission.CONNECTIVITY_INTERNAL}, while this activity can be started by a caller * {@link android.permission.TETHER_PRIVILEGED}, while this activity can be started by a caller
* with {@link android.permission.TETHER_PRIVILEGED}. * with {@link android.permission.TETHER_PRIVILEGED}.
*/ */
public class TetherProvisioningActivity extends Activity { public class TetherProvisioningActivity extends Activity {

2
src/com/android/settings/wifi/tether/TetherService.java
View File

@@ -88,7 +88,7 @@ public class TetherService extends Service {
String provisionResponse = getResourceForActiveDataSubId().getString( String provisionResponse = getResourceForActiveDataSubId().getString(
com.android.internal.R.string.config_mobile_hotspot_provision_response); com.android.internal.R.string.config_mobile_hotspot_provision_response);
registerReceiver(mReceiver, new IntentFilter(provisionResponse), registerReceiver(mReceiver, new IntentFilter(provisionResponse),
android.Manifest.permission.CONNECTIVITY_INTERNAL, null); android.Manifest.permission.TETHER_PRIVILEGED, null);
SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE); SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
mCurrentTethers = stringToTethers(prefs.getString(KEY_TETHERS, "")); mCurrentTethers = stringToTethers(prefs.getString(KEY_TETHERS, ""));
mCurrentTypeIndex = 0; mCurrentTypeIndex = 0;

2
tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
View File

@@ -431,7 +431,7 @@ public class TetherServiceTest extends ServiceTestCase<TetherService> {
responseIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND); responseIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
responseIntent.putExtra(TetherService.EXTRA_RESULT, response); responseIntent.putExtra(TetherService.EXTRA_RESULT, response);
context.sendBroadcast( context.sendBroadcast(
responseIntent, android.Manifest.permission.CONNECTIVITY_INTERNAL); responseIntent, android.Manifest.permission.TETHER_PRIVILEGED);
} }
} }