Change packagename to telephony
Also move it under package network, so all of them belong to
com.android.settings.network.telephony.
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I35dbdcd5cc9dab939b0a3efccc8897b9a92338d1
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ec34514..f60d99e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -131,7 +131,7 @@
android:launchMode="singleTask">
</activity>
- <activity android:name=".mobilenetwork.MobileSettingsActivity"
+ <activity android:name=".network.telephony.MobileSettingsActivity"
android:label="@string/network_settings_title"
android:theme="@style/Theme.Settings.Home"
android:launchMode="singleTask">
diff --git a/res/xml/cdma_options.xml b/res/xml/cdma_options.xml
index 046d16f..202187c 100644
--- a/res/xml/cdma_options.xml
+++ b/res/xml/cdma_options.xml
@@ -17,7 +17,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <com.android.settings.mobilenetwork.CdmaSystemSelectListPreference
+ <com.android.settings.network.telephony.CdmaSystemSelectListPreference
android:key="cdma_system_select_key"
android:title="@string/cdma_system_select_title"
android:summary="@string/cdma_system_select_summary"
@@ -25,7 +25,7 @@
android:entryValues="@array/cdma_system_select_values"
android:dialogTitle="@string/cdma_system_select_dialogtitle" />
- <com.android.settings.mobilenetwork.CdmaSubscriptionListPreference
+ <com.android.settings.network.telephony.CdmaSubscriptionListPreference
android:key="cdma_subscription_key"
android:title="@string/cdma_subscription_title"
android:summary="@string/cdma_subscription_summary"
diff --git a/res/xml/gsm_umts_options.xml b/res/xml/gsm_umts_options.xml
index 6ca9ad6..f5439a4 100644
--- a/res/xml/gsm_umts_options.xml
+++ b/res/xml/gsm_umts_options.xml
@@ -17,7 +17,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <com.android.settings.mobilenetwork.NetworkOperators
+ <com.android.settings.network.telephony.NetworkOperators
android:key="network_operators_category_key"
android:title="@string/network_operator_category"
android:persistent="false">
@@ -36,7 +36,7 @@
android:key="button_choose_network_key"
android:title="@string/choose_network_title"
android:fragment="com.android.phone.NetworkSelectSetting" />
- </com.android.settings.mobilenetwork.NetworkOperators>
+ </com.android.settings.network.telephony.NetworkOperators>
<!--We want separate APN setting from reset of settings because-->
<!--we want user to change it with caution.-->
diff --git a/res/xml/network_setting_fragment.xml b/res/xml/network_setting_fragment.xml
index 396f2e4..413e670 100644
--- a/res/xml/network_setting_fragment.xml
+++ b/res/xml/network_setting_fragment.xml
@@ -29,7 +29,7 @@
android:key="mobile_data_enable"
android:title="@string/mobile_data_settings_title"
android:summary="@string/mobile_data_settings_summary"
- settings:controller="com.android.settings.mobilenetwork.MobileDataPreferenceController"/>
+ settings:controller="com.android.settings.network.telephony.MobileDataPreferenceController"/>
<com.android.settingslib.RestrictedSwitchPreference
android:key="button_roaming_key"
@@ -38,7 +38,7 @@
android:summaryOn="@string/roaming_enable"
android:summaryOff="@string/roaming_disable"/>
- <com.android.settings.mobilenetwork.DataUsagePreference
+ <com.android.settings.network.telephony.DataUsagePreference
android:key="data_usage_summary"
android:title="@string/data_usage_title" />
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index c0e6e1c..bf5ca00 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -36,7 +36,7 @@
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.mobilenetwork.MobileSettingsActivity;
+import com.android.settings.network.telephony.MobileSettingsActivity;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.Utils;
diff --git a/src/com/android/settings/mobilenetwork/CdmaOptions.java b/src/com/android/settings/network/telephony/CdmaOptions.java
similarity index 99%
rename from src/com/android/settings/mobilenetwork/CdmaOptions.java
rename to src/com/android/settings/network/telephony/CdmaOptions.java
index fe50914..2a2d8ba 100644
--- a/src/com/android/settings/mobilenetwork/CdmaOptions.java
+++ b/src/com/android/settings/network/telephony/CdmaOptions.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.content.Intent;
import android.os.PersistableBundle;
diff --git a/src/com/android/settings/mobilenetwork/CdmaSubscriptionListPreference.java b/src/com/android/settings/network/telephony/CdmaSubscriptionListPreference.java
similarity index 98%
rename from src/com/android/settings/mobilenetwork/CdmaSubscriptionListPreference.java
rename to src/com/android/settings/network/telephony/CdmaSubscriptionListPreference.java
index 4e3767a..559ba2d 100644
--- a/src/com/android/settings/mobilenetwork/CdmaSubscriptionListPreference.java
+++ b/src/com/android/settings/network/telephony/CdmaSubscriptionListPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.content.Context;
import android.os.Bundle;
diff --git a/src/com/android/settings/mobilenetwork/CdmaSystemSelectListPreference.java b/src/com/android/settings/network/telephony/CdmaSystemSelectListPreference.java
similarity index 99%
rename from src/com/android/settings/mobilenetwork/CdmaSystemSelectListPreference.java
rename to src/com/android/settings/network/telephony/CdmaSystemSelectListPreference.java
index 3d3419f..5727a9a 100644
--- a/src/com/android/settings/mobilenetwork/CdmaSystemSelectListPreference.java
+++ b/src/com/android/settings/network/telephony/CdmaSystemSelectListPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.content.Context;
import android.os.Bundle;
diff --git a/src/com/android/settings/mobilenetwork/CellInfoUtil.java b/src/com/android/settings/network/telephony/CellInfoUtil.java
similarity index 98%
rename from src/com/android/settings/mobilenetwork/CellInfoUtil.java
rename to src/com/android/settings/network/telephony/CellInfoUtil.java
index bb5a8b4..ce382eb 100644
--- a/src/com/android/settings/mobilenetwork/CellInfoUtil.java
+++ b/src/com/android/settings/network/telephony/CellInfoUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.telephony.CellIdentity;
import android.telephony.CellIdentityCdma;
diff --git a/src/com/android/settings/mobilenetwork/DataUsagePreference.java b/src/com/android/settings/network/telephony/DataUsagePreference.java
similarity index 97%
rename from src/com/android/settings/mobilenetwork/DataUsagePreference.java
rename to src/com/android/settings/network/telephony/DataUsagePreference.java
index 05d26ed..437ba63 100644
--- a/src/com/android/settings/mobilenetwork/DataUsagePreference.java
+++ b/src/com/android/settings/network/telephony/DataUsagePreference.java
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
-import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.NetworkTemplate;
diff --git a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
similarity index 99%
rename from src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java
rename to src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
index 1ae8833..b198f92 100644
--- a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
diff --git a/src/com/android/settings/mobilenetwork/GsmUmtsOptions.java b/src/com/android/settings/network/telephony/GsmUmtsOptions.java
similarity index 98%
rename from src/com/android/settings/mobilenetwork/GsmUmtsOptions.java
rename to src/com/android/settings/network/telephony/GsmUmtsOptions.java
index 95f24fb..9b3df6b 100644
--- a/src/com/android/settings/mobilenetwork/GsmUmtsOptions.java
+++ b/src/com/android/settings/network/telephony/GsmUmtsOptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.content.Context;
import android.content.Intent;
diff --git a/src/com/android/settings/mobilenetwork/MobileDataDialogFragment.java b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
similarity index 98%
rename from src/com/android/settings/mobilenetwork/MobileDataDialogFragment.java
rename to src/com/android/settings/network/telephony/MobileDataDialogFragment.java
index 86a5518..be2da04 100644
--- a/src/com/android/settings/mobilenetwork/MobileDataDialogFragment.java
+++ b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.app.Dialog;
import android.content.Context;
diff --git a/src/com/android/settings/mobilenetwork/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
similarity index 98%
rename from src/com/android/settings/mobilenetwork/MobileDataPreferenceController.java
rename to src/com/android/settings/network/telephony/MobileDataPreferenceController.java
index c341d7e..6958a11 100644
--- a/src/com/android/settings/mobilenetwork/MobileDataPreferenceController.java
+++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.content.Context;
import android.database.ContentObserver;
diff --git a/src/com/android/settings/mobilenetwork/MobileNetworkFragment.java b/src/com/android/settings/network/telephony/MobileNetworkFragment.java
similarity index 99%
rename from src/com/android/settings/mobilenetwork/MobileNetworkFragment.java
rename to src/com/android/settings/network/telephony/MobileNetworkFragment.java
index 716a496..106d940 100644
--- a/src/com/android/settings/mobilenetwork/MobileNetworkFragment.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
@@ -62,8 +62,6 @@
import com.android.settings.search.Indexable;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
diff --git a/src/com/android/settings/mobilenetwork/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
similarity index 99%
rename from src/com/android/settings/mobilenetwork/MobileNetworkUtils.java
rename to src/com/android/settings/network/telephony/MobileNetworkUtils.java
index d5ab909..5e78e07 100644
--- a/src/com/android/settings/mobilenetwork/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
diff --git a/src/com/android/settings/mobilenetwork/MobileSettingsActivity.java b/src/com/android/settings/network/telephony/MobileSettingsActivity.java
similarity index 98%
rename from src/com/android/settings/mobilenetwork/MobileSettingsActivity.java
rename to src/com/android/settings/network/telephony/MobileSettingsActivity.java
index 4442ddf..e857871 100644
--- a/src/com/android/settings/mobilenetwork/MobileSettingsActivity.java
+++ b/src/com/android/settings/network/telephony/MobileSettingsActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.content.Intent;
import android.os.Bundle;
diff --git a/src/com/android/settings/mobilenetwork/NetworkOperatorPreference.java b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
similarity index 98%
rename from src/com/android/settings/mobilenetwork/NetworkOperatorPreference.java
rename to src/com/android/settings/network/telephony/NetworkOperatorPreference.java
index b11d52c..4b00613 100644
--- a/src/com/android/settings/mobilenetwork/NetworkOperatorPreference.java
+++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.content.Context;
import android.graphics.Color;
diff --git a/src/com/android/settings/mobilenetwork/NetworkOperators.java b/src/com/android/settings/network/telephony/NetworkOperators.java
similarity index 99%
rename from src/com/android/settings/mobilenetwork/NetworkOperators.java
rename to src/com/android/settings/network/telephony/NetworkOperators.java
index 9f0de8a..7014820 100644
--- a/src/com/android/settings/mobilenetwork/NetworkOperators.java
+++ b/src/com/android/settings/network/telephony/NetworkOperators.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.app.ProgressDialog;
import android.content.Context;
diff --git a/src/com/android/settings/mobilenetwork/NetworkScanHelper.java b/src/com/android/settings/network/telephony/NetworkScanHelper.java
similarity index 99%
rename from src/com/android/settings/mobilenetwork/NetworkScanHelper.java
rename to src/com/android/settings/network/telephony/NetworkScanHelper.java
index 234d3b3..b34e592 100644
--- a/src/com/android/settings/mobilenetwork/NetworkScanHelper.java
+++ b/src/com/android/settings/network/telephony/NetworkScanHelper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.annotation.IntDef;
import android.telephony.AccessNetworkConstants.AccessNetworkType;
diff --git a/src/com/android/settings/mobilenetwork/NetworkSelectListPreference.java b/src/com/android/settings/network/telephony/NetworkSelectListPreference.java
similarity index 99%
rename from src/com/android/settings/mobilenetwork/NetworkSelectListPreference.java
rename to src/com/android/settings/network/telephony/NetworkSelectListPreference.java
index c4d0d77..ceb0efa 100644
--- a/src/com/android/settings/mobilenetwork/NetworkSelectListPreference.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectListPreference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.app.ProgressDialog;
import android.content.Context;
diff --git a/src/com/android/settings/mobilenetwork/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
similarity index 99%
rename from src/com/android/settings/mobilenetwork/NetworkSelectSettings.java
rename to src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 20cc628..9205188 100644
--- a/src/com/android/settings/mobilenetwork/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.content.Context;
import android.os.AsyncTask;
diff --git a/src/com/android/settings/mobilenetwork/RoamingDialogFragment.java b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
similarity index 97%
rename from src/com/android/settings/mobilenetwork/RoamingDialogFragment.java
rename to src/com/android/settings/network/telephony/RoamingDialogFragment.java
index 794b993..efb91d5 100644
--- a/src/com/android/settings/mobilenetwork/RoamingDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -26,7 +26,6 @@
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index e359477..8b975b4 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -42,7 +42,7 @@
import com.android.settings.core.BasePreferenceController;
import com.android.settings.flashlight.FlashlightSliceBuilder;
import com.android.settings.location.LocationSliceBuilder;
-import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
+import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
import com.android.settings.notification.ZenModeSliceBuilder;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wifi.WifiSlice;
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index 4a4ee4d..e9e9d2c 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -19,7 +19,7 @@
import static com.android.settings.bluetooth.BluetoothSliceBuilder.ACTION_BLUETOOTH_SLICE_CHANGED;
import static com.android.settings.flashlight.FlashlightSliceBuilder
.ACTION_FLASHLIGHT_SLICE_CHANGED;
-import static com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper
+import static com.android.settings.network.telephony.Enhanced4gLteSliceHelper
.ACTION_ENHANCED_4G_LTE_CHANGED;
import static com.android.settings.notification.ZenModeSliceBuilder.ACTION_ZEN_MODE_SLICE_CHANGED;
import static com.android.settings.slices.SettingsSliceProvider.ACTION_SLIDER_CHANGED;
diff --git a/src/com/android/settings/slices/SlicesFeatureProvider.java b/src/com/android/settings/slices/SlicesFeatureProvider.java
index 5940aa4..1a9fd98 100644
--- a/src/com/android/settings/slices/SlicesFeatureProvider.java
+++ b/src/com/android/settings/slices/SlicesFeatureProvider.java
@@ -2,7 +2,7 @@
import android.content.Context;
-import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
+import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
import com.android.settings.wifi.calling.WifiCallingSliceHelper;
/**
diff --git a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
index fc2298c..39d385e 100644
--- a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
+++ b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
@@ -2,7 +2,7 @@
import android.content.Context;
-import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
+import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
import com.android.settings.wifi.calling.WifiCallingSliceHelper;
import com.android.settingslib.utils.ThreadUtils;
diff --git a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
similarity index 99%
rename from tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java
rename to tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
index 1943b36..9b6d563 100644
--- a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
import static android.app.slice.Slice.HINT_TITLE;
diff --git a/tests/robotests/src/com/android/settings/mobilenetwork/MobileDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/mobilenetwork/MobileDataPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
index 9bf9b54..2fc3d98 100644
--- a/tests/robotests/src/com/android/settings/mobilenetwork/MobileDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
diff --git a/tests/robotests/src/com/android/settings/mobilenetwork/MobileNetworkUtilsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/mobilenetwork/MobileNetworkUtilsTest.java
rename to tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
index 4b91f6d..d5c8648 100644
--- a/tests/robotests/src/com/android/settings/mobilenetwork/MobileNetworkUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
@@ -14,14 +14,13 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
diff --git a/tests/robotests/src/com/android/settings/mobilenetwork/MobileSettingsActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileSettingsActivityTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/mobilenetwork/MobileSettingsActivityTest.java
rename to tests/robotests/src/com/android/settings/network/telephony/MobileSettingsActivityTest.java
index b18676f..c5ca427 100644
--- a/tests/robotests/src/com/android/settings/mobilenetwork/MobileSettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileSettingsActivityTest.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
-import static com.android.settings.mobilenetwork.MobileSettingsActivity.MOBILE_SETTINGS_TAG;
+import static com.android.settings.network.telephony.MobileSettingsActivity.MOBILE_SETTINGS_TAG;
import static com.google.common.truth.Truth.assertThat;