aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-08Snap for 10460766 from 1a392f75763d5679f669b26d97269f275491e79e to ↵aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-mainline-healthfitness-releaseAndroid Build Coastguard Worker
mainline-healthfitness-release Change-Id: I4ea3d6a018e48550d94f3fe3e9f0dd2bb61fa4c3
2023-05-26Snap for 10209341 from ef10e59644031f90d41a9f51a95df5fb155d7db1 to ↵Android Build Coastguard Worker
mainline-healthfitness-release Change-Id: Ia7ef61c6b88e47d048bdd29c673a3c072019c215
2023-03-18[automerger skipped] Respond to second and third challenge during EAP-AKA. ↵Kiwon Park
am: d6487bda8e am: 9f6f01d27a am: 51a1d8448c -s ours am: ef10e59644 -s ours am skip reason: Merged-In Ia1070ad1921ddcd117b2383163885b4d595727ad with SHA-1 564fa20e18 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2494696 Change-Id: If896ae771cf335b4c82553b21ab07c9a050c165d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18[automerger skipped] Respond to second and third challenge during EAP-AKA. ↵android14-devKiwon Park
am: d6487bda8e am: 9f6f01d27a am: 51a1d8448c -s ours am skip reason: Merged-In Ia1070ad1921ddcd117b2383163885b4d595727ad with SHA-1 564fa20e18 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2494696 Change-Id: I558b06ce74326c6aef391be172f27ae59cd88749 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18Respond to second and third challenge during EAP-AKA. am: d6487bda8e am: ↵Kiwon Park
9f6f01d27a Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2494696 Change-Id: I5f221051ea41c242a857b0fccd797136cb7cb226 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18Respond to second and third challenge during EAP-AKA. am: d6487bda8eKiwon Park
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2494696 Change-Id: I3e74094fb53b0cff2ca38c4733acfc823658e8f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Respond to second and third challenge during EAP-AKA.android-u-beta-1-gplKiwon Park
Test: EapAkaApiTest Change-Id: Ia1070ad1921ddcd117b2383163885b4d595727ad Merged-In: Ia1070ad1921ddcd117b2383163885b4d595727ad Bug: 223430297
2023-03-07Update premium network entitlement API per specs am: 71eb4b5242Sarah Chin
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/21662385 Change-Id: Ib322c296daa633334f788c271dce49a0cc71d848 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Update premium network entitlement API per specsSarah Chin
Rename network_identifier to boostType Use APP ID 2010 instead of 2012 Test: build Bug: 264711636 Change-Id: Idbc9e78550d72747fdedf1c9b440ca6affa9608e
2023-02-22[automerger skipped] Allow WiFi mainline module to use ServiceEntitlement ↵xiaoyingliu
lib am: 770d030df5 -s ours am: b5a2f38188 -s ours am skip reason: Merged-In I5f7e6df914b45d7404a17ec15cdaff22ab74fba4 with SHA-1 3d5da15807 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/21429770 Change-Id: Icd85fe84481bf4c449499170fe50d9d3b230aa48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22[automerger skipped] Allow WiFi mainline module to use ServiceEntitlement ↵xiaoyingliu
lib am: 770d030df5 -s ours am skip reason: Merged-In I5f7e6df914b45d7404a17ec15cdaff22ab74fba4 with SHA-1 3d5da15807 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/21429770 Change-Id: Ic8256c960e436874bb158125bf8d0dc788ccac65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15Allow WiFi mainline module to use ServiceEntitlement libxiaoyingliu
Bug: 239710602 Test: m service-entitlement Change-Id: I5f7e6df914b45d7404a17ec15cdaff22ab74fba4 Merged-In: I5f7e6df914b45d7404a17ec15cdaff22ab74fba4
2023-02-14Allow WiFi mainline module to use ServiceEntitlement lib am: 3d5da15807 am: ↵xiaoyingliu
d54d1cda6e am: 5631f0afd6 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2428198 Change-Id: I482b51891c8735b6d0c31c753fcd66d839747b88 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Allow WiFi mainline module to use ServiceEntitlement lib am: 3d5da15807 am: ↵xiaoyingliu
d54d1cda6e Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2428198 Change-Id: Idd57de1db37334684fe3261f5ab20ad78d37b747 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Allow WiFi mainline module to use ServiceEntitlement lib am: 3d5da15807xiaoyingliu
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2428198 Change-Id: I9b03f7b684e5bb2ebe2454cc458d9c0b8ae7b4b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Allow WiFi mainline module to use ServiceEntitlement libxiaoyingliu
Bug: 239710602 Test: m service-entitlement Change-Id: I5f7e6df914b45d7404a17ec15cdaff22ab74fba4
2023-02-06Respond to second and third challenge during EAP-AKA.Kiwon Park
Test: EapAkaApiTest Change-Id: Ia1070ad1921ddcd117b2383163885b4d595727ad Bug: 223430297
2023-01-19Update owners am: d0de009a99 am: 2769fbbaa4 am: 950c2b775cKiwon Park
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2391494 Change-Id: I58d16ff2e0e337e1e832a1f91cd053c3a3e2171d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19Update owners am: d0de009a99 am: 2769fbbaa4Kiwon Park
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2391494 Change-Id: I1d7e3a8d86e4c27f2591f5ee007e3e4e43225a1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19Update owners am: d0de009a99Kiwon Park
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2391494 Change-Id: If6d8cbddf84abf34b0893f3bfacd31cfce84b1e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17Update ownersmain-16k-with-phonesKiwon Park
Test: m Change-Id: I2cc69a3f7443dde1fe497e8fec8d0db0b28a7639
2022-11-30Log IOException details during HTTP requests. am: 88496fa995 am: 1ceed40afa ↵Kiwon Park
am: 1a61f80037 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2320804 Change-Id: I7155d01611b4e07226a24dd9cb42a1b3a4dbcd0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30Log IOException details during HTTP requests. am: 88496fa995 am: 1ceed40afaKiwon Park
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2320804 Change-Id: I91384db1c3d86a6002909424811cc52138ed44b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30Log IOException details during HTTP requests. am: 88496fa995Kiwon Park
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2320804 Change-Id: I46c6fad6bbd924c8897f9d73c19d6761a4b3bc2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Log IOException details during HTTP requests.Kiwon Park
Bug: 223430992 Change-Id: I66ad29f7cb2c051d134207ef60004f01fe066644 Test: m
2022-11-02Add network identifier to URL am: ff30bc0df7 am: ba7d5e010a am: 2b1a4016d1Sooraj Sasindran
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2281597 Change-Id: I00f03861f38046e5daf90de5d519df090983d5d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02Add network identifier to URL am: ff30bc0df7 am: ba7d5e010aSooraj Sasindran
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2281597 Change-Id: I72811de672e56c9a69ed11cf43c328f3d351e54a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02Add network identifier to URL am: ff30bc0df7Sooraj Sasindran
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2281597 Change-Id: I9a586686eff8250e40a4de5d75e7be85016940fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01Add network identifier to URLSooraj Sasindran
Add network identifier to URL Bug: 246792173 Test: build Change-Id: Ie71420eae54757bbcbc6a6fd86fca586056719a5
2022-10-07Simplify debug HTTP response logging. am: eb47437d85 am: 9561152a27 am: ↵Kiwon Park
6e7a82193b Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2239348 Change-Id: I8e2a84f01823540dd7d5185c35a20fe2112bc2de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07Simplify debug HTTP response logging. am: eb47437d85 am: 9561152a27Kiwon Park
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2239348 Change-Id: Ic9890305b917607f33116c48fcbfe278aa140a89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07Simplify debug HTTP response logging. am: eb47437d85Kiwon Park
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2239348 Change-Id: Ibf335f2488cb80a7a14c3fdc3d2feb31092852c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Simplify debug HTTP response logging.Kiwon Park
The full HTTP response content is already logged in getHttpResponse. Bug: 251302721 Test: m Change-Id: Ibbfd73b27455f5745fcd8bfeffc15115e458e6c1
2022-10-06Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as merged am: 5456bf4c87 ↵Xin Li
am: 3af20f3cf2 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/20130370 Change-Id: Ib84e8c13ada4bed77fccf17ec5487da86f708f03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as merged am: 5456bf4c87Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/20130370 Change-Id: Ieff867457c0b6e9cee348906a490e13d830920f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as mergedXin Li
Change-Id: Ie5ada1887efaedbb084b7a3cece45fc5082831b4
2022-10-04[automerger skipped] Merge changes from topic "bypass" am: cbcefac55f am: ↵Kiwon Park
58e145e51a am: 5774d577af am: 912315b57b am: 26a2924236 -s ours am skip reason: Merged-In I49955ef4def9d5b02ab1d22f9215d8f04afdab8b with SHA-1 88944584c7 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240185 Change-Id: I4764e83befe63c62af557bbf32f0e65bf6452df0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04[automerger skipped] Add ability to bypass EAP-AKA authentication. am: ↵Kiwon Park
d14f4f927f am: 35b1a84b4a am: abafbd4799 am: 88fdcde861 am: 99e4a26a46 -s ours am skip reason: Merged-In I21b6ca7975d0bf79a52428658783a5930368998e with SHA-1 7669e8980e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240184 Change-Id: Iace235a80e4f1839bdbd9241e92d0a5952e6e4d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04[automerger skipped] Add ability to save the HTTP request/responses. am: ↵Kiwon Park
00d7763e6d am: 54556c4613 am: 6c0fd028c7 am: d3c4855979 am: f96acefd82 -s ours am skip reason: Merged-In I395c26dff80e44a1531b70ca8310de1298b95613 with SHA-1 103b562015 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240183 Change-Id: Id860a1cd53d2c1892c9df4cd960a5349050a0657 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04[automerger skipped] Replace String.join with TextUtils.join in forming ↵Kiwon Park
operationTargets am: 5d4fc15dc4 am: e94f643628 am: 5e8ba317c1 am: ea0059c537 am: a7b5953ec9 -s ours am skip reason: Merged-In I99e82f76ffde87ab3afa4b5f608856a20119a925 with SHA-1 a9acc127a3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240182 Change-Id: I938104ba9c6746e8a9adfee2217a223a3c0a35b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04[automerger skipped] Support the new fields in EsimOdsOperation and ↵Kiwon Park
ServiceEntitlementRequest am: 392093f956 am: 5ccc6866d3 am: 01faee33fb am: 9a45472658 am: 91bd866002 -s ours am skip reason: Merged-In Iee8d58d924bc3524ad4a4462728ff966feeb4428 with SHA-1 819a026eaf is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240181 Change-Id: I940225f18763abaa6d2cc07c17e54c5ee2492e52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04Merge changes from topic "bypass" am: cbcefac55f am: 58e145e51a am: ↵Kiwon Park
5774d577af am: 912315b57b Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240185 Change-Id: Ica28a7e0ead5d3bed13d62eef118671adb11cef6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04Add ability to bypass EAP-AKA authentication. am: d14f4f927f am: 35b1a84b4a ↵Kiwon Park
am: abafbd4799 am: 88fdcde861 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240184 Change-Id: I80c82619f1ec75136c28b9010e25b065c2658d2a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04Add ability to save the HTTP request/responses. am: 00d7763e6d am: ↵Kiwon Park
54556c4613 am: 6c0fd028c7 am: d3c4855979 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240183 Change-Id: I8fe8c46b326c126508c1d1d9b892a888b2d8ea8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04Replace String.join with TextUtils.join in forming operationTargets am: ↵Kiwon Park
5d4fc15dc4 am: e94f643628 am: 5e8ba317c1 am: ea0059c537 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240182 Change-Id: I12b1c7d4a98016dbde1597f8bc0f953ed5b91a62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04Support the new fields in EsimOdsOperation and ServiceEntitlementRequest am: ↵Kiwon Park
392093f956 am: 5ccc6866d3 am: 01faee33fb am: 9a45472658 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240181 Change-Id: I4f8cc343ade63bfa5f9695306409f36a1306afa8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04Merge changes from topic "bypass" am: cbcefac55f am: 58e145e51a am: 5774d577afKiwon Park
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240185 Change-Id: Iaf497865645ae79fc706c57bfb59587902df7c97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04Add ability to bypass EAP-AKA authentication. am: d14f4f927f am: 35b1a84b4a ↵Kiwon Park
am: abafbd4799 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240184 Change-Id: I9bb089a667b2684b84dedde94dd769d45a187b97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04Add ability to save the HTTP request/responses. am: 00d7763e6d am: ↵Kiwon Park
54556c4613 am: 6c0fd028c7 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240183 Change-Id: I300cb3d227b9a5adf8b42f2056df158cfc847c4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04Replace String.join with TextUtils.join in forming operationTargets am: ↵Kiwon Park
5d4fc15dc4 am: e94f643628 am: 5e8ba317c1 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240182 Change-Id: I40b0b2654b92590c0c25b0f331c4e15edac804db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>