From b2c03474c459a694e2f434160a6c3da17f5b1a4f Mon Sep 17 00:00:00 2001 From: Alisher Alikhodjaev Date: Mon, 13 Sep 2021 17:00:30 -0700 Subject: [PATCH 1/2] PaymentDefaultDialog Could be Overlaid Settings#PaymentDefaultDialog Could be Overlaid to Trick User into Updating Default Payment App Bug: 180104327 Test: build ok Change-Id: Ia7786d05aae8e38a11bd73d02200640cb614e88a --- src/com/android/settings/nfc/PaymentDefaultDialog.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/nfc/PaymentDefaultDialog.java b/src/com/android/settings/nfc/PaymentDefaultDialog.java index 1aa8dca9bd1..d5a86a8037c 100644 --- a/src/com/android/settings/nfc/PaymentDefaultDialog.java +++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java @@ -30,6 +30,8 @@ import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; import java.util.List; +import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + public final class PaymentDefaultDialog extends AlertActivity implements DialogInterface.OnClickListener { @@ -42,6 +44,9 @@ public final class PaymentDefaultDialog extends AlertActivity implements @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); + try { mBackend = new PaymentBackend(this); } catch (NullPointerException e) { From 685cacb54068bedaface37de1ce706ca4ab11cfd Mon Sep 17 00:00:00 2001 From: Alex Johnston Date: Mon, 2 Aug 2021 14:16:49 +0100 Subject: [PATCH 2/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