summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-05Snap for 11178562 from 1c1d741db42182ebe9ff6ec3564239e70f50438e to ↵aml_art_341411300android14-mainline-art-releaseAndroid Build Coastguard Worker
mainline-art-release Change-Id: I85b2f5afc4028aaeff0316751daabffce353c33f
2023-11-17Update duplicate message detection for VerizonHyosun Kim
Verizon's requirement to detect duplicate messages is modified to check both serial number and message id. Bug: 311215348 Test : VZW WEA 5G R&S test TC 2 and 8 (result : b/311132513) Change-Id: Ia65e6d8c7b32533d85a2e67582c1a7a35fc1066d
2023-07-07Snap for 10453563 from 4976ffc769aa5983eccfa3d553f05f72c950b5da to ↵aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060Android Build Coastguard Worker
mainline-art-release Change-Id: Ib01d741aa6239808cf8c4f2a8f0198c336932045
2023-05-25Use new soong support to install privapp xmlAnton Hansson
This allows better overriding of it in the variants of this apex that have a different package name. Bug: 242509786 Test: build google cbr, diff before & after Change-Id: I758613c62a7117292908db5e4879b62b1186bb8e
2023-04-27[automerge] Support emergency alert for India 2p: f04f33e8cc am: 97c5396ee9Presubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/22747386 Change-Id: I45c88d179097cf3b8baf61d30ff627c4974a3f74 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26[automerge] Support emergency alert for India 2p: f04f33e8ccandroid14-devPresubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/22747386 Bug: 277852306 Change-Id: I7827930a4603f2ecee858d6a0db211d2113bbea4
2023-04-26Support emergency alert for Indiayoungtaecha
remove previous configuration for channels of area_info Bug: 277852306 Test: atest CellBroadcastReceiverComplianceTests Change-Id: Ife631344076f5ea3078aece086f6405a898859eb
2023-02-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3cfd1846e3 -s ours am: 48016e2f39 -s ours am: b5e7608ec7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/21604886 Change-Id: I41069071262ad96fdc12808e53c186192395bce2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3cfd1846e3 -s ours am: 48016e2f39 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/21604886 Change-Id: I12b6ace47f89ac3a4d7f26a94e90fe74960ccfe5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3cfd1846e3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/21604886 Change-Id: I9e4fe102f4f124ee53d9d7993db3c0c829d91179 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-26Import translations. DO NOT MERGE ANYWHEREandroid-u-beta-1-gplBill Yi
Auto-generated-cl: translation import Change-Id: Id8f81fbb0bb713f35806951d62b80ffa64514a6c
2023-02-23Cleaned up the deprecated APIs am: c859246dbcJack Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/21536067 Change-Id: Iebc7fab1b665070e0d41298b219b003431ab75ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22Cleaned up the deprecated APIsJack Yu
Bug: 270094276 Test: Basic phone funcationality tests Test: atest CellBroadcastServicetest Change-Id: Id557941ac9c1e909cba626a473217506d7c39f84
2023-02-01Snap for 9550700 from 3bd95abb43552425c1925de639534ef4fa406673 to ↵aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010android13-mainline-art-releaseAndroid Build Coastguard Worker
mainline-art-release Change-Id: I0d8057c3fb6588b0511717f631895ce72239b89e
2023-01-26Suppress lint for methods using APIs promoted from system to publicMichael Groover
Android 14 added the ability for a broadcasting app to share its identity with a receiver. System APIs already existed to send a broadcast with a BroadcastOptions Bundle, so these APIs were promoted from system to public; however our tooling does not currently recognize that these APIs were previously available to modules that can invoke system APIs resulting in NewApi lint errors. This commit annotates all of the methods that invoke one of these newly promoted APIs to suppress the NewApi lint error; this will have no affect on functionality since the APIs are still available on previous platform releases as system APIs, and these annotations will be removed when the tooling supports system to public APIs. Bug: 259743961 Test: errorprone build Change-Id: I40e72bfa09da01188976b08ee909f5785449577a
2023-01-19Merge "Remove the persistent attribute of cell broadcast service"Hui Wang
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
58a5b129ba -s ours am: 46799afaa2 -s ours am skip reason: Merged-In I66f7e77b314d931a5721abf493f5fd4fb32be6c5 with SHA-1 f1149e4c11 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20949497 Change-Id: I6c065cdf0eddd2620fa30eb29ccffc8007add776 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
58a5b129ba -s ours am skip reason: Merged-In I66f7e77b314d931a5721abf493f5fd4fb32be6c5 with SHA-1 f1149e4c11 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20949497 Change-Id: I2c4b09c5de35324b905cc43dab5da891f0813cb3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136Xin Li
Bug: 264720040 Merged-In: I66f7e77b314d931a5721abf493f5fd4fb32be6c5 Change-Id: Ie3b4dd8ef69179034c296aec935c2f06fdec60b0
2023-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3bd95abb43 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20842774 Change-Id: I11b86d111eb54e00126344d7fbb2ebda4f0bd2b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
da8c9845f7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20803049 Change-Id: I630dc4ece02991c13679151e8422dce2f21f49ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f1149e4c11 -s ours am: 0df4354406 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20846505 Change-Id: I9cb0da5938a1561f0dbf606b4d137b5a39dd46d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f1149e4c11 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20846505 Change-Id: Id4dce79e46ef9af893d7937ff3db1321ca82cf08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ibfff2218fe3ad39a2c58f85482603af71a740228
2022-12-29Import translations. DO NOT MERGE ANYWHEREandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseBill Yi
Auto-generated-cl: translation import Change-Id: I66f7e77b314d931a5721abf493f5fd4fb32be6c5
2022-12-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1b2748d65a2bf8d31e9f18c9dc498e3d7e68e409
2022-12-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f07ea323cc -s ours am: 7533359da9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20780597 Change-Id: I5a9c117792368dc5ffc737668ac368db93e2a902 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f07ea323cc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20780597 Change-Id: I8aa59d9291f554e1bd3daaf32974de44a5335800 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-18Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I12770020664b613a7b42eb9248dfcab12786d6c5
2022-12-12[automerge] Update preparers to align across everything 2p: d162585869Julien Desprez
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20711296 Bug: 261855411 Change-Id: Iea65d2db3d533b92d757814069e5757948f6b464
2022-12-12Update preparers to align across everythingJulien Desprez
Carry the exact same options. Test: presubmit Bug: 261855411 Change-Id: I6ade91f9faa17c20ec934a3156e42cd2c995eae0
2022-12-12Merge "[automerger skipped] Merge Android 13 QPR1 am: c32af00398 -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: 32f85b81ce -s ours am: 9e7dd485f7 -s ours am skip reason: Merged-In I17e07cbe5b5c84135f831a39460e4328e489feed with SHA-1 b29de0f6e6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2338390 Change-Id: I95286dba3dad513d2942287c70e732d08388d37b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: c32af00398 -s ours am: ↵Xin Li
a3572da44d -s ours am: 3df86a6879 -s ours am skip reason: Merged-In I17e07cbe5b5c84135f831a39460e4328e489feed with SHA-1 b29de0f6e6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2338390 Change-Id: Ib9b9c5ed883a376f8695efc141295b53047796ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: c32af00398 -s ours am: ↵Xin Li
f3d7b85414 -s ours am: eea489fe28 -s ours am skip reason: Merged-In I17e07cbe5b5c84135f831a39460e4328e489feed with SHA-1 b29de0f6e6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2338390 Change-Id: Ica41beb509443a7988b7f913fccfd9cf0185c560 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Merge "[automerger skipped] Merge Android 13 QPR1 am: c32af00398 -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: 32f85b81ce -s ours am skip reason: Merged-In I17e07cbe5b5c84135f831a39460e4328e489feed with SHA-1 b29de0f6e6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2338390 Change-Id: I134755adb7896839729c03f635a0e6df996d0ab4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: c32af00398 -s ours am: ↵Xin Li
a3572da44d -s ours am skip reason: Merged-In I17e07cbe5b5c84135f831a39460e4328e489feed with SHA-1 b29de0f6e6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2338390 Change-Id: I7aebeee0c30c3a5a396f34234b2210b1c4299060 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: c32af00398 -s ours am: ↵Xin Li
f3d7b85414 -s ours am skip reason: Merged-In I17e07cbe5b5c84135f831a39460e4328e489feed with SHA-1 b29de0f6e6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2338390 Change-Id: I2740607c9a24aade49213c2149aa0c8813d74e0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge "[automerger skipped] Merge Android 13 QPR1 am: c32af00398 -s ours" ↵Automerger Merge Worker
into stage-aosp-master
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: c32af00398 -s oursXin Li
am skip reason: Merged-In I17e07cbe5b5c84135f831a39460e4328e489feed with SHA-1 b29de0f6e6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2338390 Change-Id: I4c6a75bd319502192fa4edb1faf7edb7c94471bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: c32af00398 -s oursXin Li
am skip reason: Merged-In I17e07cbe5b5c84135f831a39460e4328e489feed with SHA-1 b29de0f6e6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2338390 Change-Id: I58330d4b0d97fe166ea11d0958ad4a98e5a52af1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge Android 13 QPR1main-16k-with-phonesXin Li
Bug: 261731544 Merged-In: I17e07cbe5b5c84135f831a39460e4328e489feed Change-Id: Ic2a87e979664df57f48dce5c731b399aa9ae0697
2022-12-07Merge "Enable resource shrinking of GoogleCellBroadcastServiceModule"Zhi Dou
2022-12-07[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
cdcd4be7fe -s ours am: 2884ffab40 -s ours am: 7a489b6de8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2326400 Change-Id: Id34cacfe74318269a81813db816527c787c6bd69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
cdcd4be7fe -s ours am: 2884ffab40 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2326400 Change-Id: I3bfc956983ccde0d70a6955cf4691a50c596ddd4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
cdcd4be7fe -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2326400 Change-Id: I675eff0fe6bf93898f310480fdcb99d4a34beffa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
b29de0f6e6 -s ours am: 41e4fc7117 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20629503 Change-Id: Ibcf4440d2f4015919095f621aee0cc190fc0c180 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
b29de0f6e6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20629503 Change-Id: I51c31032ed62b0a5fab1ba906615c018bfabae4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I17e07cbe5b5c84135f831a39460e4328e489feed
2022-12-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4ef03585bf7ade5596a859e740f7991c1bb21ecc
2022-12-02Enable resource shrinking of GoogleCellBroadcastServiceModuleZhi Dou
This change enables R8 resource shrinking for GoogleCellBroadcastServiceModule.apk. The size of GoogleCellBroadcastServiceModule.apk is unchanged. Test: presubmit Bug: 259106853 Change-Id: Iba67e8a832e93eac09042b4be6fefd6c5b5d2f63
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 05:42:54 +0000