am f4cc034e
: am d61c23b3
: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit 'f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98': TetheringSetting: Keep Tethering checkbox unchecked until tethering up
This commit is contained in:
committed by
Android Git Automerger
commit
43231f2d6e
@@ -497,8 +497,8 @@ public class TetherSettings extends SettingsPreferenceFragment
|
|||||||
private void setUsbTethering(boolean enabled) {
|
private void setUsbTethering(boolean enabled) {
|
||||||
ConnectivityManager cm =
|
ConnectivityManager cm =
|
||||||
(ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
|
(ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||||
if (cm.setUsbTethering(enabled) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {
|
|
||||||
mUsbTether.setChecked(false);
|
mUsbTether.setChecked(false);
|
||||||
|
if (cm.setUsbTethering(enabled) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {
|
||||||
mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
|
mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user