summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-11-19[coastguard skipped] Merge sparse cherrypicks from ↵aml_ase_331311020android13-mainline-appsearch-releaseAndroid Build Coastguard Worker
sparse-9099980-L74600000957421145 into mainline-appsearch-release. Change-Id: Id05c9073ca717f77e01bce5e2c2dfe8f77174b0d
2022-11-19Merge cherrypicks of [20438552] into sparse-9099980-L74600000957421145.Android Build Coastguard Worker
Change-Id: I8b7fcf41de1898cbf7a95afe8d25544a6cc65a18
2022-11-19Scaffolding: reject installs based on device fingerprintMårten Kongstad
Add the scaffolding for teaching the package parser to reject a package if its manifest specifies a set of prefixes, and the device fingerprint does not start with one of the prefixes. Bug: b/232475788 Test: m Change-Id: I9f3f3d3ad96332d2d65fbf6f58c7ce35992bcd7e Merged-In: I9f3f3d3ad96332d2d65fbf6f58c7ce35992bcd7e (cherry picked from commit fc3c465eee58058564b21c9db93814d723eab604) Merged-In: I9f3f3d3ad96332d2d65fbf6f58c7ce35992bcd7e
2022-11-11[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9161281-L20900000957320148 into mainline-appsearch-release. Change-Id: If0a22e694a73642ed69f88352c48b53f5ae5aa83
2022-11-11Merge cherrypicks of [20438552] into sparse-9161281-L20900000957320148.Android Build Coastguard Worker
Change-Id: I4d9834690f341dd0a1a0cbf74b32cf2917012eca
2022-11-11Scaffolding: reject installs based on device fingerprintMårten Kongstad
Add the scaffolding for teaching the package parser to reject a package if its manifest specifies a set of prefixes, and the device fingerprint does not start with one of the prefixes. Bug: b/232475788 Test: m Change-Id: I9f3f3d3ad96332d2d65fbf6f58c7ce35992bcd7e Merged-In: I9f3f3d3ad96332d2d65fbf6f58c7ce35992bcd7e (cherry picked from commit fc3c465eee58058564b21c9db93814d723eab604) Merged-In: I9f3f3d3ad96332d2d65fbf6f58c7ce35992bcd7e
2022-09-12Snap for 9052600 from 34462de8b564951b8418bf66b035a908892031b7 to ↵aml_ase_331112000Android Build Coastguard Worker
mainline-appsearch-release Change-Id: Id68b8acdaa41c2f91494d06c3131a3451339c180
2022-09-09[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller ↵Iván Budnik
app"" into sc-dev am: c59352ed18 -s ours am: 53f19e615b -s ours am: 8ae2b04df7 -s ours am: f3eb39a184 -s ours am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959 Change-Id: I25122d72a242ae91723c4a825a1837126af214d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Revert "Enforce ComponentName belongs to caller app" ↵Iván Budnik
am: 8b7cf1993c -s ours am: 6d129d1cb2 -s ours am: e9bac010c4 -s ours am: 97226d9621 -s ours am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959 Change-Id: I6d2ca9b084f2e9929d95f72d3a16e5a3490ad27a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller ↵Iván Budnik
app"" into sc-dev am: c59352ed18 -s ours am: 53f19e615b -s ours am: 8ae2b04df7 -s ours am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959 Change-Id: I98edc2ecdea889e959c99d8e2959fb2cec17e067 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Revert "Enforce ComponentName belongs to caller app" ↵Iván Budnik
am: 8b7cf1993c -s ours am: 6d129d1cb2 -s ours am: e9bac010c4 -s ours am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959 Change-Id: I037f8a1e49bdaf5d4873e4e93ffded91e2b38279 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller ↵Iván Budnik
app"" into sc-dev am: c59352ed18 -s ours am: 53f19e615b -s ours am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959 Change-Id: Ifd242a291cd5c9b747420f70ba18503b79f35e26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Revert "Enforce ComponentName belongs to caller app" ↵Iván Budnik
am: 8b7cf1993c -s ours am: 6d129d1cb2 -s ours am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959 Change-Id: I441e0da4d50ddd7254e5d55af39bb660e7bee65b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller ↵Iván Budnik
app"" into sc-dev am: c59352ed18 -s ours am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459103 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959 Change-Id: I4f4b03ae8aee39d135571ec0decc055af54d0a79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Revert "Enforce ComponentName belongs to caller app" ↵Iván Budnik
am: 8b7cf1993c -s ours am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459103 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959 Change-Id: Ib88aedb7bcac4806ecf7250fd92db81ccaacad48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-devIván Budnik
2022-09-09[automerger skipped] Merge "Make sure parallel broadcasts enforce excluded ↵Evan Severson
permissions" into sc-dev am: 3f015cbc5e -s ours am: 789a752f05 -s ours am: 414f992fe4 -s ours am: 652ea18323 -s ours am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529 Change-Id: Iecd39d1d83a0aaec1d7fcbf9196719590b930f67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Merge changes from topic ↵Evan Severson
"presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-qpr1-dev am: 7493908364 am: b45d936f2f -s ours am: 945fca327c -s ours am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529 Change-Id: I1f462564dfdaefca3ddb05223105adf30da4b1c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Merge "Make sure parallel broadcasts enforce excluded ↵Evan Severson
permissions" into sc-dev am: 3f015cbc5e -s ours am: 789a752f05 -s ours am: 414f992fe4 -s ours am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529 Change-Id: I479444650a790e87cf1e2a960777398f3ed83d4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Merge changes from topic ↵Evan Severson
"presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-qpr1-dev am: 7493908364 am: b45d936f2f -s ours am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529 Change-Id: I8f9833180ab25784ec07cf6dd76f46ba8527def8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Merge "Make sure parallel broadcasts enforce excluded ↵Evan Severson
permissions" into sc-dev am: 3f015cbc5e -s ours am: 789a752f05 -s ours am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529 Change-Id: I0c2f7d9ee89e353d0c3bfd0d7a1551e9965b0ac0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" ↵Evan Severson
into sc-qpr1-dev am: 7493908364 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529 Change-Id: I0914a42348807b2da489cb9a448a6de3ced5c385 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Merge "Make sure parallel broadcasts enforce excluded ↵Evan Severson
permissions" into sc-dev am: 3f015cbc5e -s ours am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529 Change-Id: Ib3221584615d5041294acd7c52f5d4e666e32f79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] Merge changes from topic ↵Evan Severson
"presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into tm-dev am: bc7b243dd7 -s ours am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 ef9b368d1b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529 Change-Id: If8c66b77a8b8efa8607f12ae103a6f2825333896 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09[automerger skipped] [automerged blank] Make sure parallel broadcasts ↵Presubmit Automerger Backend
enforce excluded permissions 2p: 0eee4fa476 2p: 77b3537fe3 am: e4f2f3e43d -s ours am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 ef9b368d1b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529 Change-Id: I48565b306fdc1b185d9ccb963132c477db632d15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "Make sure parallel broadcasts enforce excluded permissions" into sc-devEvan Severson
2022-09-09Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" ↵Evan Severson
into tm-dev * changes: [automerged blank] Make sure parallel broadcasts enforce excluded permissions 2p: 0eee4fa476 2p: 77b3537fe3 [automerge] Make sure parallel broadcasts enforce excluded permissions 2p: 0eee4fa476 Make sure parallel broadcasts enforce excluded permissions
2022-09-09Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" ↵Evan Severson
into sc-qpr1-dev * changes: [automerge] Make sure parallel broadcasts enforce excluded permissions 2p: 0eee4fa476 Make sure parallel broadcasts enforce excluded permissions
2022-09-08Merge "Fix example AGSL code in the javadoc comments" into tm-dev am: 89acf500cbAndrew Solovay
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19889898 Change-Id: Ibecb58dfb56527011db194c6c1d016fbc37c4c5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08Merge "Fix example AGSL code in the javadoc comments" into tm-devAndrew Solovay
2022-09-08Merge "Revert "Prevent exfiltration of system files via avatar picker."" ↵TreeHugger Robot
into tm-dev am: 95e397a8b8 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19436694 Change-Id: Id0c46913c70785ecbf90b9f4d6c4a4e3b1270298 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08Merge "Revert "Prevent exfiltration of system files via avatar picker."" ↵TreeHugger Robot
into tm-dev
2022-09-08[automerger skipped] Merge "Fix system zen rules by using owner package name ↵Yuri Lin
if caller is system" into qt-dev am: 3fe8fdc4dc am: 85d0cb310c -s ours am: 4bc4a7d756 -s ours am: 5725377e5c -s ours am: c73ff23f81 -s ours am: 25ab88ccc3 -s ours am: 4082fa21aa -s ours am: dbb75ee7a6 -s ours am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 0b262d0ae5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868480 Change-Id: I748ba9159534dfaf46c9d101fad4db4dc43c1cc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Merge "Fix system zen rules by using owner package name ↵Yuri Lin
if caller is system" into rvc-dev am: 06377249c0 -s ours am: b6ae840c5d -s ours am: 697d4897cf -s ours am: c8db189722 -s ours am: dd16618bbc -s ours am: b322597c8d -s ours am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 2ceaaebb3c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19867135 Change-Id: Id2a68bb778ba411b0705a63a434540b62313e7c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Fix system zen rules by using owner package name if ↵Yuri Lin
caller is system am: 0b262d0ae5 -s ours am: cb57bce342 -s ours am: d38cce80f9 -s ours am: aeaa857792 -s ours am: 67404594af -s ours am: 064625ee1b -s ours am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 2ceaaebb3c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19867135 Change-Id: Ib133a48a90077991efe353dc6b6e521ceb8a3420 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Merge "Fix system zen rules by using owner package name ↵Yuri Lin
if caller is system" into rvc-qpr-dev am: e3434b5548 -s ours am: dcbabe5a88 -s ours am: 99716a27a5 -s ours am: fc3d6c843f -s ours am: 497f6535ba -s ours am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19867134 Change-Id: I1647956366410980efe7a29ef79e1684312e907e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Fix system zen rules by using owner package name if ↵Yuri Lin
caller is system am: 2ceaaebb3c -s ours am: e0a4c485a3 -s ours am: 01f768455e -s ours am: f91eb44aff -s ours am: 36cbffd53a -s ours am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19867134 Change-Id: Icf1dbcf512378b2b0abcf78c552648f8c62b9d6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission for ↵TreeHugger Robot
VoiceInteraction" into qt-dev am: cef7f19369 am: 14246ca9b8 -s ours am: 3a946e8c95 -s ours am: 4be854db74 -s ours am: e67265edf2 -s ours am: 1bc1463396 -s ours am: 3af55abe0f -s ours am: f8b3a24e24 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803236 Change-Id: I18bc24c56f19b30597998da8521d173d5b188b91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] [RESTRICT AUTOMERGE] Check permission for ↵Ivan Chiang
VoiceInteraction am: e4e77f4570 am: 8862cac366 -s ours am: ee0f678dcf -s ours am: 9e5f614a13 -s ours am: 1cb961704f -s ours am: ede179453b -s ours am: 4df23a821e -s ours am: 3a61daa5cb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803236 Change-Id: I4e9adf8ae9f5a61c0954854bdba3fcd7bfac8f43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission for ↵TreeHugger Robot
VoiceInteraction" into rvc-dev am: 5f0da27aab am: db0918e39a -s ours am: b442594b71 -s ours am: 5bc1fbb7f4 -s ours am: 407d34205d -s ours am: 4af266fb67 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18708335 Change-Id: I8438eec4aebc06e427623f3e55aaa091adc4de68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] [RESTRICT AUTOMERGE] Check permission for ↵Ivan Chiang
VoiceInteraction am: 525690ce16 am: f6ab03e679 -s ours am: 2bc68fb4ad -s ours am: 765ebaaf71 -s ours am: 8ece04b098 -s ours am: 13b1e54879 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18708335 Change-Id: I205c3f9860c42bf112137352e3d4cf136ff64c76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission for ↵TreeHugger Robot
VoiceInteraction" into rvc-qpr-dev am: 4d31d49108 -s ours am: b1aba9a8e9 -s ours am: 7b30baa0e7 -s ours am: a9da1d834a -s ours am: b6acbe1445 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803235 Change-Id: Ie072a9c239c2305b2f84a17d3fc1623468acccfe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] [RESTRICT AUTOMERGE] Check permission for ↵Ivan Chiang
VoiceInteraction am: 25834066d3 -s ours am: 9265c1a9bc -s ours am: fae8cdb569 -s ours am: b2e9eaf6d0 -s ours am: 0805aff0b2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803235 Change-Id: Ic89193379db2795cf73026806806f99822d9fbd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Merge "Trim any long string inputs that come in to ↵Yuri Lin
AutomaticZenRule" into qt-dev am: 380ec03dee am: e5fdd7f0de -s ours am: ae6b8569a3 -s ours am: 36de09dab8 -s ours am: 6f0bda9117 -s ours am: 98bd7eb129 -s ours am: c8f0bfea4e -s ours am: 66b29d5dbb -s ours am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 1fcd99f5aa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816794 Change-Id: I2a7f69d67dba724bcdfbcd879a244260ae666d11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Merge "Trim any long string inputs that come in to ↵Yuri Lin
AutomaticZenRule" into rvc-dev am: 6df0223ee6 -s ours am: 3809613ecd -s ours am: 6ae0f72e44 -s ours am: 6801026e8f -s ours am: 24b1e06aaa -s ours am: 8fb250630e -s ours am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 5b0c4af9ba is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816755 Change-Id: I68ca6f4bcd508df92a15902652825310a8d64399 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Trim any long string inputs that come in to ↵Yuri Lin
AutomaticZenRule am: 1fcd99f5aa -s ours am: b7b76c0b92 -s ours am: fa763850dd -s ours am: bd3ab08c34 -s ours am: 52d8e078d9 -s ours am: 7c4c1ef521 -s ours am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 5b0c4af9ba is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816755 Change-Id: Ic671f237dcee1f47f366acf707ff239e96921317 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Merge "Trim any long string inputs that come in to ↵Yuri Lin
AutomaticZenRule" into rvc-qpr-dev am: 0b50f9cd27 -s ours am: c74c781cfd -s ours am: 8a8ae45e0d -s ours am: 8082d2f1d6 -s ours am: ce630b213d -s ours am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 19bc2c3559 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816793 Change-Id: I549833598befa0e9cb1f9831134087beb4fd6e0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Trim any long string inputs that come in to ↵Yuri Lin
AutomaticZenRule am: 5b0c4af9ba -s ours am: f98751379a -s ours am: 5560692e83 -s ours am: b2d799cf44 -s ours am: a4001f34e2 -s ours am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 19bc2c3559 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816793 Change-Id: I3f0a08c8a477b1d06aaa9e2c07f736fb06071d31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Merge "[conflict] [conflict] Merge "Validate package ↵Liana Kazanova
name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8cd2 am: 9f864c4b23 am: ef2a1d60be am: 043b90b360" into sc-dev am: b62eeefe44 am: 7a601f8e70 -s ours am: c89d81e29b -s ours am: 8f8d4940e6 -s ours am skip reason: Merged-In I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96 with SHA-1 8c2c7b4164 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19874087 Change-Id: Ib8fedbf08d7532bea5836a46e83eb055de76533f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08[automerger skipped] Merge "Fix system zen rules by using owner package name ↵Yuri Lin
if caller is system" into qt-dev am: 3fe8fdc4dc am: 85d0cb310c -s ours am: 4bc4a7d756 -s ours am: 5725377e5c -s ours am: c73ff23f81 -s ours am: 25ab88ccc3 -s ours am: 4082fa21aa -s ours am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 0b262d0ae5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868480 Change-Id: I31ea25f8a73556cf56958de6161b1ebc250eb41f 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-05-28 19:07:36 +0000