- Jun 24, 2022
-
-
Hui Yu authored
[automerger skipped] Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-mainline-prod am: 05688a7e -s ours am: 4bb48591 -s ours am: 665ae0b7 -s ours am: 6ce1e8a2 -s ours am: 2fb17677 -s ours am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892 Change-Id: Id689513e8e4708a3a2c49df635a8cc847ebca2c0 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Presubmit Automerger Backend authored
[automerger skipped] [automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391 am: 8657d8e5 -s ours am: 75cb9256 -s ours am: 499085cd -s ours am: be160c76 -s ours am: 3fa9b4c6 -s ours am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892 Change-Id: I2c627888adc62811572be149d4f570a4d2d2e8d8 Signed-off-by:
-
Automerger Merge Worker authored
Merge changes from topic "am-bebd4b7ecee143699c7f9c2125e12a08" into tm-d1-dev-plus-aosp am: 876c0b7d am: 56a9d574 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18437663 Change-Id: Ib44247458c6891cbd760ad525ac7fb5ffc002f3b Signed-off-by:
-
TreeHugger Robot authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3f0476ba -s ours am: 6809072d -s ours am: 2e682863 -s ours am: acc37030 -s ours am: 9ef491ce -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18437663 Change-Id: I1ed739cd3173b784b2210045d94cf383c5624d5a Signed-off-by:
-
Lucas Lin authored
[automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378 am: 1f68b323 am: 59378118 am: 054b17e9 -s ours am: cf65e890 -s ours am: 527a4f9f -s ours am: 948b4ff6 -s ours am: f3623dc4 -s ours am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 65d44b93 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18279994 Change-Id: Ic6b9e62fe14f99c0d11b7a20a6ee4e4faad9d68e Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into sc-dev am: f6e715f9 -s ours am: 4a107edf -s ours am: 8e0c0c8b -s ours am: dd0ac21a -s ours am: 8db0861b -s ours" into tm-qpr-dev-plus-aosp am: bf061bfd -s ours am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892 Change-Id: Ib9678d40cf3abb9a55c81f6110d02bbbb0e298c0 Signed-off-by:
-
Hui Yu authored
[automerger skipped] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into sc-dev am: f6e715f9 -s ours am: 4a107edf -s ours am: 8e0c0c8b -s ours am: dd0ac21a -s ours am: 8db0861b -s ours am: 0733a35b -s ours am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892 Change-Id: Ida40c513d8cc4c28cee257b18e2aa7dad6c69ac4 Signed-off-by:
-
Automerger Merge Worker authored
Merge changes from topic "am-963ff62c131244b6ad6cd7098f99feef" into tm-qpr-dev-plus-aosp am: d06c807f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18692897 Change-Id: Iea9bd2c30eff0dfb1c59f8c3fc9fb4f7d5fd97f1 Signed-off-by:
-
TreeHugger Robot authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 01bb5ac4 -s ours am: 40388073 -s ours am: 2ca09fe0 -s ours am: d415653c -s ours am: 9335f321 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18692897 Change-Id: I85e74b480a2cd7d589e0136091dab2de21132a0a Signed-off-by:
-
TreeHugger Robot authored
[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46 am: a4bbe303 -s ours am: 043d3bd5 -s ours am: f6423494 -s ours am: 63d40c49 -s ours am: 002a760d -s ours am: 45ac7deb -s ours am: ddc8025c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993 Change-Id: I07c0fffe055afe98ea2ead01e3cc4a751b81fd8e Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b5" am: 8bb5e98e -s ours am: c543f70e -s ours am: aa456df7 -s ours am: b1cf2a0c -s ours am: 5b060c23 -s ours am: 8974fef6 -s ours am: a2b313ae -s ours am: 21bc5de8 -s ours" into tm-qpr-dev-plus-aosp am: 9b59009e -s ours am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 8e278543 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625677 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659051 Change-Id: I205b74a206f46e72b7f330d4f4f269f28e1ff23a Signed-off-by:
-
Wenhao Wang authored
[automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b5" am: 8bb5e98e -s ours am: c543f70e -s ours am: aa456df7 -s ours am: b1cf2a0c -s ours am: 5b060c23 -s ours am: 8974fef6 -s ours am: a2b313ae -s ours am: 21bc5de8 -s ours am: 1c27bb1f -s ours am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b5 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659051 Change-Id: I2f79613d966ebc31d8c623f349ecb1a00ddab260 Signed-off-by:
-
Automerger Merge Worker authored
Merge changes from topic "am-b8e53481406d4cfbbf878e7249a82bb8" into tm-qpr-dev-plus-aosp am: 7ae0c025 -s ours am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc72 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18408986 Change-Id: I38549961b6692369678973569b3f9fb0a9816aac Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d73 am: e545a5db -s ours am: 94c17650 -s ours am: 7aaba89b -s ours am: 89ed3dc2 -s ours am: a3452e42 -s ours am: 6b7d2d10 -s ours am: 3aa32715 -s ours" into tm-d1-dev-plus-aosp am: c25f0fe0 -s ours am: 78f91963 -s ours am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc72 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18408986 Change-Id: I9d201dc9fd26bfc8d1d68c912fefddcd10a5f05b Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] [conflict] Move service initialization am: 38fe45b5 am: 012cace2 -s ours am: f3a82a3b -s ours am: b50f345f -s ours am: f03f3fad -s ours am: 1d6e5eb7 -s ours am: ebb1a21f -s ours am: 2fcd6ded -s ours am: 7f4c172f -s ours am: d3ba1c61 -s ours am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625677 Change-Id: I12df833493e8f3c455e8b24bd44ec4394444260b Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] Move service initialization am: caa5a22e -s ours am: 2ee5edda -s ours am: 39711c9d -s ours am: 8e73531d -s ours am: eb114e53 -s ours am: 30d6250e -s ours am: 916ecb96 -s ours am: 15bfd28d -s ours am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 14d7f081 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577100 Change-Id: I88f080a151e66226738259086ce69c02721bc3b7 Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] Move service initialization am: 14d7f081 -s ours am: 56822a2c -s ours am: 2b530886 -s ours am: ad599554 -s ours am: da7a55fe -s ours am: 6df01781 -s ours am: e10732c0 -s ours am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 d262fa6a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18589711 Change-Id: Iabe1637248397551d797816434fcea925d4b6865 Signed-off-by:
-
Automerger Merge Worker authored
Merge changes from topic "am-4a94c5aa144e4bda8edcbb2f691333dd" into tm-qpr-dev-plus-aosp am: 3877dc83 -s ours am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892 Change-Id: Ic92358fe2700b4d93076fc2e5830b880bfbe829a Signed-off-by:
-
Hui Yu authored
[automerger skipped] Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-mainline-prod am: 05688a7e -s ours am: 4bb48591 -s ours am: 4874a851 -s ours am: 04823598 -s ours am: 700e0acc -s ours am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892 Change-Id: Ifb1e567ab654ef3eb1f9d956ef11ac4d15779c16 Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] Move service initialization am: d262fa6a am: 8ae47ac5 -s ours am: 906a75d7 -s ours am: 0fba38aa -s ours am: b3e5310e -s ours am: 45c01034 -s ours am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 8e278543 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18589618 Change-Id: I5d52f15db1c4d35ed0bcaa2c7802927f1992eb53 Signed-off-by:
-
Brian Julian authored
[automerger skipped] Add a permissions check to LocationManagerService. am: 8daa7024 -s ours am: 93170aab -s ours am: ed035ade -s ours am: ca54f681 -s ours am: 812c1538 -s ours am skip reason: Merged-In Id591cd39ed7813c649b44d4a3210f0b1fb79b40d with SHA-1 d1e6b593 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322259 Change-Id: I850e522d4323fa6a6456a060b8f82466570d7634 Signed-off-by:
-
Automerger Merge Worker authored
Merge changes from topic "am-fff65bf311764194ac266fe45e89521f" into tm-qpr-dev-plus-aosp am: f7722d88 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513340 Change-Id: I75d6eff7ec6ff60f057b680603f0b886af901054 Signed-off-by:
-
TreeHugger Robot authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bbef4c09 -s ours am: 8d63bd8e -s ours am: 2c30e9f3 -s ours am: 765e3e7a -s ours am: de7fbcba -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513340 Change-Id: I428ede661b778f2f8afbfd96a4dc0d89e0771d24 Signed-off-by:
-
TreeHugger Robot authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3f0476ba -s ours am: 6809072d -s ours am: 248f53dd -s ours am: e6f22835 -s ours am: f4295e98 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18437663 Change-Id: I19abcde13881ca29b1da078d6584d723b48c7367 Signed-off-by:
-
Bill Yi authored
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 207eed7a -s ours am: bffdec03 -s ours am: 2e33560a -s ours am: fe43515e -s ours am: 833cb238 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18437663 Change-Id: I67709d13644c5f917236a51773d252067ebee525 Signed-off-by:
-
TreeHugger Robot authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 534abbe2 -s ours am: 6a17ca1c -s ours am: 0f598338 -s ours am: b0cfecf1 -s ours am: 0b214831 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18437029 Change-Id: Ib2c2334596ab2ec2e51e228c25912b24d8143478 Signed-off-by:
-
Bill Yi authored
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5045c879 -s ours am: d08334ac -s ours am: 2987def2 -s ours am: 883208d3 -s ours am: 32adcd57 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18437029 Change-Id: I5339a58ac4b75d847b59e71060373853d258f928 Signed-off-by:
-
TreeHugger Robot authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6dcb367f -s ours am: 975062a2 -s ours am: a20f85fb -s ours am: dd96413c -s ours am: 468c58da -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18432097 Change-Id: I2fc3120a8902887692d98bfd97feca106f34c970 Signed-off-by:
-
Bill Yi authored
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7d89bf5 -s ours am: e6e60944 -s ours am: fbea4b7b -s ours am: fb20540e -s ours am: 174d98d8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18432097 Change-Id: Id5022fa9774245fab9fd26f708b02e1959be0a60 Signed-off-by:
-
TreeHugger Robot authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 41260e7b -s ours am: 9ec83453 -s ours am: 2f3e8ca0 -s ours am: bc42359f -s ours am: b56282d0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18425602 Change-Id: Id44dcf1e1c879c1f59598a0a3af44c8be91bb9dc Signed-off-by:
-
Bill Yi authored
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b90e218b -s ours am: ba02e47c -s ours am: 6b7c2844 -s ours am: c094e00d -s ours am: 8c02e208 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18425602 Change-Id: Id90e1ba462fa9a883194c55130eb8276e170251f Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46 am: a4bbe303 -s ours am: 043d3bd5 -s ours am: f6423494 -s ours am: 63d40c49 -s ours am: 64ef0803 -s ours" into tm-d1-dev-plus-aosp am: 1a15aef4 -s ours am: b2adb8fc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993 Change-Id: Id2e0f03531958e636868e0b0f23bf329570330f8 Signed-off-by:
-
TreeHugger Robot authored
[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46 am: a4bbe303 -s ours am: 043d3bd5 -s ours am: f6423494 -s ours am: 63d40c49 -s ours am: 64ef0803 -s ours am: 92b3dac8 -s ours am: 6d39b3ca -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993 Change-Id: Ie54ec6933c1bf0a4176d65da5bffc5142b9841a5 Signed-off-by:
-
Brian Julian authored
[automerger skipped] Merge "DO NOT MERGE. Add a permissions check to LocationManagerService." into sc-dev am: 3fe61746 am: 5c930498 -s ours am: 1171cda7 -s ours am: 2402a7bb -s ours am: 938285dc -s ours am: 9426d6dd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321041 Change-Id: I22345349ff515d7d8ea4de8800ff6fb499494cf4 Signed-off-by:
-
Automerger Merge Worker authored
Merge changes from topic "am-c4b7e98f4fc245ecb0cf89b442518c86" into tm-qpr-dev-plus-aosp am: 4be9c86e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321041 Change-Id: I0488aa4df7a0ac901b7819847d0b7ae5d5b06a8f Signed-off-by:
-
Brian Julian authored
[automerger skipped] [automerge] DO NOT MERGE. Add a permissions check to LocationManagerService. 2p: 5b376bc9 am: df70a824 -s ours am: 380a1c8b -s ours am: 44f4936c -s ours am: e1f8d126 -s ours am: f649a5dc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321041 Change-Id: I45dfb0e79155057ba187a305cf859d1d80f4d4ae Signed-off-by:
-
Automerger Merge Worker authored
Merge changes from topic "am-282315e63a6c45dd91fff7130cffc35b" into tm-qpr-dev-plus-aosp am: a075832f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18397359 Change-Id: I9d8933e9506b755ce4ac1fbf8b4221e1a5b127be Signed-off-by:
-
TreeHugger Robot authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3d29ee64 -s ours am: 8cd3075c -s ours am: e3165b2e -s ours am: b9a809ac -s ours am: 94831c84 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18397359 Change-Id: I89618545287afbe3c3aa3c4ab0f67f6574ab74c6 Signed-off-by:
-
Lucas Lin authored
[automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378 am: 1f68b323 am: 59378118 am: 054b17e9 -s ours am: cf65e890 -s ours am: 527a4f9f -s ours am: 63dfa62b -s ours am: fa15bedf -s ours am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 65d44b93 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18279994 Change-Id: I2bf1b4e4e47118d06111ae72cb8cad229e288473 Signed-off-by:
-
Hui Yu authored
[automerger skipped] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into sc-dev am: f6e715f9 -s ours am: 4a107edf -s ours am: 8e0c0c8b -s ours am: dd0ac21a -s ours am: 7a7a6272 -s ours am: 83e8dce8 -s ours am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892 Change-Id: I92da5ea5481e9ae7f14027a572d4915885af9506 Signed-off-by:
-
