summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I6af7b492384112442b8f2181ee74170e212ccac2 Change-Id: Ia64cbab09d7c0497b9392a9187dc7fca08b25c09
2021-09-06[automerger skipped] Merge "Compile CellBroadcastReceiver with ↵temp_sam_202323961Anton Hansson
module_current" am: d5887847b9 -s ours am skip reason: Merged-In I2be92e9a42e104987519bfd3c617c443d9bfece1 with SHA-1 49066b054c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/1817964 Change-Id: I6af7b492384112442b8f2181ee74170e212ccac2
2021-09-06Merge "Compile CellBroadcastReceiver with module_current"android-s-beta-5android-s-beta-5Anton Hansson
2021-09-02Compile CellBroadcastReceiver with module_currentAnton Hansson
This sdk_version is one created especially for modules, and includes @SystemApi(client = MODULE_LIBRARIES) on top of normal @SystemApi. Note that to call these APIs the app must be allowed to access hidden APIs, which normal APKs are not but APK-in-apexes are. This allows removing framework-annotations from the module sources, which avoids follow-on problems of depending on shared util libraries. Bug: 198418216 Test: m com.android.cellbroadcast Change-Id: I2be92e9a42e104987519bfd3c617c443d9bfece1
2021-09-02Compile CellBroadcastReceiver with module_currentAnton Hansson
This sdk_version is one created especially for modules, and includes @SystemApi(client = MODULE_LIBRARIES) on top of normal @SystemApi. Note that to call these APIs the app must be allowed to access hidden APIs, which normal APKs are not but APK-in-apexes are. This allows removing framework-annotations from the module sources, which avoids follow-on problems of depending on shared util libraries. Bug: 198418216 Test: m com.android.cellbroadcast Merged-In: I2be92e9a42e104987519bfd3c617c443d9bfece1 Change-Id: I2be92e9a42e104987519bfd3c617c443d9bfece1
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li
Merged-In: I14d1e42a2793027299182a0bc7585085b414ad25 Change-Id: I669bd4667fdfca56731f2c0040217b6834ea609a
2021-08-06[automerger skipped] Merge "Update telephony OWNERS file" am: 3ae814f3e1 am: ↵Jayachandran Chinnakkannu
1034c5033d -s ours am skip reason: Merged-In I48fd50fa69c5c795034ecd683394b0ae66d0ae3c with SHA-1 dc36848d87 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/1785435 Change-Id: I14d1e42a2793027299182a0bc7585085b414ad25
2021-08-06Merge "Update telephony OWNERS file" am: 3ae814f3e1Jayachandran Chinnakkannu
Original change: https://android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/1785435 Change-Id: Id5f67758cb74f1b8e2dd94395be1deabbb7fcccf
2021-08-06Merge "Update telephony OWNERS file"Jayachandran Chinnakkannu
2021-08-06Version bump for CellBroadcast am: 884176f052Anton Hansson
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15472571 Change-Id: I2b25eecc61c9c01b84f0976ac4a2a8c5eb6dca11
2021-08-05Version bump for CellBroadcastandroid12-devAnton Hansson
MTS is failing to install CellBroadcast as the version is lower than the preinstalled version has a higher version code than the dev one. Bug: 193059742 Bug: 194877685 Test: build & aapt dump badging <apex> Change-Id: I6e8fa5e531d4d70500648fb7aca50074d436b041
2021-08-04Update telephony OWNERS file am: dc36848d87Jayachandran C
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15453795 Change-Id: I199a273ab00cfd8d1dda2600a0949a9a12ed5dae
2021-08-04Update telephony OWNERS fileJayachandran C
Bug: 195421431 Test: Build Change-Id: I48fd50fa69c5c795034ecd683394b0ae66d0ae3c Merged-In: I48fd50fa69c5c795034ecd683394b0ae66d0ae3c
2021-08-03Update telephony OWNERS fileJayachandran C
Bug: 195421431 Test: Build Change-Id: I48fd50fa69c5c795034ecd683394b0ae66d0ae3c
2021-07-30Merge "KR public safety toggle part 3" into sc-dev am: 0960963300TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15422855 Change-Id: I01004e7690b226685ebe7c025ca8cadfa45fed7c
2021-07-30Merge "KR public safety toggle part 3" into sc-devTreeHugger Robot
2021-07-30[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: 0d5ae254b0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15429330 Change-Id: I3ba38b52a3cec95cc0e05e68cc3fd7810e658ef5
2021-07-30[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
71884e1389 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15429332 Change-Id: I9f992044dee4b71a058096d37a03ecb327c38b0c
2021-07-30Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2021-07-30Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If4ca2757b5357d8b229ed367d6c2efc05d1a297c
2021-07-30Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I63c450916efff2bce878c4b94838b6096d3e2e35
2021-07-29KR public safety toggle part 3Chen Xu
When users turns off full-screen messages, the notification displayed show switch from importance low to importance high (headsup notification). Bug: 175045929 Test: Manaul Change-Id: If6a286347ac6068c4c2286d5b1d6f825b5e575be
2021-07-29[automerger skipped] FCC change Presidential alert label to “National ↵Chen Xu
alert” am: 99368acece -s ours am skip reason: Merged-In I2a11c48fba251de0d2343cfe9d146aee764f17e2 with SHA-1 8da6863484 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15415100 Change-Id: I5ede5d8a647b52996b4fcb813ab50bcd918ed354
2021-07-29FCC change Presidential alert label to “National alert”Chen Xu
Bug: 191695800 Bug: 190325964 Test: Manual Change-Id: I7feeeaf2b611efb2ccadfbbec7fc95d8020cd7ee Merged-in: I2a11c48fba251de0d2343cfe9d146aee764f17e2
2021-07-29Merge "correct cbr dialog timestamp format for Chile" into sc-dev am: ef55ee1571Chen Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15413790 Change-Id: I3969835b42fee2b777aa83988219d9ed47ea399a
2021-07-29Merge "correct cbr dialog timestamp format for Chile" into sc-devChen Xu
2021-07-29Merge "FCC change Presidential alert label to “National alert”" into ↵TreeHugger Robot
sc-dev am: 5a76f2f9d9 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15113464 Change-Id: Iec1a064bcdad6845dfa45b206096b9199c0abd39
2021-07-29Merge "FCC change Presidential alert label to “National alert”" into sc-devTreeHugger Robot
2021-07-29Merge "provide alram on/off function of public safety messages for KR" into ↵TreeHugger Robot
sc-dev am: 9bf4da5d81 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15413801 Change-Id: I769641cdd39f2f6536616e0e2c4f9184a2e6ffd2
2021-07-29Merge "FCC change Presidential alert label to “National alert”" into ↵TreeHugger Robot
sc-dev am: 3c60d1e39b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15413805 Change-Id: I003f7df7a726ea65a20455c9362a676d42075ddb
2021-07-29FCC change Presidential alert label to “National alert”Chen Xu
Bug: 191695800 Bug: 190325964 Test: Manual Change-Id: I5e5acb5b762f3177449c905b6f2f7f94960e8e43 (cherry picked from commit 07a9a874f530f4e4e01042d4665f8d892a0e9c44)
2021-07-29Merge "provide alram on/off function of public safety messages for KR" into ↵TreeHugger Robot
sc-dev
2021-07-29correct cbr dialog timestamp format for ChileChen Xu
per Chile latest requirement, the timestamp should be in the format of yyyy-MM-dd Bug: 181791547 Test: Manual test Change-Id: Id86137b1f5fb10a25b084bbf5968fac75b131c08 (cherry picked from commit 96bc4d46e1b254a35912b24d866fd15f23b95672)
2021-07-29Merge "FCC change Presidential alert label to “National alert”" into sc-devTreeHugger Robot
2021-07-28Merge "support Turkey emergency alert" into sc-dev am: 76bf59c5e9TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/14924644 Change-Id: Ia50da7b5cf95a7d32b87e493cd8d8240d5639f27
2021-07-28Merge "support Ecuador emergency alert" into sc-dev am: b565605df5TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15404629 Change-Id: Iad7c71c29f094cb31fbad43311a7afede6a7e1ba
2021-07-28Merge "support Turkey emergency alert" into sc-devTreeHugger Robot
2021-07-28Merge "support Ecuador emergency alert" into sc-devTreeHugger Robot
2021-07-28Merge "Update config for CA" into sc-dev am: fcc19eaa93TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15404628 Change-Id: Id3220e12d63041b708554cdeeceec6be9cb2128e
2021-07-28keep default settings on for Telstra am: 6521b318baChen Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15404627 Change-Id: I59db26a2f4e5220dca27d751191afe8603e6846a
2021-07-28Merge "Update config for CA" into sc-devTreeHugger Robot
2021-07-28FCC change Presidential alert label to “National alert”Chen Xu
Bug: 191695800 Bug: 190325964 Test: Manual Change-Id: I2a11c48fba251de0d2343cfe9d146aee764f17e2 (cherry picked from commit 7cd9e7b83b593d5e30be1a3c96ae7cb5e3539575) Merged-in: I2a11c48fba251de0d2343cfe9d146aee764f17e2
2021-07-28provide alram on/off function of public safety messages for KRChen Xu
this feature has been recently approved by KR gov, thus enable the flag. Bug: 175045929 Test: Manual Change-Id: Iec107d4d8420ccec3d6dc64d808dbbfe07ea34ba (cherry picked from commit 984c951a39c5407900cc0e7e214b0ffa3e52bc0c) Merged-in: Iec107d4d8420ccec3d6dc64d808dbbfe07ea34ba
2021-07-28support Turkey emergency alertChen Xu
1. enabling channels for both primary and secondary languages 2. for 4370 users are not allowed to opt-out 3. rename the strings for settings and alert title to fit Turkey requirements. 4. allow users to receive secondary langauges only if matches with users languages settings preference. Bug: 186738619 Test: Manual Change-Id: I05c50055a8b6f8e25288ae6c6b20544fd8233b75 (cherry picked from commit 8db2dc9bebb7cbafe4bb2dcd1999bb3a85acb01f) Merged-in: I05c50055a8b6f8e25288ae6c6b20544fd8233b75
2021-07-28support Ecuador emergency alertChen Xu
support Ecuador emergency alert refactor timestamp support Bug: 181791547 Test: Manual Change-Id: Ib80fe1bc0e467cc50bb2aeb81266c17923ab3eac (cherry picked from commit 5bc4c0a34dace311ea83c4135c15be755bb4f488) Merged-in: Ib80fe1bc0e467cc50bb2aeb81266c17923ab3eac
2021-07-28Update config for CAJordan Liu
Add channels 4396-4399 which are reserved for future use and required by CA (though not yet used in practice). Disallow copying of text in CA. Bug: 189974149 Test: manual Change-Id: I9348660e9181ebd3c3ea0ab8c4325bdff6d910ab (cherry picked from commit e00b348d3eb3cf089cd1d6a18539b71e9eaa728f) Merged-in: I9348660e9181ebd3c3ea0ab8c4325bdff6d910ab
2021-07-28keep default settings on for TelstraChen Xu
Bug: 185735578 Test: Build Change-Id: Id7ee22bde960d0f0cca61c100ef0d66c119da2ef (cherry picked from commit 26de15dcae0923747f0d5d8f784a56af44b44bd0) Merged-in: Id7ee22bde960d0f0cca61c100ef0d66c119da2ef
2021-07-26use customize layout in CollapsingToolbarBaseActivity for R SDK am: 3f2e446f80Chen Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15283320 Change-Id: Ie4c368482f7dfc092ce37b5be4cdf6b21078447a
2021-07-26use customize layout in CollapsingToolbarBaseActivity for R SDKChen Xu
We introduced the collapsing toolbar on S. To enable this feature needs to correspondingly adjust the theme that the activity uses. However these changes might cause some mainline module apps get crashed when running on R. A customize layout is allowed to use for some cases that need to roll back to the layout used in R. Bug: 192395187 Test: visual verified Change-Id: Ifd0153dcc94324102d9ac07c20b03afcc720a9a7 (cherry picked from commit 6ea1ee7abbc1a17ba264ba5bc6a3b6dbdd5bfe4d) Merged-in: Ifd0153dcc94324102d9ac07c20b03afcc720a9a7
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 21:13:08 +0000