summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-05Snap for 8152310 from fd12e311a266c79d43051a417d8a31a6b5f2c387 to ↵android-mainline-12.0.0_r91android12-mainline-media-swcodec-releaseAndroid Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I29d6b08077c1a08e87d19a71021f33bea37173d3
2022-02-05Merge "Validate pid can be trusted" into sc-dev am: 45312b8382Ganesh Olekar
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958 Change-Id: I98982569be5032db5b302c10b6b925edb93b762c
2022-02-05Merge "Validate pid can be trusted" into sc-devGanesh Olekar
2022-02-02Introduce Build.VERSION.KNOWN_CODENAMES.satayev
See go/mainline-sdk-codenames-issue. Known values are to be used to distinguish multiple pre-release codenames, and to allow in development artifacts to be installable on released versions of the platform for testing going forward. This does not change pre-T behaviour at large however. Cherry-pick aosp change into sc-mainline-prod to allow utility code to compile. Given that all modules compile from source this should be safe short-term, before we switch away from sc-mainline-prod. Bug: 211747008 Test: presubmit Change-Id: I0c8df8e767ea61b27bb53da53fb6c9b2c842dbbc Merged-In: I0c8df8e767ea61b27bb53da53fb6c9b2c842dbbc
2022-01-29Snap for 8132238 from 751321014202c68045935e81e594441d53dc3e6c to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I27a486e68c85aab6d7cf8f020544431c4305f090
2022-01-28Merge "Fix a mismatch in Bitmap_createFromParcel" into sc-dev am: 6a0f27d52fJohn Reck
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16664941 Change-Id: I5cc8d642d116974c5b2fea8b9981608b11409518
2022-01-28Merge "Fix a mismatch in Bitmap_createFromParcel" into sc-devJohn Reck
2022-01-27Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: ↵TreeHugger Robot
a9a177e057 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491 Change-Id: Ib5d218dc0223a7fcfb045140296442c30dbaaf4e
2022-01-27Merge "Move CtsContentTestCases to group presubmit-large" into sc-devTreeHugger Robot
2022-01-27Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-01-27[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: 928dda40af -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720299 Change-Id: I4047eb25db9200c5f2e315346f5be4ef5d338f12
2022-01-27Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2022-01-27Merge changes from topic "presubmit-am-91774b822616430495e3cd353411036e" ↵TreeHugger Robot
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 939c3bf6af Import translations. DO NOT MERGE ANYWHERE
2022-01-27[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: 4a3fbd5851 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669 Change-Id: Ibe214d53b8db9a05c854c7c7a256bfe2b1a706b6
2022-01-27[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: 0a0426bd40 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774 Change-Id: Id9c6cf25aae7f81bfa51eb1a84f51795f2d06a39
2022-01-27Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2022-01-27Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" ↵TreeHugger Robot
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e82ce9fd51 Import translations. DO NOT MERGE ANYWHERE
2022-01-27Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2022-01-27Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" ↵TreeHugger Robot
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10c Import translations. DO NOT MERGE ANYWHERE
2022-01-27Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-01-27[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: efbb02e704 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722530 Change-Id: Ie8bee34a7dd5fe7da2074159e56aedb73bb88e68
2022-01-27Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2022-01-27Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" ↵TreeHugger Robot
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6e4af674a Import translations. DO NOT MERGE ANYWHERE
2022-01-27[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: 871aa4262f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722344 Change-Id: Ieeeef21dce44e8d9f91c97857ed00e7912e154e0
2022-01-27Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2022-01-27Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" ↵TreeHugger Robot
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9829ca31f5 Import translations. DO NOT MERGE ANYWHERE
2022-01-26Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-01-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
50c9554ebc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722528 Change-Id: I2226acf8b9cefa8449b27a1185ff8fb32d94b929
2022-01-26[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6e4af674aBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722530 Change-Id: I6c5e29b11d85376d9405aa79c13c554967c37dfe
2022-01-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4cd2ce2344aee5a19e8e7501fcd6cb21ca8bb149
2022-01-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I98d4c08281c06d64a7b56dfb293e5d893217fb18
2022-01-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7ec9273870c52bfabb9803075c3bdeac7f71e99e
2022-01-26[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9829ca31f5Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722344 Change-Id: I14ed0cc46599802de3b788bd3f66ffbd38709ae9
2022-01-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4733fa551b5568e9f803b95bbb1d24cb2e3a846b
2022-01-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I67f339b5f2b37f63c5af4cde16a0baa68e21b9ac
2022-01-26[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10cBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774 Change-Id: I0a62705150305574c4a24311ac1b04b22e469ccd
2022-01-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I620ca9fbac119bd636370a1d345c240da5ef249c
2022-01-26[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e82ce9fd51Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669 Change-Id: I04d6aff508e2551d7a15112e098665664e6c03a0
2022-01-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I07319b2c87d92491dfaef0388bdc3f4003ddddce
2022-01-26[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 939c3bf6afBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720299 Change-Id: I1853203bc44f5bc545f8963593226ad1e0d1b42d
2022-01-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4c0bbe1d5ca0279ff7f2a21aff2f4ccbd759005d
2022-01-25Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I73d7af2a2c82613aad4b01dbe2b04593b6302e61
2022-01-24Move CtsContentTestCases to group presubmit-largeJackal Guo
The test config takes longer than 900 seconds to run. Move it to a dedicated group for running slow presubmit Test Mapping test. Some more context is in the referenced bug, e.g, b/174495337 The group will work exactly the same as presubmit for now. Bug: 174654670 Bug: 174495337 Fix: 215431363 Fix: 215549069 Test: treehugger Change-Id: Id9769bbc625b42257af603d69098ae69c0fabb80 Merged-In: Id9769bbc625b42257af603d69098ae69c0fabb80 (cherry picked from commit ccc91c4fa9a99ebc9df347f1d329f002d8d7a033)
2022-01-22Snap for 8107048 from 6d2735355b10b0eeb7bfb02a6172c2b31a48b42f to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: Ief47d20f738dc862ee007954f6c9a889a069c264
2022-01-21Snap for 8101734 from 94b016162b9d902e17ddd9b1c0f8ef0764e48fec to ↵Android Build Coastguard Worker
mainline-media-swcodec-release Change-Id: Ic8df78093b55659c4fd80fdfa3c8f8858f6e7475
2022-01-21[automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked ↵Julia Reynolds
channel groups" into qt-dev am: f1dc5b1ee1 am: 960d42c069 -s ours am: 2675838e1b -s ours am: f4e13e6e6a -s ours am: 6dcb9e28be -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952 Change-Id: I6aa186c4b7047df5b1d3300346bc8e1c6997578b
2022-01-21[automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked ↵Julia Reynolds
channel groups" into qt-dev am: f1dc5b1ee1 am: 960d42c069 -s ours am: 2675838e1b -s ours am: f4e13e6e6a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952 Change-Id: I70f0417df9c78a338a29beaa1464dafaa81eedcc
2022-01-21[automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel ↵Julia Reynolds
groups am: b993531c0d am: d761dbd934 -s ours am: 8b386cd940 -s ours am: 882759b36e -s ours am: a4845db3d8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952 Change-Id: I8f129cdc190777285fad0c634484aa2a2930d303
2022-01-21[automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked ↵Julia Reynolds
channel groups" into qt-dev am: f1dc5b1ee1 am: 960d42c069 -s ours am: 2675838e1b -s ours am: 09a1321d8d -s ours am: b9894cc610 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952 Change-Id: I88f0365e55e107be2c39cc96731bf1bc95d21936
2022-01-21[automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel ↵Julia Reynolds
groups am: b993531c0d am: d761dbd934 -s ours am: 8b386cd940 -s ours am: 222443606d -s ours am: a51336f4e6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952 Change-Id: I3a34907994628d9af25631a96c0aea3bfdc8e368
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 20:09:18 +0000