Renamed getNetworkId and getSystemId
1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()
Test: Build
Bug: 74976831
Merged-In: I530d94da98f75f0f232e4576ba71d7d7fb1e33df
Change-Id: I530d94da98f75f0f232e4576ba71d7d7fb1e33df
(cherry picked from commit 117a78f9fea5654258a2660346778bbf572fd7e5)
diff --git a/src/com/android/providers/telephony/ServiceStateProvider.java b/src/com/android/providers/telephony/ServiceStateProvider.java
index dcbcc6a..e589171 100644
--- a/src/com/android/providers/telephony/ServiceStateProvider.java
+++ b/src/com/android/providers/telephony/ServiceStateProvider.java
@@ -26,17 +26,13 @@
import android.net.Uri;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneFactory;
import com.android.internal.telephony.SubscriptionController;
import java.lang.NumberFormatException;
import java.util.HashMap;
-import java.util.Objects;
import static android.provider.Telephony.ServiceStateTable.getUriForSubscriptionId;
import static android.provider.Telephony.ServiceStateTable.getUriForSubscriptionIdAndField;
@@ -149,7 +145,7 @@
newSS.setRilVoiceRadioTechnology(values.getAsInteger(RIL_VOICE_RADIO_TECHNOLOGY));
newSS.setRilDataRadioTechnology(values.getAsInteger(RIL_DATA_RADIO_TECHNOLOGY));
newSS.setCssIndicator(values.getAsInteger(CSS_INDICATOR));
- newSS.setSystemAndNetworkId(values.getAsInteger(SYSTEM_ID),
+ newSS.setCdmaSystemAndNetworkId(values.getAsInteger(SYSTEM_ID),
values.getAsInteger(NETWORK_ID));
newSS.setCdmaRoamingIndicator(values.getAsInteger(CDMA_ROAMING_INDICATOR));
newSS.setCdmaDefaultRoamingIndicator(
@@ -232,8 +228,8 @@
final int ril_voice_radio_technology = ss.getRilVoiceRadioTechnology();
final int ril_data_radio_technology = ss.getRilDataRadioTechnology();
final int css_indicator = ss.getCssIndicator();
- final int network_id = ss.getNetworkId();
- final int system_id = ss.getSystemId();
+ final int network_id = ss.getCdmaNetworkId();
+ final int system_id = ss.getCdmaSystemId();
final int cdma_roaming_indicator = ss.getCdmaRoamingIndicator();
final int cdma_default_roaming_indicator = ss.getCdmaDefaultRoamingIndicator();
final int cdma_eri_icon_index = ss.getCdmaEriIconIndex();
diff --git a/tests/src/com/android/providers/telephony/ServiceStateProviderTest.java b/tests/src/com/android/providers/telephony/ServiceStateProviderTest.java
index 685d9be..fd15d01 100644
--- a/tests/src/com/android/providers/telephony/ServiceStateProviderTest.java
+++ b/tests/src/com/android/providers/telephony/ServiceStateProviderTest.java
@@ -16,31 +16,16 @@
package com.android.providers.telephony;
-import android.content.ContentResolver;
import android.content.Context;
-import android.content.Intent;
import android.content.pm.ProviderInfo;
-import android.content.res.Resources;
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
-import android.os.Binder;
-import android.os.IBinder;
-import android.os.Looper;
import android.support.test.InstrumentationRegistry;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
-import android.test.mock.MockContentProvider;
import android.test.mock.MockContentResolver;
-import android.test.mock.MockContext;
import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
-
-import com.android.internal.telephony.CarrierActionAgent;
-import com.android.internal.telephony.CommandsInterface;
-import com.android.internal.telephony.GsmCdmaPhone;
-import com.android.internal.telephony.PhoneFactory;
-import com.android.internal.telephony.ServiceStateTracker;
import org.junit.After;
import org.junit.Before;
@@ -49,11 +34,8 @@
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
-import static android.app.job.JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS;
-import static android.Manifest.permission.MODIFY_PHONE_STATE;
import static android.provider.Telephony.ServiceStateTable;
import static android.provider.Telephony.ServiceStateTable.getUriForSubscriptionId;
-import static android.provider.Telephony.ServiceStateTable.getContentValuesForServiceState;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -199,8 +181,8 @@
final int rilVoiceRadioTechnology = ss.getRilVoiceRadioTechnology();
final int rilDataRadioTechnology = ss.getRilDataRadioTechnology();
final int cssIndicator = ss.getCssIndicator();
- final int networkId = ss.getNetworkId();
- final int systemId = ss.getSystemId();
+ final int networkId = ss.getCdmaNetworkId();
+ final int systemId = ss.getCdmaSystemId();
final int cdmaRoamingIndicator = ss.getCdmaRoamingIndicator();
final int cdmaDefaultRoamingIndicator = ss.getCdmaDefaultRoamingIndicator();
final int cdmaEriIconIndex = ss.getCdmaEriIconIndex();
@@ -243,11 +225,11 @@
ServiceState oldSS = new ServiceState();
oldSS.setStateOutOfService();
- oldSS.setSystemAndNetworkId(1, 1);
+ oldSS.setCdmaSystemAndNetworkId(1, 1);
ServiceState newSS = new ServiceState();
newSS.setStateOutOfService();
- newSS.setSystemAndNetworkId(0, 0);
+ newSS.setCdmaSystemAndNetworkId(0, 0);
// Test that notifyChange is not called for these fields
boolean notifyChangeWasCalled = false;
