summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-18Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I12770020664b613a7b42eb9248dfcab12786d6c5
2022-10-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
4a13a4c178 -s ours am: 61d435ee2c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20117072 Change-Id: Id9f320dba377d7989e665ea937aa75a886f71d4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
4a13a4c178 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20117072 Change-Id: Id53a6c99f66c849a8abed7d58387f6d1f26c82cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I68dff87dc56def2f6cbe985135ff26a26fb64872
2022-09-30Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-devTreeHugger Robot
2022-09-30[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
bb89705639 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/20083403 Change-Id: I9f761d63004ac4f4ee45e1ce972ce165c04ee32a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I25e6da0c095e014bed3c199b4fc1bd174fe79332
2022-09-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I36c8953c68e51bb68834895f4ff5a26f83a990ee
2022-07-19Update the target sdk version to 33 for pre-installed appHui Wang
Bug: 232712689 Test: make, and check the target sdk version from the build Change-Id: I5dc88cf424d8719dab4508b339b30a431d7f329e
2022-05-19Merge "Set target sdk version to 33" into tm-dev am: 49712a7cdd am: a903d01397Hui Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18438909 Change-Id: I64a46db56d665e522a6219c3ea63423344bb13be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19Merge "Set target sdk version to 33" into tm-dev am: 49712a7cddHui Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18438909 Change-Id: I0fd410a4a65656ddcb6bedd90669a28462b6a1cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18Merge "Set target sdk version to 33" into tm-devandroid13-devHui Wang
2022-05-17Set target sdk version to 33Hui Wang
Bug: 232712689 Test: manual - install apex on both S and T Test: atest CellBroadcastServiceTests Change-Id: I2b9e5e8bb2ee3c49fae7c11d1d9bb7a7c3f5727a
2022-05-13[automerge] Add a new config for KDDI (MCCMNC:44054) in cellbroadcastservice ↵Hyein Yu
2p: 0c44016e0e am: 66e4eef0fe am: 52482b5ba9 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18350092 Change-Id: Id490f63f10935ff8a84ad46f80aefadf83df6f8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13[automerge] Add a new config for KDDI (MCCMNC:44054) in cellbroadcastservice ↵Hyein Yu
2p: 0c44016e0e am: 66e4eef0fe Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18350092 Change-Id: I7de843dbfddd632cfc56d0507371975bb218d993 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13[automerge] Add a new config for KDDI (MCCMNC:44054) in cellbroadcastservice ↵Hyein Yu
2p: 0c44016e0e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18350092 Bug: 232195771 Change-Id: Iaab2689420e77e03c959f1a9197024ddd11f71af
2022-05-13Add a new config for KDDI (MCCMNC:44054) in cellbroadcastserviceHyein Yu
According to KDDI requirement, message expiration time should be 6 min. The existing kddi configuration(mcc440-mnc50) should be also applied in new kddi mccmnc(mcc440-mnc54). Bug: 232195771 Test: Manual Change-Id: I9ae6e2157d208c7cdeb3b73bb1722c886d9c1cc3
2022-05-10Merge "Support ES-Alert to set expiration time as one hour" into tm-dev am: ↵TreeHugger Robot
55a25e7102 am: b92d6314b5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18291326 Change-Id: Iaa6d919ec9e3fd414f300444882e6c2586afa8fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Merge "Support ES-Alert to set expiration time as one hour" into tm-dev am: ↵TreeHugger Robot
55a25e7102 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18291326 Change-Id: Ibc49a6f35626ca2a1d6a7ad798e8879924e9d2fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Merge "Support ES-Alert to set expiration time as one hour" into tm-devTreeHugger Robot
2022-05-10Support ES-Alert to set expiration time as one hour am: 9bfb04245b am: ↵Hui Wang
870ad8c91e am: 31662ba7c1 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18141930 Change-Id: Ibccc831ecb3a7be7a89b9fe4ea23e59f18aafb9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Support ES-Alert to set expiration time as one hour am: 9bfb04245b am: ↵Hui Wang
870ad8c91e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18141930 Change-Id: Ic480101bf111d1d5a5b86fd5107b417fc8b42b5e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Support ES-Alert to set expiration time as one hour am: 9bfb04245bHui Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18141930 Change-Id: I87c7ee1a4313e289f3444d5eb3c05d28e1490e27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Support ES-Alert to set expiration time as one hourHui Wang
Bug: 227796742 Test: manual - verify the alert and settings per the requirement Change-Id: I60c1adb02f7cc1f7b5f379fa7022f8d853fc62b0 (cherry picked from commit 9bfb04245b62debb6231f7fa0604f76129a1d5d6)
2022-05-10Support ES-Alert to set expiration time as one hourHui Wang
Bug: 227796742 Test: manual - verify the alert and settings per the requirement Change-Id: I60c1adb02f7cc1f7b5f379fa7022f8d853fc62b0
2022-04-12[automerge] Add extra jarjar rule 2p: 9bf06c9b1b am: fe549488c1 am: e930cdb49cAndrei Onea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/17685818 Change-Id: If027683f73369a6f9d039ea7b1bb7f9eed5099b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12[automerge] Add extra jarjar rule 2p: 9bf06c9b1b am: fe549488c1Andrei Onea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/17685818 Change-Id: I2d902fcddef487de480b929bb36131364466c278 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11[automerge] Add extra jarjar rule 2p: 9bf06c9b1bAndrei Onea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/17685818 Bug: 228572768 Change-Id: I86bbf20602d95c053f3f2233acc243e37f2e826c
2022-04-11Add extra jarjar ruleAndrei Onea
The StrictJavaPackagesTest#testApkInApex_nonClasspathClasses test is failing on S builds due to com.android.internal.util.Preconditions being eclipsed by the version shipped in the frameworks jar. Bug: 228572768 Test: atest StrictJavaPackagesTest Change-Id: I39110f886b651214428f106d047d7ca5aa2d5eb0
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 09126f1d84 -s ours ↵Xin Li
am: 2565cf7b85 -s ours am: 2a8bf8565a -s ours am: fc67fb1d81 -s ours am skip reason: Merged-In I2c03f38abbb77968c1f283d439d19f93996c72d6 with SHA-1 6d5d073e19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/17545251 Change-Id: I9bdbb4d0a8c5dbf5957665070f3e878263ccb4b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 09126f1d84 -s ours ↵Xin Li
am: 2565cf7b85 -s ours am: 2a8bf8565a -s ours am skip reason: Merged-In I2c03f38abbb77968c1f283d439d19f93996c72d6 with SHA-1 6d5d073e19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/17545251 Change-Id: I2b19849ff45ad6ab606cf08a1250e13a8568ea20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 09126f1d84 -s ours ↵Xin Li
am: 2565cf7b85 -s ours am skip reason: Merged-In I2c03f38abbb77968c1f283d439d19f93996c72d6 with SHA-1 6d5d073e19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/17545251 Change-Id: Ia98bd743cbf3a5a82188e3673f5514a9f1cd16df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 09126f1d84 -s oursXin Li
am skip reason: Merged-In I2c03f38abbb77968c1f283d439d19f93996c72d6 with SHA-1 6d5d073e19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/17545251 Change-Id: I7e99c9c7aa0ae012dabb8f007c8c2e49d1412a29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: I2c03f38abbb77968c1f283d439d19f93996c72d6 Change-Id: I085b37f41835b04829234772806a185643a265ff
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
4836d995ec -s ours am: b6d363e48b -s ours am: 6d5d073e19 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2045708 Change-Id: I94e121bc87e9ed5c8c47df1cb1737ce337cc4292 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
4836d995ec -s ours am: b6d363e48b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2045708 Change-Id: I2c03f38abbb77968c1f283d439d19f93996c72d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a8796a0fad -s ours am: 7c6713a562 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/17422484 Change-Id: I0ac4d61e185c475ca6bcc3d8b5ece5e1a2e374aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
4836d995ec -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2045708 Change-Id: I6c6c4de3ab177fbf48583d778002db09e105f118 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a8796a0fad -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/17422484 Change-Id: I0943c4dc74c1be4164470fae65bbb1e7227e8c2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I413d76e0d839edc7b2954e7ae1a414a3a9d5decf
2022-03-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I85e079b99207aa0891adfa0f5f82171827cb32c6
2022-03-16Merge "Revert^2 "Add dependencies to the proper allowlists"" into tm-devAndrei-Valentin Onea
2022-03-09[automerge] Remove redundant resources cache 2p: df0439ecfcPresubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/17048964 Bug: 222126649 Change-Id: I8ae4a45cb563d2b4a5331860e499c702269964c5
2022-03-09Remove redundant resources cacheHui Wang
Bug: 222126649 Test: atest CellBroadcastServiceTests:CellBroadcastHandlerTest Change-Id: I6c34ad6c998f25b4169a6f75dcaaba0549334fe5
2022-03-09[automerger skipped] Merge Android 12L am: 327e7c5131 -s ours am: 5069d5d7a0 ↵Xin Li
-s ours am: b1f41dca41 -s ours am skip reason: Merged-In Ic35a95f3538661d3cf3249d172f4cb3e7eddad9e with SHA-1 2471b1a481 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2013306 Change-Id: I10d5b2c370ba5370478c663901baf140956c17c5
2022-03-08[automerger skipped] Merge Android 12L am: 327e7c5131 -s ours am: 5069d5d7a0 ↵Xin Li
-s ours am skip reason: Merged-In Ic35a95f3538661d3cf3249d172f4cb3e7eddad9e with SHA-1 2471b1a481 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2013306 Change-Id: I184a539adbbf0607d207948063f445293834e13d
2022-03-08[automerger skipped] Merge Android 12L am: 327e7c5131 -s oursXin Li
am skip reason: Merged-In Ic35a95f3538661d3cf3249d172f4cb3e7eddad9e with SHA-1 2471b1a481 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/2013306 Change-Id: I1e3058a83a6268b33d2e73b48a3f604b785f341b
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: Ic35a95f3538661d3cf3249d172f4cb3e7eddad9e Change-Id: I085920469fe6e1ec06c4a1cf92c01da2d9a9a69a
2022-03-04Revert^2 "Add dependencies to the proper allowlists"Andrei-Valentin Onea
557d78a591f481051cb44f102233cc6f65be17a6 Change-Id: Ibc6bab74d030ead75682010e95c17c50b54b0609
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 14:40:11 +0000