merge commit #2
Open
merge commit #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* This is a squash of the "OldRilFeatures" implementation plus the following changes, forward-ported to Q. Author: Danny Baumann <[email protected]> Date: Mon Dec 7 16:37:45 2015 +0100 Also activate default UICC apps once after SIM presence. Some devices apparently need this, and it shouldn't hurt on other devices either. Change-Id: I7feb27cceeffc30081e682a6f6b0e2bdb6ad5087 Author: Danny Baumann <[email protected]> Date: Thu Nov 5 11:06:09 2015 +0100 Activate default UICC application if not done automatically. Provides compatibility to the pre-M behaviour. Change-Id: Ie87e40cf1da3b19fd37e2c07ff50845f0842216a Change-Id: I785a91dadd79713f57641a3c20a94a0220a723e9
Issue is that SET_INITIAL_ATTACH is being sent whenever subId changes. During bootup subId does change before records gets loaded. This results in SET_INITIAL_ATTACH with incorrect APN setting/profile. Solution is to send SET_INITIAL_ATTACH only when cdmaSubscriptionSource is RUIM based and records have been loaded. Change-Id: I68280db4831935326c732943e5b763d3b3a4c3fe Fix to send initial attach apn If there is no IA/default apn then do not perform initial attach with any other available apns. Change-Id: Ie3241747eb44df9070f2cb4874f13878f8ca3d9b CRs-Fixed: 2178888
- Let DCT get mcc/mnc from phone object.
- GsmCdmaPhone would return mcc/mnc as follow...
- If phoneType is GSM then mcc/mnc from SimRecords
- If phoneType is CdmaLte then
If CdmaSubscriptionSource is NV
mcc/mnc from ro.cdma.home.operator.numeric
Else
If SimRecords present then mcc/mnc from this recored.
Else mcc/mnc from RuimRecords.
- ApnSettings UI would always display list of APNs based on mcc/mnc of GsmCdmaPhone.
- CDMA operators having LTE
- APN UI would list LTE apn profile since mcc/mnc is from SimRecords.
- Legacy CDMA operators
- APN UI would be empty since such simcard would not have Sim/Usim app.
- OEM must add profile in apns-conf.xml for such operators.
CRs-Fixed: 2178887
Change-Id: Ib8fd65eb8b18661d76a71ee24f1e732fb467d5c4
MSIM Changes that are needed to enable vendor telephony framework. CRs-Fixed: 2172757 Change-Id: I80a46de96c34d5e2a4ce952830f6beb862522de5
- Add hooks to vendor components. - Change access specifiers of members from private to protected. - Override factory methods. - Add support for HIDL service to implement vendor/OEM specific features. CRs-Fixed: 2178879 Change-Id: I0b8369f88c05d56973c0adb6f08607460601302e
Change-Id: I00710c21af1a73565a86baad33e7e8daae8f696c
Make required changes to use vanilla implementation for handling SIM ERROR scenario. Change few method access specifiers and remove unused constant. Change-Id: Ifffc1cbff72316ec6885e0f4eb0a7b89dadcc96d CRs-Fixed: 2179165
The custom PathClassLoader was not loading the .jar required for the V1.0 HIDL manager class. This change switches to the ClassLoader of the TelephonyComponentFactory (used by the com.android.phone app) which has access to all required libraries. Test: verified crash message no longer displays in the home screen and crash dump no longer appears in "adb logcat" Change-Id: Id7ae65eef294e4dc042a0f85807575c7e49b973e
Add new API to send MO CDMA SMS with expectMore option. CRs-Fixed: 2242430 Change-Id: I5f504628186eab50f18584251dcbe198483b360f
The previous attempted fix did not work because the TelephonyComponentFactory's classloader also did not have access to the Android HIDL manager library. It was missed because the exception was caught and printed to the radio logs instead of the system logs. This fix adds the Android HIDL manager .jar path to the PathClassLoader making it available to the caller. Test: verified crash message no longer displays in the home screen, crash dump no longer appears in "adb logcat" and no errors are printed to logcat radio logs. Change-Id: Id7f816d42c1e5b2b07666e3c2762afe1ed114d0e
Grant protected access for few member variable in PhoneSwitcher Change-Id: Ib4699ac894ebcdf19bfb7f8ad02faf7c0c7c4271
Change-Id: I65e31e102962567faf7c85a1d1552ccafc511f88
- Start using inject mechanism to invoke vendor specific code. - Add the inject support for the classes extended in vendor space. Change-Id: I35b9761c15aebc32f48107bbe6b3bcec9a1eb670 CRs-Fixed: 2394018
Send appropriate TelephonyComponentFactory object to GsmCdmaPhone constructor to inject vendor specific classes from GsmCdmaPhone. Change-Id: I12d476763c4849b2b7627075a4a5b80f6a5361b9 CRs-Fixed: 2404615
Modify access specifier of PhoneSwitcher members to support retry with new DDS API, and QtiPhoneSwitcher update Change-Id: Ibc6960a110d6e5927b76de35b76b9084da0161ae CRs-Fixed: 2406274
Grant protected access to methods in MultiSimSettingsController class Change-Id: I404665393ad80d5e42c311009a72fc47d3d43bbf CRs-Fixed: 2435501
1. Remove score update logic on DDS change 2. Grant protected access to broadcast preferred data subid Change-Id: I43ca9f761b2e012c882243ebad1c0c68eada5f86 CRs-Fixed: 2436457
Grant protected access for member variables required to override methods for blocking sim selection popup display Change-Id: I3c70687c59ada9e0dc51e55a6b34356dee3f4e54 CRs-Fixed: 2442591
Define protected access for sPhoneSwitcher instance variable to initialize it from QtiPhoneSwitcher Change-Id: I26d0c7f3d32d83a49c888c6116b22b63173b11cb CRs-Fixed: 2446460
1. Define overloaded isCallActive method with phone id as input 2. This method is overriden to trigger dds switch on call start Change-Id: Ibf351b4493fe1a7d479b1b46726e0bfef2115532 CRs-Fixed: 2451779
Add initMultiSimSettingController method for creating MultiSimSettingController instance. Change-Id: If6bef0eec7d02161dfd4c5e295c5bc129b03c965 CRs-Fixed: 2464854
1. Modify access specifiers 2. Handle EVENT_RETRY_CONNECTION in inactive state Change-Id: I9ff528d37c05edd7f190f7c3ab7175b390e3cc49 CRs-Fixed: 2460148
Modify API setDataProfilesAsNeeded as a protected method, so that the injection of DcTracker can reach it. Change-Id: I0b0999787a6316fc94e69c617b00af1245a24676 CRs-Fixed: 2487878
Grant protected access to applicable methods Change-Id: I0549f8cc9310d93c0e8412f251728d4daa86e5b0 CRs-Fixed: 2501503
Add a method to check if retry pattern is in progress to block any intermediate data call requests Change-Id: I9612b2d2bc6bb04e261ce27e493fefe384c8dcdc CRs-Fixed: 2508426
* These changes come from huge merge commits, thus missing after cherry-pick. Change-Id: Id8a77cfae4af81d2fd3af09479eda7f1752dfe2e
The PDU string is HEX string, it needs to convert as Byte with method "hexStringToBytes" from class "IccUtils". Change-Id: I6bc983c3427dd139b63d3a05c39a9baf8a6083d4
Imsi only show mccmnc when the phone type is cdma phone since the length of return from RIL is 0 but not NULL for mMin. if mMin is NULL or length is 0, mPhone.getSubscriberId() will get NULL when the phone type is cdma, hence the flow of get imsi will move on to retrieve the imsi from IccRecords. Change-Id: Idda892c736db046d8924bb45a5fbb2a5f2a6d248 CRs-Fixed: 2212375
Add several EF paths for UI to get CDMA device info. Change-Id: Iff43d6b5a6706e54aaf50867419c30a1a322cb2f CRs-Fixed: 2177396
update Icc after switch phone type from gsm to cdma. when update Icc, DcTracker will be one registrants of IccRecords, hence when Ruim records loaded complete, DcTracker will invoke onRecordsLoadedOrSubIdChanged to handle EVENT_RECORDS_LOADED to create all apn list. Change-Id: Ia58664e82f40ccdb680f07c2507c6364b291f4af CRs-Fixed: 2031874
- Use method that checks for both LTE and NR radio technologies CRs-Fixed: 2422797 Change-Id: I849860da29d274065929ef019a4e1682fc193a5c
- Since 5G SA is PS only, if data RAT is NR, allow SMS over NAS even though voice registration state is Out of Service. Change-Id: If182b1024bda1116e26ba08cdccb951278a83d42 CRs-Fixed: 2475186
Test: boot a wifi only device and check com.android.phone do not crash Bug: 141396302 Change-Id: I4315f538a8a03a4b31b8ee77e16cc276ab712088 Signed-off-by: zhaoyouyi <[email protected]>
Change-Id: Ibe3acd8e214075199127b4c114a222b26aaf8498
Grant protected access to methods which are extended Change-Id: I88868b4cbc37edaec30f3e6c79542ddc55803ba8 CRs-Fixed: 2522678
Commit 319c9cc removed it but QTI telephony still requires this method to be present. Change-Id: Ic59332a3be0425a838332118b092fe0d984eabf2
Commit 856a660 removed it but QTI telephony still requires this method to be present. Change-Id: I5ee25f3337dfd1958ba16340f25712ddd9486857
1. Add multi-EF_ANR/EF_EMAIL support for each ADN record.
2. Add the related interfaces for getting count of ADN,ANR,EMAIL
- getAdnRecordsCapacity
3. Use updateIccRecordInEf for all update/insert/delete operations.
- add updateAdnRecordsWithContentValuesInEfBySearchUsingSubId for
updating IccRecord
4.Move main thread in IccPhoneBookInterfaceManager to other thread to
fix deadlock issue.
Bug: 23044962
Change-Id: Ia272a015568c69bacf36d774d82aa069eff86d74
Change-Id: Iaadd37b1673c362913265fe7126c006a2cf93078
* Old modem sends and applies mccmnc+network type, but new aosp telephony uses only digits. * Manually cut or append the "+" and strings after that to work around. Change-Id: I1015e6c0d6afdc0c03d70e9491d49331703eddcc
Android 10.0.0 release 31 * tag 'android-10.0.0_r31': (23 commits) Add Signal Strength to TelephonyMetrics when Data Stall Log PS WWAN RAT from registration info Fixed that SIM name not updated issue Add a retry mechanism to retrieve access rules again depending on the status words When SPN is empty, use PNN in mobile network settings Parse CellcomFormat WAP PUSH SMS DO NOT MERGE - Request location from all available providers Introduce erase modem config api DO NOT MERGE - Added reset geo-fencing checking after airplane mode support Fixed handover issue on connecting data connection Don't allow reading IMSI of one active sub if only has carrier privilege on the other. Fix short-circuiting for RatRacheter Add a carrier config to specify validation timeout for data switch. Re-add check for metered APNs regardless of IWLAN [DO NOT MERGE] Revert "Add NrState and NrFrequency to telephony metrics" Fixed emergency alert not showing up issue Make DEFAULT_DATA_UNSELECTED soft reason for forbidden data connections. Add logic to retry call without RTT Refresh signal strength in CBRS case. Update TCP buffer size for 5G data connections ... Change-Id: Ic3b3afbde97096338dfde5767c2275860b859beb
…d-10.0.0_r37 Android 10.0.0 Release 37 (QQ3A.200605.001) * tag 'android-10.0.0_r37': [DO NOT MERGE] Prevent incorrect AsyncResult cast 5G Q backport OTASP: Replace PhoneStateListener with registrant. Use carrier config to define network validation cache ttl. Skip network validation if validated recently upon switching Do not set a sub as default data sub unless it's active. Only unbind if bind() returned success DO NOT MERGE Rename classes to match master DO NOT MERGE Remove OldNitzStateMachine impl Cherrypick - Fix the NullPointerException when Radio crash. Conflicts: src/java/com/android/internal/telephony/dataconnection/DataConnection.java src/java/com/android/internal/telephony/dataconnection/DcTracker.java Change-Id: I9b2292012c8fc1d6e34dcb1af5be2acf129fbae8
Previously to this commit, setIsoCountryProperty method was only called if operatorNumeric string was not empty, therefore there was no point in verifying the opposite condition inside the method itself. Remove the method altogether because it's private and only called in one part of the class. Change-Id: I76819fa84e9ace1786869f3dc32b95a150a95bde
…subIds It seems like the SIM card can take longer to load on certain legacy CDMA devices, thus causing the subscription ID not to be valid during early telephony init. Just skip calling SubscriptionController#setMccMnc or setCountryIso at that point, so to avoid any subsequent calls to SubscriptionManager#getUriForSubscriptionId with an invalid subId, which then makes the phone process crash. Once the SIM is loaded, SubscriptionInfoUpdater will take care of updating the DB with the proper URI. Change-Id: I8bd71127aecff9577bb0d3b9d7cab7a01a076e87
The modemTriggeredPollState breaks airplane mode on some devices. Although the UI shows that airplane mode is activated, the fact is that the radio remains active and in service. By using regular pollState() here, service state in sim status shows correctly radio off. Enable with setting prop: ro.telephony.ril.config=legacypollstate Test: Insert SIM card. Put device into airplane mode. Go into SIM Status and verify that it says "Radio off". Change-Id: If2ab5b088a13b1a159e01f82fbea1f58a77b64cd
Set EVENT_MERGE_START for foregroundConnection and backgroundConnection but don't set EVENT_MERGE_COMPLETE when there is ImsException Bug: 121105030 Change-Id: I08c189b976227ada1298a864f6f4ba70c4ffb7f9
…ephony" Conflicts: src/java/com/android/internal/telephony/dataconnection/DataConnection.java src/java/com/android/internal/telephony/dataconnection/DcTracker.java Change-Id: I9b2292012c8fc1d6e34dcb1af5be2acf129fbae8
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.