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

Commit 41a24da7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7783696 from cddd334e to sc-qpr1-d-release 

Change-Id: I810702f376aeb45b34bea2de197cb5f45e0d76f2
parents bdbca48e cddd334e

src/com/android/settings/TetherSettings.java

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

src/com/android/settings/nfc/PaymentDefaultDialog.java

+5 −0
Original line number Diff line number Diff line
@@ -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) {