From 685cacb54068bedaface37de1ce706ca4ab11cfd Mon Sep 17 00:00:00 2001 From: Alex Johnston Date: Mon, 2 Aug 2021 14:16:49 +0100 Subject: [PATCH 1/2] Fix USB tether option * USB tether option will be grayed out before USB cable is plugged in. Bug: 192225597 Test: manual testing Change-Id: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e --- src/com/android/settings/TetherSettings.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index ab1c437271f..1a21b5582a9 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -55,6 +55,7 @@ import com.android.settings.core.FeatureFlags; import com.android.settings.datausage.DataSaverBackend; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.wifi.tether.WifiTetherPreferenceController; +import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.TetherUtil; import com.android.settingslib.search.SearchIndexable; @@ -425,14 +426,16 @@ public class TetherSettings extends RestrictedSettingsFragment private void updateUsbPreference() { boolean usbAvailable = mUsbConnected && !mMassStorageActive; + final RestrictedLockUtils.EnforcedAdmin enforcedAdmin = + checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId()); - if (usbAvailable) { + if (enforcedAdmin != null) { + mUsbTether.setDisabledByAdmin(enforcedAdmin); + } else if (usbAvailable) { mUsbTether.setEnabled(!mDataSaverEnabled); } else { mUsbTether.setEnabled(false); } - mUsbTether.setDisabledByAdmin( - checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId())); } @VisibleForTesting From 407a7252782ce393121519709ae55208186a1f30 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Wed, 29 Sep 2021 18:26:12 +0800 Subject: [PATCH 2/2] Use startActivity for android.settings.APP_SEARCH_SETTINGS The Activity launched by android.settings.APP_SEARCH_SETTINGS does not setResult. So it's no meaning to use startActivityForResult for the Intent. Bug: 196923591 Test: manual Settings -> Search settings -> search an item -> click back button twice and back to Settings home. Change-Id: Ia760a301465bb87814326611a1ec2368887f120a --- src/com/android/settings/search/SearchFeatureProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java index 4c39b9c0c11..05fd2aea4de 100644 --- a/src/com/android/settings/search/SearchFeatureProvider.java +++ b/src/com/android/settings/search/SearchFeatureProvider.java @@ -104,7 +104,7 @@ public interface SearchFeatureProvider { FeatureFactory.getFactory(context).getMetricsFeatureProvider() .logSettingsTileClick(KEY_HOMEPAGE_SEARCH_BAR, pageId); final Bundle bundle = ActivityOptions.makeSceneTransitionAnimation(activity).toBundle(); - activity.startActivityForResult(intent, REQUEST_CODE, bundle); + activity.startActivity(intent, bundle); }); }