Merge "Update tests to work with SystemConfigManager" into rvc-dev

import android.os.IInterface;

import android.os.PersistableBundle;

import android.os.PowerWhitelistManager;

import android.os.SystemConfigManager;

import android.os.UserHandle;

import android.os.UserManager;

import android.preference.PreferenceManager;

                    return mDownloadManager;

                case Context.TELEPHONY_REGISTRY_SERVICE:

                    return mTelephonyRegistryManager;

                case Context.SYSTEM_CONFIG_SERVICE:

                    return mSystemConfigManager;

                case Context.BATTERY_STATS_SERVICE:

                case Context.DISPLAY_SERVICE:

                case Context.POWER_SERVICE:

                return Context.CONNECTIVITY_SERVICE;

            } else if (serviceClass == PowerWhitelistManager.class) {

                return Context.POWER_WHITELIST_MANAGER;

            } else if (serviceClass == SystemConfigManager.class) {

                return Context.SYSTEM_CONFIG_SERVICE;

            }

            return super.getSystemServiceName(serviceClass);

        }

    private final PackageInfo mPackageInfo = mock(PackageInfo.class);

    private final TelephonyRegistryManager mTelephonyRegistryManager =

        mock(TelephonyRegistryManager.class);

    private final SystemConfigManager mSystemConfigManager = mock(SystemConfigManager.class);

    private final PowerWhitelistManager mPowerWhitelistManager = mock(PowerWhitelistManager.class);

    private final ContentProvider mContentProvider = spy(new FakeContentProvider());