Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,541 Commits 3 Branches 0 Tags
c8b15a02bbc0574bbcbaeee7f1529bcaba356289
Commit Graph

660541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
c8b15a02bb [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4994c652f 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795129

Change-Id: I44aab885b5b9402897a3c322e0e3e5a19cd92a3b
 2022-02-05 21:15:53 +00:00
Bill Yi
e4994c652f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib989febdc6f9740f7c5ddaaceee544f2fff1ef28
 2022-02-05 21:15:20 +00:00
Ganesh Olekar
fd12e311a2 Merge "Validate pid can be trusted" into sc-dev am: 45312b8382 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958

Change-Id: I98982569be5032db5b302c10b6b925edb93b762c
 2022-02-05 04:13:15 +00:00
Ganesh Olekar
45312b8382 Merge "Validate pid can be trusted" into sc-dev 2022-02-05 03:56:26 +00:00
satayev
57007c7601 Introduce Build.VERSION.KNOWN_CODENAMES. 
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-02-02 18:23:14 +00:00
John Reck
7513210142 Merge "Fix a mismatch in Bitmap_createFromParcel" into sc-dev am: 6a0f27d52f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16664941

Change-Id: I5cc8d642d116974c5b2fea8b9981608b11409518
 2022-01-28 18:25:07 +00:00
John Reck
6a0f27d52f Merge "Fix a mismatch in Bitmap_createFromParcel" into sc-dev 2022-01-28 18:07:35 +00:00
TreeHugger Robot
3e25aae3b4 Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e057 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: Ib5d218dc0223a7fcfb045140296442c30dbaaf4e
 2022-01-27 18:28:40 +00:00
TreeHugger Robot
a9a177e057 Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev 2022-01-27 18:10:53 +00:00
TreeHugger Robot
e2279a4b5f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-01-27 12:18:59 +00:00
TreeHugger Robot
7c12d56058 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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-27 11:57:29 +00:00
TreeHugger Robot
928dda40af Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 11:40:41 +00:00
TreeHugger Robot
f5e6f40835 Merge changes from topic "presubmit-am-91774b822616430495e3cd353411036e" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 939c3bf6af
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-27 11:40:41 +00:00
TreeHugger Robot
2e32e6c073 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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 05:54:47 +00:00
TreeHugger Robot
c22d557f98 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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-27 05:54:29 +00:00
TreeHugger Robot
4a3fbd5851 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 05:41:32 +00:00
TreeHugger Robot
7f8dcb1d43 Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e82ce9fd51
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-27 05:41:32 +00:00
TreeHugger Robot
0a0426bd40 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 05:36:41 +00:00
TreeHugger Robot
7cd30f2b85 Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10c
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-27 05:36:41 +00:00
TreeHugger Robot
e499a146db Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-01-27 04:52:26 +00:00
TreeHugger Robot
2c7c695c6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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-27 04:41:14 +00:00
TreeHugger Robot
efbb02e704 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 04:37:35 +00:00
TreeHugger Robot
58bf41e9f3 Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6e4af674a
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-27 04:37:35 +00:00
TreeHugger Robot
5c78c13dbb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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-27 04:36:14 +00:00
TreeHugger Robot
871aa4262f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 04:17:11 +00:00
TreeHugger Robot
ae2232bc85 Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9829ca31f5
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-27 04:17:11 +00:00
TreeHugger Robot
bb24fc565a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-01-26 23:45:56 +00:00
Bill Yi
d77bc5f4d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 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 21:50:10 +00:00
Bill Yi
18a963dacf [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6e4af674a 
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-26 04:03:43 +00:00
Bill Yi
d6e4af674a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4cd2ce2344aee5a19e8e7501fcd6cb21ca8bb149
 2022-01-26 04:03:35 +00:00
Bill Yi
50c9554ebc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I98d4c08281c06d64a7b56dfb293e5d893217fb18
 2022-01-26 03:29:04 +00:00
Bill Yi
ab7d375df0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7ec9273870c52bfabb9803075c3bdeac7f71e99e
 2022-01-26 03:26:24 +00:00
Bill Yi
f4b35e78ce [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9829ca31f5 
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-26 02:27:26 +00:00
Bill Yi
9829ca31f5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4733fa551b5568e9f803b95bbb1d24cb2e3a846b
 2022-01-26 02:27:17 +00:00
Bill Yi
81f9c190d8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I67f339b5f2b37f63c5af4cde16a0baa68e21b9ac
 2022-01-26 02:24:42 +00:00
Bill Yi
a29eddcc9e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10c 
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-26 01:33:57 +00:00
Bill Yi
438f56d10c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I620ca9fbac119bd636370a1d345c240da5ef249c
 2022-01-26 01:33:45 +00:00
Bill Yi
d6222e3d60 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e82ce9fd51 
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-26 01:28:49 +00:00
Bill Yi
e82ce9fd51 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I07319b2c87d92491dfaef0388bdc3f4003ddddce
 2022-01-26 01:28:39 +00:00
Bill Yi
5d4fc1385e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 939c3bf6af 
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-26 00:12:16 +00:00
Bill Yi
939c3bf6af Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4c0bbe1d5ca0279ff7f2a21aff2f4ccbd759005d
 2022-01-26 00:12:08 +00:00
Bill Yi
53ab42a938 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I73d7af2a2c82613aad4b01dbe2b04593b6302e61
 2022-01-25 23:45:15 +00:00
Jackal Guo
7172238add Move CtsContentTestCases to group presubmit-large 
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 ccc91c4fa9)
 2022-01-24 23:45:31 +08:00
Julia Reynolds
6d2735355b [automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked 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 04:30:42 +00:00
Julia Reynolds
6dcb9e28be [automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked 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 04:19:03 +00:00
Julia Reynolds
74e95e9e8f [automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel 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 04:07:51 +00:00
Julia Reynolds
77e088c8b5 [automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked 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 04:07:36 +00:00
Julia Reynolds
ee2cc5a448 [automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel 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
 2022-01-21 04:07:09 +00:00
Julia Reynolds
a4845db3d8 [automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel groups am: b993531c0d am: d761dbd934 -s ours am: 8b386cd940 -s ours am: 882759b36e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952

Change-Id: I17e2c06a447043aef20ec03b84fade524a7666b3
 2022-01-21 04:01:04 +00:00
Julia Reynolds
b9894cc610 [automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev am: f1dc5b1ee1 am: 960d42c069 -s ours am: 2675838e1b -s ours am: 09a1321d8d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952

Change-Id: I0490ee1542c7005e20f8cf35a02223902c9cdb2f
 2022-01-21 03:49:04 +00:00