From 5bf83d8e2484a53f6f154b56c3cb18d66be915e0 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Thu, 13 Dec 2018 13:37:48 -0800 Subject: Moved data settings to phone Since there are multiple DcTrackers, but we only have one set of data settings. So we need to move them from DcTracker to Phone. Test: Telephony sanity tests + unit tests Bug: 73659459 Merged-In: Ica24b708beb63156937e88198a4c915485771b0a Change-Id: Ica24b708beb63156937e88198a4c915485771b0a (cherry picked from commit 335860e44f6c7d040646be9d50c862b9c6488dec) --- config/hiddenapi-greylist.txt | 1 - telephony/java/com/android/internal/telephony/DctConstants.java | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-greylist.txt index 30e9bfbb5a93..648ff274f37c 100644 --- a/config/hiddenapi-greylist.txt +++ b/config/hiddenapi-greylist.txt @@ -2992,7 +2992,6 @@ Lcom/android/internal/telephony/dataconnection/DcTracker;->notifyOffApnsOfAvaila Lcom/android/internal/telephony/dataconnection/DcTracker;->onActionIntentDataStallAlarm(Landroid/content/Intent;)V Lcom/android/internal/telephony/dataconnection/DcTracker;->onActionIntentProvisioningApnAlarm(Landroid/content/Intent;)V Lcom/android/internal/telephony/dataconnection/DcTracker;->onRecordsLoadedOrSubIdChanged()V -Lcom/android/internal/telephony/dataconnection/DcTracker;->onSetUserDataEnabled(Z)V Lcom/android/internal/telephony/dataconnection/DcTracker;->onTrySetupData(Lcom/android/internal/telephony/dataconnection/ApnContext;)Z Lcom/android/internal/telephony/dataconnection/DcTracker;->onTrySetupData(Ljava/lang/String;)Z Lcom/android/internal/telephony/dataconnection/DcTracker;->registerSettingsObserver()V diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java index b0c875e0c6f2..0fdca5d24a20 100644 --- a/telephony/java/com/android/internal/telephony/DctConstants.java +++ b/telephony/java/com/android/internal/telephony/DctConstants.java @@ -79,10 +79,7 @@ public class DctConstants { public static final int EVENT_PS_RESTRICT_DISABLED = BASE + 23; public static final int EVENT_CLEAN_UP_CONNECTION = BASE + 24; public static final int EVENT_RESTART_RADIO = BASE + 26; - public static final int EVENT_SET_INTERNAL_DATA_ENABLE = BASE + 27; public static final int EVENT_CLEAN_UP_ALL_CONNECTIONS = BASE + 29; - public static final int CMD_SET_USER_DATA_ENABLE = BASE + 30; - public static final int CMD_SET_POLICY_DATA_ENABLE = BASE + 32; public static final int EVENT_ICC_CHANGED = BASE + 33; public static final int EVENT_DISCONNECT_DC_RETRYING = BASE + 34; public static final int EVENT_DATA_SETUP_COMPLETE_ERROR = BASE + 35; @@ -93,14 +90,12 @@ public class DctConstants { public static final int CMD_NET_STAT_POLL = BASE + 40; public static final int EVENT_DATA_RAT_CHANGED = BASE + 41; public static final int CMD_CLEAR_PROVISIONING_SPINNER = BASE + 42; - public static final int EVENT_DEVICE_PROVISIONED_CHANGE = BASE + 43; public static final int EVENT_REDIRECTION_DETECTED = BASE + 44; public static final int EVENT_PCO_DATA_RECEIVED = BASE + 45; - public static final int EVENT_SET_CARRIER_DATA_ENABLED = BASE + 46; + public static final int EVENT_DATA_ENABLED_CHANGED = BASE + 46; public static final int EVENT_DATA_RECONNECT = BASE + 47; public static final int EVENT_ROAMING_SETTING_CHANGE = BASE + 48; public static final int EVENT_DATA_SERVICE_BINDING_CHANGED = BASE + 49; - public static final int EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE = BASE + 50; /***** Constants *****/ -- cgit v1.2.3-59-g8ed1b