summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert [Telephony mainline] Move the functionality about block number into ↵android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devzoey chen2020-03-121-18/+2
| | | | | | | | | | | | the calling locations. Reason: Revisit and redesign in S Bug: 147390517 Test: make Change-Id: Ie6a9cf16dc2162e576f113c88ee43014c1442be8 Merged-In: Ie6a9cf16dc2162e576f113c88ee43014c1442be8 (cherry picked from commit 3307dd2d611f27482b559865586b70e8b5c038fe)
* Merge "Add optional messageId methods for sending/receiving mms's"Tom Taylor2020-01-305-59/+107
|\
| * Add optional messageId methods for sending/receiving mms'sTom Taylor2020-01-295-59/+107
| | | | | | | | | | | | | | Bug: 148235962 Test: manually tested the new MMS apis using the Messages app Change-Id: Ief30bf0bc8bdad1a1bc61ab660dec989860be4e7
* | Merge "Add carrier messaging engineers as owners of the mms code"Tom Taylor2020-01-291-1/+5
|\ \
| * | Add carrier messaging engineers as owners of the mms codeTom Taylor2020-01-281-1/+5
| |/ | | | | | | | | | | | | | | Add the invididual engineers responsible for MmsService as owners of the code. Test: not applicable Change-Id: Ia8e99d40a54b6f3c75cb48661f3be7ec79bda396
* / Moving PhoneConstants to appropriate APIsDaniel Bright2020-01-211-2/+2
|/ | | | | | Test: make,flash Bug: 147465477 Change-Id: I8673ce7f1f28a0e1ab619a891ffd229f32b05ce2
* Merge "Add security policy to MmsService"Tom Taylor2020-01-211-0/+4
|\
| * Add security policy to MmsServiceTom Taylor2020-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | MmsService now explicitly asks the security policy to allow cleartext traffic Bug: 147652286 Test: manual mms testing Change-Id: I2460b862ea8cd97b7bbcce8786b94215405db8d3
* | Merge "Make string version of APN_TYPEs a @SystemApi"Daniel Bright2020-01-171-7/+4
|\ \
| * | Make string version of APN_TYPEs a @SystemApiDaniel Bright2020-01-161-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The string version of Apn Types are used in the carrier config table. Modules besides Telephony uses this table directly and so it made sense to expose this as a @SystemApi Test: ApnSettingsTest Bug: 147465477 Change-Id: Ic4b9f4130f25332a910aa48936d170e4cf487893
* | | Inline SmsManager constants am: 9bcf79ca83 am: c11e641dea am: f47c5957c7Automerger Merge Worker2020-01-172-7/+16
|\ \ \ | |/ / |/| | | | | Change-Id: I0dac64e3c08ad36252ddc1246604f3da49cb1d16
| * | Inline SmsManager constants am: 9bcf79ca83 am: c11e641deaAutomerger Merge Worker2020-01-172-7/+16
| |\ \ | | | | | | | | | | | | Change-Id: I5c0262175c5217bef2c1bb411b57d0572cf0a5cc
| | * \ Inline SmsManager constants am: 9bcf79ca83Automerger Merge Worker2020-01-172-7/+16
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Idb6159f5ab6614462e027511dd403cd806c6237c
| | | * | Inline SmsManager constantsandroid-r-preview-1Sarah Chin2020-01-162-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: m MmsServiceRoboTests && atest MmsServiceRoboTests Bug: 147773425 Change-Id: Id042208d986515a90f0ae9aa6295ab90e78ee561
* | | | | Merge "Moved apn type constants to class"Daniel Bright2020-01-161-3/+7
|\ \ \ \ \
| * | | | | Moved apn type constants to classDaniel Bright2020-01-151-3/+7
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 147465477 Test: ApnSettingsTest Change-Id: I150a54dadc51948956d9637ec44bf8964730a094
* | | | | [automerger skipped] DO NOT MERGE - Empty merge ↵Automerger Merge Worker2020-01-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: a87d01156e am: 4306bd6c1a -s ours am skip reason: subject contains skip directive Change-Id: I8f94c18d4c5308c1789eea6f6df5e33c0234e6f6
| * | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) ↵Automerger Merge Worker2020-01-160-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | into stage-aosp-master am: a87d01156e Change-Id: Idd9241270234be9f61a3ccaabd1f7d557fcbc2ea
| | * | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) ↵Xin Li2020-01-150-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into stage-aosp-master Bug: 146167222 Change-Id: I490c7f98994ede19e05953c52a2f62ee440b782f
* | | | | | Merge "User TelephonyNetworkSpecifier to set NetworkSpecifier." am: ↵Automerger Merge Worker2020-01-151-1/+3
|\| | | | | | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | 27f7525a13 am: 019f9e8ed4 am: 75c2ef5833 Change-Id: I91e6f2d14c7c476235624cdf023d46f4cd03ee33
| * | | | Merge "User TelephonyNetworkSpecifier to set NetworkSpecifier." am: ↵Automerger Merge Worker2020-01-151-1/+3
| |\| | | | | |/ / | |/| | | | | | | | | | | | | | 27f7525a13 am: 019f9e8ed4 Change-Id: I01eddde6b4e6c324196bc3c6642c2d41b5de1f95
| | * | Merge "User TelephonyNetworkSpecifier to set NetworkSpecifier."Rambo Wang2020-01-151-1/+3
| | |\| | | | | | | | | | | | | | | | | | | | | am: 27f7525a13 Change-Id: I40d3670da74643455ac785fb3ee6056ab485d4ec
| | | * Merge "User TelephonyNetworkSpecifier to set NetworkSpecifier."Rambo Wang2020-01-151-1/+3
| | | |\
| | | | * User TelephonyNetworkSpecifier to set NetworkSpecifier.Rambo Wang2019-12-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TelephonyNetworkSpecifier is introduced to set NetworkSpecifier with subscription Id which can be validated. Bug: 145993724 Test: atest tests/robotests/src/com/android/mms/service/MmsServiceRoboTest.java Change-Id: Ic6e41d89559d9176d999cce16a86e16aafe05cfc
* | | | | [automerger skipped] Merge "Get MMS config through SmsManager" am: ↵Automerger Merge Worker2020-01-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52be231088 am: 024ccf3c90 am: 05ea4034ea -s ours am skip reason: Change-Id I502bd4fdd3f7d0616bc66e303d7fe26fbe7be388 with SHA-1 48e637758d is in history Change-Id: Ie8baa60561ab72d6e6fa72fb38c590cb3e685461
| * | | | Merge "Get MMS config through SmsManager" am: 52be231088 am: 024ccf3c90Automerger Merge Worker2020-01-072-106/+5
| |\| | | | | | | | | | | | | | | | | | Change-Id: I8dada14555fca7c2059cf8dd23235cc6e5e04d71
| | * | | Merge "Get MMS config through SmsManager"Taesu Lee2020-01-062-106/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 52be231088 Change-Id: If099d9af1c85f14c3fcf152656048f01300e515f
| | | * | Merge "Get MMS config through SmsManager"Treehugger Robot2020-01-072-106/+5
| | | |\ \
| | | | * | Get MMS config through SmsManagerTaesu Lee2020-01-072-106/+5
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It gets the MMS config through SmsManager and getCarrierConfigValues() to provide the config is removed because it will return null or old config if it receives ACTION_CARRIER_CONFIG_CHANGED later than caller. Bug: 145768042 Test: manual Change-Id: I502bd4fdd3f7d0616bc66e303d7fe26fbe7be388 Merged-In: I502bd4fdd3f7d0616bc66e303d7fe26fbe7be388 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
* | | | | Stop using SqliteWrapper am: 1318fd3b7d am: 46c54e08d6 am: 396ab37eeaAutomerger Merge Worker2020-01-071-9/+6
|\| | | | | | | | | | | | | | | | | | | Change-Id: Ib33b3b8e561478f2f4f7b2fc337e9c4d6beacab8
| * | | | Stop using SqliteWrapper am: 1318fd3b7d am: 46c54e08d6Automerger Merge Worker2020-01-071-9/+6
| |\| | | | | | | | | | | | | | | | | | Change-Id: Idf19d9c86c7a1f92019e763622a7e7f4e54adbd2
| | * | | Stop using SqliteWrapperHall Liu2020-01-061-9/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1318fd3b7d Change-Id: Id29d8dc9e1abf95df30c287f37a4b8fcbb362190
| | | * | Stop using SqliteWrapperHall Liu2019-12-301-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Query ContentResolver directly instead of using SqliteWrapper Bug: 146834818 Test: manual Change-Id: I5426ee1e89fa16f969b51ab780f04a1b45d03593
* | | | | Add ApnSettingsTest am: fc1d97412b am: 34412e2689 am: 0490147801Automerger Merge Worker2020-01-070-0/+0
|\| | | | | | | | | | | | | | | | | | | Change-Id: I6f907315343be506a2bd35e3545608970e174136
| * | | | Add ApnSettingsTest am: fc1d97412b am: 34412e2689Automerger Merge Worker2020-01-073-72/+213
| |\| | | | | | | | | | | | | | | | | | Change-Id: I9f1306e959b5ed9917c58356bf99d5b6ea9740e6
| | * | | Add ApnSettingsTestStephanie Shi2020-01-063-72/+213
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: fc1d97412b Change-Id: I6352beb5f5e85cab6f57a59d704cef5d092885c3
| | | * | Add ApnSettingsTestStephanie Shi2019-12-263-72/+213
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding this test to cover the regression in b/24002396 so that we no longer have to rely on a manual test. The tests under MmsServiceRoboTests still need to be added to a presubmit. Test: atest ApnSettingsTest Change-Id: Ic112a3edf750597bc5f23790d7258175988d871e Bug: 143818216
* | | | Get MMS config through SmsManagerTaesu Lee2019-12-302-106/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It gets the MMS config through SmsManager and getCarrierConfigValues() to provide the config is removed because it will return null or old config if it receives ACTION_CARRIER_CONFIG_CHANGED later than caller. Bug: 145768042 Test: manual Change-Id: I502bd4fdd3f7d0616bc66e303d7fe26fbe7be388 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
* | | | Merge "Add ApnSettingsTest"Stephanie Shi2019-12-093-72/+213
|\ \ \ \
| * | | | Add ApnSettingsTestStephanie Shi2019-12-093-72/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding this test to cover the regression in b/24002396 so that we no longer have to rely on a manual test. The tests under MmsServiceRoboTests still need to be added to a presubmit. Test: atest ApnSettingsTest Change-Id: Ic112a3edf750597bc5f23790d7258175988d871e Bug: 143818216
* | | | | [automerger skipped] Merge "[Telephony Mainline] 1. Move the functionality ↵Zoey Chen2019-12-050-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | about block number into the calling locations. 2. Follow coding style: 100 character per line." am: 710d769dc1 am: eebe36553e am: b2090d3ecd -s ours am skip reason: change_id I69d1fd77cf912ffc141a7d6897132aee72ae2f9c with SHA1 79f796b61a is in history Change-Id: I6313ce3defd1145fcca2a7621d47f8c131093add
| * | | Merge "[Telephony Mainline] 1. Move the functionality about block number ↵Zoey Chen2019-12-051-2/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into the calling locations. 2. Follow coding style: 100 character per line." am: 710d769dc1 am: eebe36553e Change-Id: I58f30ec0744d0d2c4643f73c10fd53eead4be441
| | * | Merge "[Telephony Mainline] 1. Move the functionality about block number ↵Zoey Chen2019-12-051-2/+18
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into the calling locations. 2. Follow coding style: 100 character per line." am: 710d769dc1 Change-Id: I72daefc6bc94ccb0076a10d8783e70149fe70234
| | | * Merge "[Telephony Mainline] 1. Move the functionality about block number ↵Zoey Chen2019-12-051-2/+18
| | |/| | | | | | | | | | | | | into the calling locations. 2. Follow coding style: 100 character per line."
| | | * [Telephony Mainline] 1. Move the functionality about block number into the ↵zoey chen2019-11-261-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calling locations. 2. Follow coding style: 100 character per line. Test: make Change-Id: I69d1fd77cf912ffc141a7d6897132aee72ae2f9c Merged-In: I69d1fd77cf912ffc141a7d6897132aee72ae2f9c Merged-In: Ia4c76282911661aee4ecdde59f1998ee54d0efe3
* | | | Follow coding style: 100 character per line.zoey chen2019-11-201-1/+3
| | | | | | | | | | | | | | | | | | | | Test: make Change-Id: I69d1fd77cf912ffc141a7d6897132aee72ae2f9c
* | | | Merge "[Telephony mainline] Move the functionality about block number into ↵Zoey Chen2019-11-201-2/+16
|\ \ \ \ | | | | | | | | | | | | | | | the calling locations."
| * | | | [Telephony mainline] Move the functionality about block number into the ↵zoey chen2019-11-181-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calling locations. Bug: 143860012 Test: make Change-Id: Ia4c76282911661aee4ecdde59f1998ee54d0efe3
* | | | | Load carrier config by ACTION_CARRIER_CONFIG_CHANGED only am: 7fb65404d5 am: ↵Taesu Lee2019-11-181-51/+15
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ebde131f6d am: 3cf9999dfc Change-Id: I1b313ad0bb385c1444cad2ee7e662c36441bca81
| * | | | Load carrier config by ACTION_CARRIER_CONFIG_CHANGED only am: 7fb65404d5Taesu Lee2019-11-181-51/+15
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | am: ebde131f6d Change-Id: I933026ef3497a9fcc69165271aa1fe97b9944df5
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-11 12:47:05 +0000