summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-11Snap for 8570526 from e808d221767c28190f71b62f1ed36d2f6836c0ee to ↵aml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020android13-mainline-media-swcodec-releaseAndroid Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I5c3d6ef2e659b655e8974a0b4d98f93d2d0c92db
2022-04-01Merge "Updated the owners" am: 231d99f2bd am: cee1682636 am: beb1cdf7f7 am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_331113000aml_sch_331111000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050android13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-art-releaseaml_tz4_332714010Treehugger Robot
126b405520 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2052141 Change-Id: Ifd9bef467664942e83673c55db3e548fe30fe88c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Updated the owners" am: 231d99f2bd am: cee1682636 am: beb1cdf7f7t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2052141 Change-Id: Ia596b9617edc013cda42a250c742266b015f9360 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Updated the owners" am: 231d99f2bd am: cee1682636Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2052141 Change-Id: I333297183b0f952c20293b2d6e145e7150cea08b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Updated the owners" am: 231d99f2bdTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2052141 Change-Id: I77a2afe63608b691aa697b727bd1000a7ecce3dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Updated the owners"Treehugger Robot
2022-03-31Updated the ownersJack Yu
Test: None Bug: None Change-Id: I64e9e29986642aae4a4e87c9459e5221b744490b
2022-03-09[automerger skipped] Merge "Merge Android 12L" am: dd488b2684 -s ours am: ↵Xin Li
47ba7a8d41 -s ours am: b2aba6dcde -s ours am: fcc3601063 -s ours am skip reason: Merged-In I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 with SHA-1 acb6e110d2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2012834 Change-Id: I4945114ed3d2937752ae871da7f7aa6887d98232
2022-03-09[automerger skipped] Merge Android 12L am: 3955ebf443 -s ours am: 3a704a5818 ↵Xin Li
-s ours am: 42fcd1d2b0 -s ours am: 7b4ab76bd4 -s ours am skip reason: Merged-In I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 with SHA-1 acb6e110d2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2012834 Change-Id: Ib12013021c5e4ea6283ee076e8cfceaf1131f84e
2022-03-09[automerger skipped] Merge "Merge Android 12L" am: dd488b2684 -s ours am: ↵Xin Li
47ba7a8d41 -s ours am: b2aba6dcde -s ours am skip reason: Merged-In I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 with SHA-1 acb6e110d2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2012834 Change-Id: Ieb26831dba193198629b03b4ff528d8cbc828ecd
2022-03-09[automerger skipped] Merge Android 12L am: 3955ebf443 -s ours am: 3a704a5818 ↵Xin Li
-s ours am: 42fcd1d2b0 -s ours am skip reason: Merged-In I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 with SHA-1 acb6e110d2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2012834 Change-Id: I51106fe2dd780c0a72107cc42f1ba29486ffdab2
2022-03-08[automerger skipped] Merge "Merge Android 12L" am: dd488b2684 -s ours am: ↵Xin Li
47ba7a8d41 -s ours am skip reason: Merged-In I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 with SHA-1 acb6e110d2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2012834 Change-Id: I549f19429915e1d2256156ebdd88a395eaa4930d
2022-03-08[automerger skipped] Merge Android 12L am: 3955ebf443 -s ours am: 3a704a5818 ↵Xin Li
-s ours am skip reason: Merged-In I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 with SHA-1 acb6e110d2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2012834 Change-Id: I4279f7df360ce54d9accf11fea5e4f7cb9aa54c4
2022-03-08[automerger skipped] Merge "Merge Android 12L" am: dd488b2684 -s oursXin Li
am skip reason: Merged-In I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 with SHA-1 acb6e110d2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2012834 Change-Id: Ie131da728c20b91b1cc9b0999631fa70a13dbcbb
2022-03-08[automerger skipped] Merge Android 12L am: 3955ebf443 -s oursXin Li
am skip reason: Merged-In I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 with SHA-1 acb6e110d2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2012834 Change-Id: Ida9c6f0b79be4d3a95398211fd2fdd522169dbc8
2022-03-08Merge "Merge Android 12L"Xin Li
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 Change-Id: I387190a7a49e6f63b5f305e9c24c4589619090a1
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
acb6e110d2 -s ours am: 6daa751938 -s ours am skip reason: Merged-In I7cdac3086d5c976e5dbe24e8bb06a433058c32af with SHA-1 522087e4f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/16845666 Change-Id: If676fdb07ba976abf9b841612286cc02e69fba1c
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
acb6e110d2 -s ours am skip reason: Merged-In I7cdac3086d5c976e5dbe24e8bb06a433058c32af with SHA-1 522087e4f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/16845666 Change-Id: If1138904cd96b138c80c2a8530c42c4feddf43a0
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: I7cdac3086d5c976e5dbe24e8bb06a433058c32af Change-Id: I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9
2022-02-01Merge "Fix license and license text." am: 3aff261185 am: ff06da9b36 am: ↵Treehugger Robot
399787f267 am: 4e3b76cf1d Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1964703 Change-Id: Ib97a4458e2abd6533c09249f04313adecbda6114
2022-02-01Merge "Fix license and license text." am: 3aff261185 am: ff06da9b36 am: ↵Treehugger Robot
399787f267 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1964703 Change-Id: I9b28c0ca4af063de65e38518319bbb624dbbf3b2
2022-02-01Merge "Fix license and license text." am: 3aff261185 am: ff06da9b36Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1964703 Change-Id: Id738c05ea2914789c5b6cec6fd9d91b8f2df0da6
2022-02-01Merge "Fix license and license text." am: 3aff261185Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1964703 Change-Id: Ic1cc111b74662c48302513b7a84e6bb9c2e5bedf
2022-02-01Merge "Fix license and license text."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
2022-01-27Fix license and license text.Bob Badour
Entire project is 1p. Test: m nothing Change-Id: I29551ac86376db8f4ef5cf3b087d0bf310ac28fc
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: c215fda939 -s ours ↵Xin Li
am: 155277c044 -s ours am: 835ffe9810 -s ours am: f9aa3291df -s ours am skip reason: Merged-In Iafb589f302cf44bca6946f20093fbd6a5888524c with SHA-1 0799274e9c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1921945 Change-Id: I42db1bb8b408e1e106f92c8a2565a2683a13e2b5
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: c215fda939 -s ours ↵Xin Li
am: 155277c044 -s ours am: 835ffe9810 -s ours am skip reason: Merged-In Iafb589f302cf44bca6946f20093fbd6a5888524c with SHA-1 0799274e9c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1921945 Change-Id: Iecfc8fca0fb70419cca30fd415b49550bd08e3ca
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: c215fda939 -s ours ↵Xin Li
am: 155277c044 -s ours am skip reason: Merged-In Iafb589f302cf44bca6946f20093fbd6a5888524c with SHA-1 0799274e9c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1921945 Change-Id: I1a7fc00e1ce1320ad1ac7ad2d14eae343f231143
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: c215fda939 -s oursXin Li
am skip reason: Merged-In Iafb589f302cf44bca6946f20093fbd6a5888524c with SHA-1 0799274e9c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1921945 Change-Id: I432c18522ca5eff0e5af45659632525d75f1bef6
2021-12-14Merge "Merge Android 12 QPR1"Xin Li
2021-12-14Merge Android 12 QPR1Xin Li
Bug: 210511427 Merged-In: Iafb589f302cf44bca6946f20093fbd6a5888524c Change-Id: I42ebdbec8b77208de4baaf3cb1383ac6edf1ece1
2021-12-08add post_notification permission to manifestSteve Elliott
so the package can send notifications on T+ Bug: 194833441 Change-Id: I6395389f778460b84a2a8f351ffafb30b2df3b11
2021-11-18[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
0799274e9c -s ours am: 21e0c6ca6e -s ours am: 9db5bdbce3 -s ours am skip reason: Merged-In I9936a3eac58497f7e54184499d9bc04d40696e03 with SHA-1 6c821e60ac is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/16278707 Change-Id: I2dced97393b3be059b910870d8d2976d10b2ab44
2021-11-18[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
0799274e9c -s ours am: 21e0c6ca6e -s ours am skip reason: Merged-In I9936a3eac58497f7e54184499d9bc04d40696e03 with SHA-1 6c821e60ac is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/16278707 Change-Id: I868cf5dca2e28681be4f0223af9db7cd85a6a84c
2021-11-18[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
0799274e9c -s ours am skip reason: Merged-In I9936a3eac58497f7e54184499d9bc04d40696e03 with SHA-1 6c821e60ac is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/16278707 Change-Id: I1805728177542db71edec420af0ff19b79a2b608
2021-11-11Merge "Adding receiver flags to STK"TreeHugger Robot
2021-11-10Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918temp_sam_210511427temp-sc-samXin Li
Bug: 205056467 Merged-In: I9936a3eac58497f7e54184499d9bc04d40696e03 Change-Id: Iafb589f302cf44bca6946f20093fbd6a5888524c
2021-11-09[automerger skipped] Merge "Update owners file" am: e8fab4f065 am: ↵Treehugger Robot
d59801ae6b am: 7a62caae40 -s ours am: 0de082d971 -s ours am: 61fc8a9bd7 -s ours am skip reason: Merged-In I7cdac3086d5c976e5dbe24e8bb06a433058c32af with SHA-1 522087e4f4 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1885315 Change-Id: I21f0e79370e1875a3d6f058636471dfcc162872a
2021-11-09[automerger skipped] Merge "Update owners file" am: e8fab4f065 am: ↵Treehugger Robot
d59801ae6b am: 7a62caae40 -s ours am: 0de082d971 -s ours am skip reason: Merged-In I7cdac3086d5c976e5dbe24e8bb06a433058c32af with SHA-1 522087e4f4 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1885315 Change-Id: I819e96a8e0b02285d4f1e98e8cdff66803988e6c
2021-11-09[automerger skipped] Merge "Update owners file" am: e8fab4f065 am: ↵Treehugger Robot
d59801ae6b am: 7a62caae40 -s ours am skip reason: Merged-In I7cdac3086d5c976e5dbe24e8bb06a433058c32af with SHA-1 522087e4f4 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1885315 Change-Id: I590b06722774729be1a387b3894e747e52d042fe
2021-11-09Merge "Update owners file" am: e8fab4f065 am: d59801ae6bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1885315 Change-Id: Ife904f716e200ca2f265b4ed3a0dbf7feafb6cc6
2021-11-09Merge "Update owners file" am: e8fab4f065Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1885315 Change-Id: Ie5f360ef2cadb2681cd9f30bbe6c9317726aae2e
2021-11-09Merge "Update owners file"Treehugger Robot
2021-11-09Update owners fileSooraj Sasindran
add sasindran rm nazaninb Bug: 199432252 Test: build Merged-In: I7cdac3086d5c976e5dbe24e8bb06a433058c32af Change-Id: I7cdac3086d5c976e5dbe24e8bb06a433058c32af
2021-11-02Adding receiver flags to STKJacob Hobbie
ACTION_CLOSE_SYSTEM_DIALOG always requires a receiver exported flag. It seems as if receiver in ToneDialog has one caller in the same class, so we are going to mark it as NOT_EXPORTED. Change-Id: I4f6a138fad39dda7b091b5cd71dd6d4906211f61 Test: no-op Bug: 161145287
2021-10-19Merge "Remove unnecessary content title from notifications" am: cead072ccc ↵Jordan Liu
am: ea4c284bed am: bc0e217c23 am: 98789be4c3 am: ddd48cd737 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1450515 Change-Id: I06400e265987f36a65b2fc144d9a6d5d678e8474
2021-10-19Merge "Remove unnecessary content title from notifications" am: cead072ccc ↵Jordan Liu
am: ea4c284bed am: bc0e217c23 am: 98789be4c3 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1450515 Change-Id: I4667332079a1e5ea4ce7aae4e71daaff8c5a3c19
2021-10-19Merge "Remove unnecessary content title from notifications" am: cead072ccc ↵Jordan Liu
am: ea4c284bed am: bc0e217c23 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1450515 Change-Id: I62e03503f6cc78af57d9157f1b10992022df2bbc
2021-10-19Merge "Remove unnecessary content title from notifications" am: cead072ccc ↵Jordan Liu
am: ea4c284bed Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1450515 Change-Id: If191d9a8d138a7a28c59eba9ac0d4386ee82f9bb
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 05:11:40 +0000