From f49d54c200cf35abc80d47185524aed2fe1dbeae Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Mon, 26 Nov 2018 11:20:26 -0800 Subject: [PATCH] Support multiple DcTracker for IWLAN refactoring If the device is configured as AP-assited mode, multiple DcTrackers will be created for each corresponding data service. For legacy mode, only one DcTracker will be created. Test: Unit tests and telephony sanity tests Bug: 73659459 Merged-In: I9f6afd65093dd1c65841466c6ff063717bb5bdaa Change-Id: I9f6afd65093dd1c65841466c6ff063717bb5bdaa (cherry picked from commit 21096187156c0b2e40d1e943cb250fbdca9de022) --- config/hiddenapi-light-greylist.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index ab7b24867026e..da5c98848254d 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -2773,7 +2773,6 @@ Lcom/android/internal/telephony/dataconnection/DcTracker;->onRecordsLoadedOrSubI 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;->registerForAllDataDisconnected(Landroid/os/Handler;ILjava/lang/Object;)V Lcom/android/internal/telephony/dataconnection/DcTracker;->registerSettingsObserver()V Lcom/android/internal/telephony/dataconnection/DcTracker;->resetPollStats()V Lcom/android/internal/telephony/dataconnection/DcTracker;->restartDataStallAlarm()V @@ -2787,7 +2786,6 @@ Lcom/android/internal/telephony/dataconnection/DcTracker;->startNetStatPoll()V Lcom/android/internal/telephony/dataconnection/DcTracker;->stopDataStallAlarm()V Lcom/android/internal/telephony/dataconnection/DcTracker;->stopNetStatPoll()V Lcom/android/internal/telephony/dataconnection/DcTracker;->unregisterForAllDataDisconnected(Landroid/os/Handler;)V -Lcom/android/internal/telephony/dataconnection/DcTracker;->updateRecords()V Lcom/android/internal/telephony/DctConstants$Activity;->DATAIN:Lcom/android/internal/telephony/DctConstants$Activity; Lcom/android/internal/telephony/DctConstants$Activity;->DATAINANDOUT:Lcom/android/internal/telephony/DctConstants$Activity; Lcom/android/internal/telephony/DctConstants$Activity;->DATAOUT:Lcom/android/internal/telephony/DctConstants$Activity; @@ -3278,7 +3276,6 @@ Lcom/android/internal/telephony/Phone;->isVolteEnabled()Z Lcom/android/internal/telephony/Phone;->isWifiCallingEnabled()Z Lcom/android/internal/telephony/Phone;->mCi:Lcom/android/internal/telephony/CommandsInterface; Lcom/android/internal/telephony/Phone;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/Phone;->mDcTracker:Lcom/android/internal/telephony/dataconnection/DcTracker; Lcom/android/internal/telephony/Phone;->mIccRecords:Ljava/util/concurrent/atomic/AtomicReference; Lcom/android/internal/telephony/Phone;->mImsPhone:Lcom/android/internal/telephony/Phone; Lcom/android/internal/telephony/Phone;->mMmiRegistrants:Landroid/os/RegistrantList; @@ -3371,7 +3368,6 @@ Lcom/android/internal/telephony/ProxyController;->mOldRadioAccessFamily:[I Lcom/android/internal/telephony/ProxyController;->mRadioCapabilitySessionId:I Lcom/android/internal/telephony/ProxyController;->mSetRadioAccessFamilyStatus:[I Lcom/android/internal/telephony/ProxyController;->mUniqueIdGenerator:Ljava/util/concurrent/atomic/AtomicInteger; -Lcom/android/internal/telephony/ProxyController;->registerForAllDataDisconnected(ILandroid/os/Handler;ILjava/lang/Object;)V Lcom/android/internal/telephony/ProxyController;->sendRadioCapabilityRequest(IIIILjava/lang/String;II)V Lcom/android/internal/telephony/ProxyController;->sProxyController:Lcom/android/internal/telephony/ProxyController; Lcom/android/internal/telephony/RadioCapability;->getRadioAccessFamily()I @@ -3471,7 +3467,6 @@ Lcom/android/internal/telephony/ServiceStateTracker;->mVoiceRoamingOnRegistrants Lcom/android/internal/telephony/ServiceStateTracker;->notifyDataRegStateRilRadioTechnologyChanged()V Lcom/android/internal/telephony/ServiceStateTracker;->notifySignalStrength()Z Lcom/android/internal/telephony/ServiceStateTracker;->pollState()V -Lcom/android/internal/telephony/ServiceStateTracker;->powerOffRadioSafely(Lcom/android/internal/telephony/dataconnection/DcTracker;)V Lcom/android/internal/telephony/ServiceStateTracker;->reRegisterNetwork(Landroid/os/Message;)V Lcom/android/internal/telephony/ServiceStateTracker;->resetServiceStateInIwlanMode()V Lcom/android/internal/telephony/ServiceStateTracker;->setOperatorIdd(Ljava/lang/String;)V