summaryrefslogtreecommitdiff
path: root/telephony/java/com
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2020-03-22 02:41:25 -0700
committerJack Yu <jackyu@google.com>2020-04-19 00:25:09 -0700
commit7d7adf75e03b11ce45b859b936d0429bb8b769da (patch)
tree8000420823f9e7bf1e8529ad6d580352afea5f27 /telephony/java/com
parentca4379a86670ee67f3563a0e6cb8e91c1411a5c1 (diff)
Get rid of SIM record access in DcTracker
DcTracker uses several SIM related signals for different purposes. Those signals include SIM record loaded/not-loaded, subscription changed event, and carrier config changed event. Those signals are slightly different but not that really important to DcTracker. What DcTracker cares is 1. Whether SIM is inserted or not. 2. Whether configuration changes or not. By listening to a single carrier config change event can handle the cases above. Removed all SIM record related places in DcTracker. SIM record should not be accessed by anyone outside of UICC controller. Test: Manual test + unit tests Bug: 146168348 Merged-In: Iad45933ea77eb460625a891071535cbeaf8ac3b0 Change-Id: Iad45933ea77eb460625a891071535cbeaf8ac3b0 (cherry picked from commit df3001b935c4ed556f5fcc79c3e73f2b5ac4daf2)
Diffstat (limited to 'telephony/java/com')
-rw-r--r--telephony/java/com/android/internal/telephony/DctConstants.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java
index 3e1d72c7eeb8..2b1d9e58c4d5 100644
--- a/telephony/java/com/android/internal/telephony/DctConstants.java
+++ b/telephony/java/com/android/internal/telephony/DctConstants.java
@@ -74,7 +74,6 @@ public class DctConstants {
public static final int BASE = Protocol.BASE_DATA_CONNECTION_TRACKER;
public static final int EVENT_DATA_SETUP_COMPLETE = BASE + 0;
public static final int EVENT_RADIO_AVAILABLE = BASE + 1;
- public static final int EVENT_RECORDS_LOADED = BASE + 2;
public static final int EVENT_TRY_SETUP_DATA = BASE + 3;
public static final int EVENT_RADIO_OFF_OR_NOT_AVAILABLE = BASE + 6;
public static final int EVENT_VOICE_CALL_STARTED = BASE + 7;
@@ -94,7 +93,6 @@ public class DctConstants {
public static final int EVENT_CLEAN_UP_CONNECTION = BASE + 24;
public static final int EVENT_RESTART_RADIO = BASE + 26;
public static final int EVENT_CLEAN_UP_ALL_CONNECTIONS = BASE + 29;
- public static final int EVENT_ICC_CHANGED = BASE + 33;
public static final int EVENT_DATA_SETUP_COMPLETE_ERROR = BASE + 35;
public static final int CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA = BASE + 36;
public static final int CMD_ENABLE_MOBILE_PROVISIONING = BASE + 37;
@@ -114,7 +112,7 @@ public class DctConstants {
public static final int EVENT_SERVICE_STATE_CHANGED = BASE + 52;
public static final int EVENT_5G_TIMER_HYSTERESIS = BASE + 53;
public static final int EVENT_5G_TIMER_WATCHDOG = BASE + 54;
- public static final int EVENT_UPDATE_CARRIER_CONFIGS = BASE + 55;
+ public static final int EVENT_CARRIER_CONFIG_CHANGED = BASE + 55;
/***** Constants *****/