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

Commit d73d3a8f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove more wrappers" into pi-dev

parents 2a51657c 947a673f

src/com/android/settings/applications/appinfo/PictureInPictureSettings.java

+3 −4
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.settings.R; 
import com.android.settings.applications.AppInfoBase;

import com.android.settings.notification.EmptyTextSettings;

import com.android.settings.widget.AppPreference;

import com.android.settings.wrapper.UserManagerWrapper;

import com.android.settingslib.wrapper.PackageManagerWrapper;



import java.text.Collator;
@@ -88,7 +87,7 @@ public class PictureInPictureSettings extends EmptyTextSettings { 


    private Context mContext;

    private PackageManagerWrapper mPackageManager;

    private UserManagerWrapper mUserManager;

    private UserManager mUserManager;

    private IconDrawableFactory mIconDrawableFactory;



    /**
@@ -119,7 +118,7 @@ public class PictureInPictureSettings extends EmptyTextSettings { 
        // Do nothing

    }



    public PictureInPictureSettings(PackageManagerWrapper pm, UserManagerWrapper um) {

    public PictureInPictureSettings(PackageManagerWrapper pm, UserManager um) {

        mPackageManager = pm;

        mUserManager = um;

    }
@@ -130,7 +129,7 @@ public class PictureInPictureSettings extends EmptyTextSettings { 


        mContext = getActivity();

        mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());

        mUserManager = new UserManagerWrapper(mContext.getSystemService(UserManager.class));

        mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);

        mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);

    }

src/com/android/settings/connecteddevice/usb/UsbBackend.java

+25 −8
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ import android.hardware.usb.UsbManager; 
import android.hardware.usb.UsbPort;

import android.hardware.usb.UsbPortStatus;

import android.net.ConnectivityManager;

import android.os.UserHandle;

import android.os.UserManager;

import android.support.annotation.VisibleForTesting;



import com.android.settings.wrapper.UserManagerWrapper;



/**

 * Provides access to underlying system USB functionality.

 */
@@ -50,17 +49,17 @@ public class UsbBackend { 
    private UsbPortStatus mPortStatus;



    public UsbBackend(Context context) {

        this(context, new UserManagerWrapper(UserManager.get(context)));

        this(context, (UserManager) context.getSystemService(Context.USER_SERVICE));

    }



    @VisibleForTesting

    public UsbBackend(Context context, UserManagerWrapper userManagerWrapper) {

    public UsbBackend(Context context, UserManager userManager) {

        mUsbManager = context.getSystemService(UsbManager.class);



        mFileTransferRestricted = userManagerWrapper.isUsbFileTransferRestricted();

        mFileTransferRestrictedBySystem = userManagerWrapper.isUsbFileTransferRestrictedBySystem();

        mTetheringRestricted = userManagerWrapper.isUsbTetheringRestricted();

        mTetheringRestrictedBySystem = userManagerWrapper.isUsbTetheringRestrictedBySystem();

        mFileTransferRestricted = isUsbFileTransferRestricted(userManager);

        mFileTransferRestrictedBySystem = isUsbFileTransferRestrictedBySystem(userManager);

        mTetheringRestricted = isUsbTetheringRestricted(userManager);

        mTetheringRestrictedBySystem = isUsbTetheringRestrictedBySystem(userManager);



        mMidiSupported = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MIDI);

        ConnectivityManager cm =
@@ -172,6 +171,24 @@ public class UsbBackend { 
        return Integer.parseInt(role);

    }



    private static boolean isUsbFileTransferRestricted(UserManager userManager) {

        return userManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);

    }



    private static boolean isUsbTetheringRestricted(UserManager userManager) {

        return userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING);

    }



    private static boolean isUsbFileTransferRestrictedBySystem(UserManager userManager) {

        return userManager.hasBaseUserRestriction(

                UserManager.DISALLOW_USB_FILE_TRANSFER, UserHandle.of(UserHandle.myUserId()));

    }



    private static boolean isUsbTetheringRestrictedBySystem(UserManager userManager) {

        return userManager.hasBaseUserRestriction(

                UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.of(UserHandle.myUserId()));

    }



    private boolean areFunctionDisallowed(long functions) {

        return (mFileTransferRestricted && ((functions & UsbManager.FUNCTION_MTP) != 0

                || (functions & UsbManager.FUNCTION_PTP) != 0))

src/com/android/settings/deviceinfo/StorageDashboardFragment.java

+4 −8
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import com.android.settings.deviceinfo.storage.VolumeSizesLoader; 
import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.widget.EntityHeaderController;

import com.android.settings.wrapper.UserManagerWrapper;

import com.android.settingslib.applications.StorageStatsSource;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.deviceinfo.PrivateStorageInfo;
@@ -185,8 +184,7 @@ public class StorageDashboardFragment extends DashboardFragment 
                mVolume, new StorageManagerVolumeProvider(sm));

        controllers.add(mPreferenceController);



        UserManagerWrapper userManager =

                new UserManagerWrapper(context.getSystemService(UserManager.class));

        final UserManager userManager = context.getSystemService(UserManager.class);

        mSecondaryUsers = SecondaryUserController.getSecondaryUserControllers(context, userManager);

        controllers.addAll(mSecondaryUsers);
@@ -235,8 +233,7 @@ public class StorageDashboardFragment extends DashboardFragment 
                public List<AbstractPreferenceController> createPreferenceControllers(

                        Context context) {

                    final StorageManager sm = context.getSystemService(StorageManager.class);

                    final UserManagerWrapper userManager =

                            new UserManagerWrapper(context.getSystemService(UserManager.class));

                    final UserManager userManager = context.getSystemService(UserManager.class);

                    final List<AbstractPreferenceController> controllers = new ArrayList<>();

                    controllers.add(new StorageSummaryDonutPreferenceController(context));

                    controllers.add(new StorageItemPreferenceController(context, null /* host */,
@@ -251,9 +248,8 @@ public class StorageDashboardFragment extends DashboardFragment 
    @Override

    public Loader<SparseArray<StorageAsyncLoader.AppsStorageResult>> onCreateLoader(int id,

            Bundle args) {

        Context context = getContext();

        return new StorageAsyncLoader(context,

                new UserManagerWrapper(context.getSystemService(UserManager.class)),

        final Context context = getContext();

        return new StorageAsyncLoader(context, context.getSystemService(UserManager.class),

                mVolume.fsUuid,

                new StorageStatsSource(context),

                new PackageManagerWrapper(context.getPackageManager()));

src/com/android/settings/deviceinfo/StorageProfileFragment.java

+2 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import com.android.settings.dashboard.DashboardFragment; 
import com.android.settings.deviceinfo.storage.StorageAsyncLoader;

import com.android.settings.deviceinfo.storage.StorageAsyncLoader.AppsStorageResult;

import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;

import com.android.settings.wrapper.UserManagerWrapper;

import com.android.settingslib.applications.StorageStatsSource;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
@@ -114,9 +113,9 @@ public class StorageProfileFragment extends DashboardFragment 


    @Override

    public Loader<SparseArray<AppsStorageResult>> onCreateLoader(int id, Bundle args) {

        Context context = getContext();

        final Context context = getContext();

        return new StorageAsyncLoader(context,

                new UserManagerWrapper(context.getSystemService(UserManager.class)),

                context.getSystemService(UserManager.class),

                mVolume.fsUuid,

                new StorageStatsSource(context),

                new PackageManagerWrapper(context.getPackageManager()));

src/com/android/settings/deviceinfo/storage/SecondaryUserController.java

+3 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.deviceinfo.storage; 
import android.content.Context;

import android.content.pm.UserInfo;

import android.graphics.drawable.Drawable;

import android.os.UserManager;

import android.support.annotation.NonNull;

import android.support.annotation.Nullable;

import android.support.annotation.VisibleForTesting;
@@ -29,7 +30,6 @@ import android.util.SparseArray; 
import com.android.settings.Utils;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.deviceinfo.StorageItemPreference;

import com.android.settings.wrapper.UserManagerWrapper;

import com.android.settingslib.core.AbstractPreferenceController;



import java.util.ArrayList;
@@ -61,7 +61,7 @@ public class SecondaryUserController extends AbstractPreferenceController implem 
     * @param userManager UserManagerWrapper for figuring out which controllers to add.

     */

    public static List<AbstractPreferenceController> getSecondaryUserControllers(

            Context context, UserManagerWrapper userManager) {

            Context context, UserManager userManager) {

        List<AbstractPreferenceController> controllers = new ArrayList<>();

        UserInfo primaryUser = userManager.getPrimaryUser();

        boolean addedUser = false;
@@ -74,8 +74,7 @@ public class SecondaryUserController extends AbstractPreferenceController implem 


            if (info == null || Utils.isProfileOf(primaryUser, info)) {

                controllers.add(

                        new UserProfileController(

                                context, info, userManager, USER_PROFILE_INSERTION_LOCATION));

                        new UserProfileController(context, info, USER_PROFILE_INSERTION_LOCATION));

                continue;

            }