Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6dadc46 authored by Paul Hu's avatar Paul Hu Committed by android-build-merger
Browse files

Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am: a67ca4cf 

am: 3a728ae1

Change-Id: Id211709644b505fa866b0661f9657991c36dbaf6
parents c4c8f51b 3a728ae1

src/com/android/settings/network/TetherProvisioningActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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

 * 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}.

 */

public class TetherProvisioningActivity extends Activity {

src/com/android/settings/wifi/tether/TetherService.java

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class TetherService extends Service { 
        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;

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

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ public class TetherServiceTest extends ServiceTestCase<TetherService> { 
            responseIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

            responseIntent.putExtra(TetherService.EXTRA_RESULT, response);

            context.sendBroadcast(

                    responseIntent, android.Manifest.permission.CONNECTIVITY_INTERNAL);

                    responseIntent, android.Manifest.permission.TETHER_PRIVILEGED);

        }

    }