PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02 am: c27980c1a9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941

Change-Id: I8efdc871c29a6c56aacf7a1b553a20c9cafc765d
This commit is contained in:
Bonian Chen
2021-03-16 14:45:42 +00:00
committed by Automerger Merge Worker
parent e30a49423b c27980c1a9
commit d42d9a41f6
57 changed files with 35 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/datausage/AppDataUsageActivity.java
View File

@@ -17,7 +17,6 @@ package com.android.settings.datausage;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.provider.Settings;
import android.util.Log;
import com.android.settings.R;

1
src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
View File

@@ -42,7 +42,6 @@ import java.util.ArrayList;
import java.util.Set;
import java.util.TreeSet;
public class UnrestrictedDataAccessPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnStart, OnStop, OnDestroy, ApplicationsState.Callbacks,
AppStateBaseBridge.Callback, Preference.OnPreferenceChangeListener {

2
src/com/android/settings/deviceinfo/MigrateEstimateTask.java
View File

@@ -29,9 +29,9 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
import android.util.Log;
import android.text.format.DateUtils;
import android.text.format.Formatter;
import android.util.Log;
import java.io.IOException;
import java.util.UUID;

2
src/com/android/settings/deviceinfo/PercentageBarChart.java
View File

@@ -143,7 +143,7 @@ public class PercentageBarChart extends View {
/**
* Adds a new slice to the percentage bar chart. Callers are responsible for
* later calling {@link #invalidate()}.
*
*
* @param percentage the total width that
* @param color the color to draw the entry
*/

1
src/com/android/settings/deviceinfo/StorageVolumePreference.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.deviceinfo;
import android.app.usage.StorageStatsManager;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;

6
src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java
View File

@@ -17,18 +17,12 @@
package com.android.settings.deviceinfo.firmwareversion;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class FirmwareVersionSettings extends DashboardFragment {

6
src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java
View File

@@ -18,18 +18,12 @@ package com.android.settings.deviceinfo.hardwareinfo;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class HardwareInfoFragment extends DashboardFragment {

1
src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java
View File

@@ -27,7 +27,6 @@ import com.android.settings.core.BasePreferenceController;
import java.util.List;
public abstract class LegalPreferenceController extends BasePreferenceController {
private final PackageManager mPackageManager;
private Preference mPreference;

6
src/com/android/settings/network/AllowedNetworkTypesListener.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.network;
import android.content.Context;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import android.util.Log;
@@ -27,7 +26,6 @@ import androidx.annotation.VisibleForTesting;
import java.util.Map;
import java.util.concurrent.Executor;
/**
* {@link TelephonyCallback} to listen to Allowed Network Types changed
*/
@@ -50,7 +48,7 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements
}
/**
* Register a PhoneStateListener for Allowed Network Types changed.
* Register a TelephonyCallback for Allowed Network Types changed.
* @param context the Context
* @param subId the subscription id.
*/
@@ -61,7 +59,7 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements
}
/**
* Unregister a PhoneStateListener for Allowed Network Types changed.
* Unregister a TelephonyCallback for Allowed Network Types changed.
* @param context the Context
* @param subId the subscription id.
*/

12
src/com/android/settings/network/MobileNetworkListController.java
View File

@@ -26,6 +26,12 @@ import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.util.ArrayMap;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.network.telephony.MobileNetworkActivity;
@@ -35,12 +41,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
import java.util.Map;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
/**
* This populates the entries on a page which lists all available mobile subscriptions. Each entry
* has the name of the subscription with some subtext giving additional detail, and clicking on the

1
src/com/android/settings/network/MobilePlanPreferenceController.java
View File

@@ -47,7 +47,6 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
import java.util.List;
public class MobilePlanPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {

1
src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
View File

@@ -23,7 +23,6 @@ import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;

1
src/com/android/settings/network/VpnPreferenceController.java
View File

@@ -47,7 +47,6 @@ import com.android.settingslib.utils.ThreadUtils;
import java.util.List;
public class VpnPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {

1
src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
import android.telephony.ims.ImsMmTelManager;
import android.util.Log;
/**
* An {@link ImsQuery} for accessing IMS user setting for enhanced 4G LTE
*/

1
src/com/android/settings/network/ims/ImsQueryProvisioningStat.java
View File

@@ -21,7 +21,6 @@ import android.telephony.ims.feature.MmTelFeature;
import android.telephony.ims.stub.ImsRegistrationImplBase;
import android.util.Log;
/**
* An {@link ImsQuery} for accessing IMS provision stat
*/

1
src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
import android.telephony.ims.ImsMmTelManager;
import android.util.Log;
/**
* An {@link ImsQuery} for accessing IMS tty on VoLte stat
*/

1
src/com/android/settings/network/ims/ImsQueryVtUserSetting.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
import android.telephony.ims.ImsMmTelManager;
import android.util.Log;
/**
* An {@link ImsQuery} for accessing IMS VT enabled settings from user
*/

1
src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
import android.telephony.ims.ImsMmTelManager;
import android.util.Log;
/**
* An {@link ImsQuery} for accessing IMS WFC enabled settings from user
*/

2
src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java
View File

@@ -22,11 +22,9 @@ import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.telephony.ims.ImsManager;
import android.telephony.ims.ImsRcsManager;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

1
src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
View File

@@ -37,7 +37,6 @@ import androidx.preference.SwitchPreference;
import com.android.settings.network.SubscriptionUtil;
/**
* Controller for the "Contact Discovery" option present in MobileNetworkSettings.
*/

1
src/com/android/settings/network/telephony/MobileDataDialogFragment.java
View File

@@ -29,7 +29,6 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
* Dialog Fragment to show dialog for "mobile data"
*

1
src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
View File

@@ -28,7 +28,6 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settings.utils.AnnotationSpan;
import com.android.settingslib.HelpUtils;
/**
* Class to show the footer that can't connect to 5G when device is in DSDS mode.
*/

2
src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java
View File

@@ -20,8 +20,6 @@
*/
package com.android.settings.network.telephony;
import android.content.Context;
public interface TelephonyAvailabilityHandler {
/**

1
src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
View File

@@ -41,7 +41,6 @@ import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.network.telephony.NetworkSelectSettings;
import com.android.settings.network.telephony.TelephonyBasePreferenceController;
/**
* Preference controller for "Open network select"
*/

1
src/com/android/settings/sim/CallsSimListDialogFragment.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.sim;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.SubscriptionInfo;

1
src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java
View File

@@ -27,6 +27,7 @@ import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
import java.util.List;
/*
* Connects info of apps that change wifi state to the ApplicationsState. Wraps around the generic
* AppStateAppOpsBridge class to tailor to the semantics of CHANGE_WIFI_STATE. Also provides app

1
src/com/android/settings/wifi/NetworkRequestDialogFragment.java
View File

@@ -22,7 +22,6 @@ import android.content.DialogInterface;
import android.graphics.drawable.Drawable;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
import android.text.TextUtils;

1
src/com/android/settings/wifi/WifiAPITest.java
View File

@@ -32,7 +32,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
/**
* Provide an interface for testing out the Wifi API
*/

1
src/com/android/settings/wifi/WifiConfigInfo.java
View File

@@ -26,7 +26,6 @@ import com.android.settings.R;
import java.util.List;
/**
* Configuration details saved by the user on the WifiSettings screen
*/

1
src/com/android/settings/wifi/WifiDialogActivity.java
View File

@@ -22,7 +22,6 @@ import android.content.Intent;
import android.net.NetworkInfo;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.ActionListener;
import android.os.Bundle;
import android.util.Log;

1
src/com/android/settings/wifi/WifiInfo.java
View File

@@ -22,7 +22,6 @@ import android.os.Bundle;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
/**
* Wifi information menu item on the diagnostic screen
*/

1
src/com/android/settings/wifi/WifiStatusTest.java
View File

@@ -45,7 +45,6 @@ import java.net.URL;
import java.net.UnknownHostException;
import java.util.List;
/**
* Show the current status details of Wifi related fields
*/

2
src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java
View File

@@ -30,7 +30,9 @@ import android.widget.ArrayAdapter;
import android.widget.ListAdapter;
import android.widget.RadioButton;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog.Builder;
import com.android.settings.CustomListPreference;
import com.android.settings.R;

4
src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
View File

@@ -18,9 +18,9 @@ package com.android.settings.wifi.calling;
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
import static com.android.settings.slices.CustomSliceRegistry.WIFI_CALLING_PREFERENCE_URI;
import static com.android.settings.slices.CustomSliceRegistry.WIFI_CALLING_URI;
import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
import android.app.PendingIntent;
import android.content.ComponentName;
@@ -43,7 +43,6 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
import com.android.ims.ImsConfig;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.network.ims.WifiCallingQueryImsState;
@@ -57,7 +56,6 @@ import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
/**
* Helper class to control slices for wifi calling settings.
*/

1
src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
View File

@@ -27,7 +27,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.wifi.WifiDialog2;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.wifitrackerlib.WifiEntry;
/**

1
src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
View File

@@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.wifi.WifiDialog2;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.wifitrackerlib.WifiEntry;
/**

2
src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
View File

@@ -20,8 +20,6 @@ import android.content.Context;
import android.net.Uri;
import android.os.SystemClock;
import com.android.settings.slices.SliceBackgroundWorker;
/**
* {@link SliceBackgroundWorker} for Wi-Fi, used by {@link ContextualWifiSlice}.
*/

2
tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
View File

@@ -35,10 +35,10 @@ import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList;
import java.util.List;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class RegulatoryInfoPreferenceControllerTest {

2
tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
View File

@@ -34,10 +34,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList;
import java.util.List;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class StorageSettingsTest {

1
tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java
View File

@@ -39,7 +39,6 @@ import org.robolectric.annotation.Config;
import java.util.Arrays;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowConnectivityManager.class)
public class BasebandVersionPreferenceControllerTest {

1
tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
View File

@@ -34,7 +34,6 @@ import static com.android.settings.deviceinfo.simstatus.SimStatusDialogControlle
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_LABEL_ID;
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_VALUE_ID;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;

1
tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.eq;

8
tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java
View File

@@ -39,6 +39,10 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.euicc.EuiccManager;
import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -52,10 +56,6 @@ import org.robolectric.RuntimeEnvironment;
import java.util.Arrays;
import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@RunWith(RobolectricTestRunner.class)
public class MobileNetworkListControllerTest {
@Mock

1
tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java
View File

@@ -33,7 +33,6 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
public class MobileNetworkListFragmentTest {
@Mock

2
tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
View File

@@ -60,8 +60,8 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

1
tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
View File

@@ -15,7 +15,6 @@
*/
package com.android.settings.sim;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_INCOMING_MMS;
import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_OUTGOING_MMS;

2
tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
View File

@@ -24,14 +24,12 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
import android.telephony.SubscriptionManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;

1
tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java
View File

@@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify;
import android.content.Context;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import org.junit.Before;

13
tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java
View File

@@ -16,10 +16,11 @@
package com.android.settings.wifi.calling;
import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
.DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE;
import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
.DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_DESCRIPTION;
import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
.DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
@@ -33,11 +34,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.android.settings.R;
import java.util.ArrayList;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,6 +41,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
public class DisclaimerItemListAdapterTest {

6
tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java
View File

@@ -17,10 +17,10 @@
package com.android.settings.wifi.calling;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -29,11 +29,9 @@ import android.content.SharedPreferences;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import com.android.settings.R;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;

8
tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java
View File

@@ -17,12 +17,10 @@
package com.android.settings.wifi.calling;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -31,11 +29,9 @@ import android.content.SharedPreferences;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import com.android.settings.R;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;

4
tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.wifi.calling;
import static junit.framework.Assert.assertEquals;
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
import static com.google.common.truth.Truth.assertThat;
import static junit.framework.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;

2
tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.wifi.tether;
import static org.mockito.ArgumentMatchers.anyString;;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

1
tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
View File

@@ -41,7 +41,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
public class MultiNetworkHeaderControllerTest {
private static final String KEY_HEADER = "multi_network_header";

1
tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
View File

@@ -38,7 +38,6 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
public class EuiccPreferenceControllerTest {
private static final int SUB_ID = 2;

1
tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
View File

@@ -46,7 +46,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
public class MobileDataPreferenceControllerTest {
private static final int SUB_ID = 2;

1
tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.vpn2;
import static com.android.settings.vpn2.AppManagementFragment.appHasVpnPermission;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.when;