summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-04-05Snap for 9885989 from 1e3e7a95bf6f32622cc1be2be8ac4135e1422d55 to ↵aml_sta_331811000android13-mainline-os-statsd-releaseAndroid Build Coastguard Worker
mainline-os-statsd-release Change-Id: I0c02b5ce86b14afcf0d88eaf6459f1112cbec253
2023-04-05Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: ↵Michael Groover
00f3afecdb am: d8cdf2d931 am: b4784aeb00 am: 027abf1925 am: 6cc59ca486 am: 35b54f3b44 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145 Change-Id: Ic8d76e537f60f9f3c95622dcf983d364b0b7b012 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: ↵Michael Groover
00f3afecdb am: d8cdf2d931 am: b4784aeb00 am: 027abf1925 am: 6cc59ca486 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145 Change-Id: Ib8513a41ae205e9683989302893b1f1480f05792 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: ↵Michael Groover
00f3afecdb am: d8cdf2d931 am: b4784aeb00 am: 027abf1925 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145 Change-Id: Ib43e3b60a80a72bc75e5199884cc098d17bcb7f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: ↵Michael Groover
00f3afecdb am: d8cdf2d931 am: b4784aeb00 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145 Change-Id: I63c16c0c6476875380b02bbb121ad48418f49078 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: ↵Michael Groover
00f3afecdb am: d8cdf2d931 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145 Change-Id: I30e3a23068f4943cd3adfa293977beea9525a45e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: ↵Michael Groover
00f3afecdb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145 Change-Id: Iaf94fa26b8d4bc386802820387f088482af03ce4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05Snap for 9884511 from bf0bbac6d326e3fbcd978b6390aa7a8d13f819bc to ↵Android Build Coastguard Worker
mainline-os-statsd-release Change-Id: Id12cd84a7b3f9676640565804e3f7eca9cf941a5
2023-04-05Merge "Limit the number of supported v1 and v2 signers" into rvc-devMichael Groover
2023-04-04Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodBill Yi
2023-04-03Merge "[RESTRICT AUTOMERGE] Fix test failure caused by incorrect string" ↵Jeff DeCew
into tm-dev am: 6b0424260e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22409910 Change-Id: I5b4703c7afc091ed475e636092759f18c8d87e59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03[RESTRICT AUTOMERGE] Fix test failure caused by incorrect string am: ce645d80baJeff DeCew
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22409910 Change-Id: I02750aeb3a338af239277a03293490c2b37fe13c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2023-04-03Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2023-04-03Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2023-04-03Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2023-04-03Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2023-04-03Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2023-04-03Merge "[RESTRICT AUTOMERGE] Fix test failure caused by incorrect string" ↵Jeff DeCew
into tm-dev
2023-04-03Limit the number of supported v1 and v2 signersMichael Groover
The v1 and v2 APK Signature Schemes support multiple signers; this was intended to allow multiple entities to sign an APK. Previously, the platform had no limits placed on the number of signers supported in an APK, but this commit sets a hard limit of 10 supported signers for these signature schemes to ensure a large number of signers does not place undue burden on the platform. Bug: 266580022 Test: Manually verified the platform only allowed an APK with the maximum number of supported signers. Change-Id: I6aa86b615b203cdc69d58a593ccf8f18474ca091
2023-04-03[RESTRICT AUTOMERGE] Fix test failure caused by incorrect stringJeff DeCew
Fixes: 276453966 Bug: 274759612 Test: atest NotificationInterruptStateProviderImplTest Change-Id: I2b49e55e2b0321b6b091793c91b8087135231b86
2023-04-03Merge "Fix issues with setRemotePlaybackInfo" into tm-dev am: 9587fcef86Michael Mikhail
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22204857 Change-Id: I75c81329305cdff0751e65c22192b4dc42cd74cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Fix issues with setRemotePlaybackInfo" into tm-devMichael Mikhail
2023-04-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib673ac4178c693b025c82093e5619aaf50fafadb
2023-04-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I894c87234687561984c8902072935065f708b4f5
2023-04-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I57b6ade61458d0340889d6d93b6528e3e2647413
2023-04-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I6ec043fe518eb08a25d4dd590a7067cc772fcc5d
2023-04-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I772c47c1315f37474210c0f5e6766606d9e4646e
2023-04-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Icf2a0cad0b226cc35f7b2bdaac79f762f291ea28
2023-04-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If66bb1bad10cdae8f18bd3c7775142cc3b980b4a
2023-03-31[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata ↵Jeff DeCew
detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am: 27502189f4 -s ours am: 18380d2e2f -s ours am: 168a08d94d -s ours am: 0c702a76a3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: I2da581407f1efd7c0f5c1d0e7af8e59f4bebe90f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to ↵Jeff DeCew
block FSI am: c60e264a55 am: fcb0f9a684 -s ours am: bc8c22c943 -s ours am: b79c932285 -s ours am: 5df48205d0 -s ours am: f94885ec17 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: I6df8894dcdfdbb095c041f86e30f23cc0329b2cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata ↵Jeff DeCew
detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am: 27502189f4 -s ours am: 18380d2e2f -s ours am: 168a08d94d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: I9f438e8a8ad361745073b186208be986fea0920f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to ↵Jeff DeCew
block FSI am: c60e264a55 am: fcb0f9a684 -s ours am: bc8c22c943 -s ours am: b79c932285 -s ours am: 5df48205d0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: I861ed8ccc3565c01d990a76259d8b156b97be6d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata ↵Jeff DeCew
detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am: 27502189f4 -s ours am: 18380d2e2f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: Ib0ee25ed125bcd72ec094d232deef4b1227b7e6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to ↵Jeff DeCew
block FSI am: c60e264a55 am: fcb0f9a684 -s ours am: bc8c22c943 -s ours am: b79c932285 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: Ia12d95112b82dddad8164071ccf61b869a38f7ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata ↵Jeff DeCew
detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am: 27502189f4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: If6e5597bc9b6d8d215be0b4ca75e4dafc42b7ce4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to ↵Jeff DeCew
block FSI am: c60e264a55 am: fcb0f9a684 -s ours am: bc8c22c943 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: Ie06c86a7e1670878ee961c46c9f4cb18d7deccab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata ↵Jeff DeCew
detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: I28859423df53912870b61b803bc9b97f753be923 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to ↵Jeff DeCew
block FSI am: c60e264a55 am: fcb0f9a684 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: I3007fb4b8bb63745b426966ea7336137779e11e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] Merge "Enforce ↵Pavel Grafov
DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours am: e6871844eb -s ours am: 769a0d367a -s ours am: 933ad6e1c8 -s ours am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22301867 Change-Id: Ia99c0e51af43d6eba2c1f882d2ceea98f002412b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata ↵Jeff DeCew
detection to block FSI" into sc-dev am: 5a56907a3b am: bb4092a3c5 -s ours am: b988286b0a -s ours am: 3947d1cda5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923 Change-Id: Ief4597fda96b07eae205fa022c376d82694888fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31Merge changes from topic ↵Jeff DeCew
"presubmit-am-2613dc5aeb9b4fa1a17905710745009a-sc-dev" into sc-qpr1-dev am: af5c39e766 am: 255a79d3e4 am: 6f858f96e5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923 Change-Id: I00d359d1f89e03d9ccb524c2961c9862fdaedc26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] [automerge] [RESTRICT AUTOMERGE] Add BubbleMetadata ↵Presubmit Automerger Backend
detection to block FSI 2p: 1bc1be92ce am: c6c294f175 -s ours am: bd8ae58033 -s ours am: 0b1715cb66 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923 Change-Id: I53875792210f1c8238bc2afd5c1f0127ac677985 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] Merge "Enforce ↵Pavel Grafov
DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours am: e6871844eb -s ours am: 769a0d367a -s ours am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22301867 Change-Id: I4d74ed1d206c17be976c402fb3e2719f02eee203 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata ↵Jeff DeCew
detection to block FSI" into sc-dev am: 5a56907a3b am: bb4092a3c5 -s ours am: b988286b0a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923 Change-Id: I45e5cabc1a9a3394d208e2fab2f4afcdd19fcfd7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31Merge changes from topic ↵Jeff DeCew
"presubmit-am-2613dc5aeb9b4fa1a17905710745009a-sc-dev" into sc-qpr1-dev am: af5c39e766 am: 255a79d3e4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923 Change-Id: I292b1d26b42b5fc97884ee12559785b491437c30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] [automerge] [RESTRICT AUTOMERGE] Add BubbleMetadata ↵Presubmit Automerger Backend
detection to block FSI 2p: 1bc1be92ce am: c6c294f175 -s ours am: bd8ae58033 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923 Change-Id: I7211042cab6d8ab9e2bcce6c373bf00b62acb493 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata ↵Jeff DeCew
detection to block FSI" into sc-v2-dev am: bfbbf35902 -s ours am: b69f509ffa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312922 Change-Id: I488e92c2ed4f2bd8a631a2004559f450ba02cee0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31[automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to ↵Jeff DeCew
block FSI am: 50c9d48802 -s ours am: 6cfc4b7400 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312922 Change-Id: Id256a14962da0aa59a7721629699c74f520f4979 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 21:53:32 +0000