Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
650,592 Commits 3 Branches 0 Tags
d797c5a620650ca03f6ba275c9ca71fc338d0042
Commit Graph

650592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
d797c5a620 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: I580cb62d6f806113a16a4913b849d288c64bce0c
 2022-01-28 18:25:53 +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
dd9121aaf6 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: I23f8aac37dde7a9390d8ff478122b13eb99275a2
 2022-01-27 18:29:12 +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
9fba6ff0b6 [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: I26de696df9caf41eda7bd73b18254562e0995086
 2022-01-27 11:58:26 +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
71c7028127 Merge changes from topic "presubmit-am-91774b822616430495e3cd353411036e" into sc-qpr1-dev 
* 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
8157eb692a [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: I4a5b40ddb71a7fed7b97fdb15660acf7d65f8c0b
 2022-01-27 05:55:33 +00:00
TreeHugger Robot
abcd4d286b [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: If4dfbe72ecd50a2931b668b2996f39fa9a172906
 2022-01-27 05:55:20 +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
9a1f59b4c8 Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev 
* 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
723b27a11d Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into sc-qpr1-dev 
* 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
d484686e58 [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: Ic05909045ffc11ff7a185a6d8eeecf32e9637fd9
 2022-01-27 04:42: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
d9bacad89c Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev 
* 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
c40725a57b [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: I0eda2926fffdb66f3c6376a7240eca03071c402b
 2022-01-27 04:37:06 +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
7dc62fe70a Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" into sc-qpr1-dev 
* 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
bc914ff44f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-26 22:29:28 +00:00
Bill Yi
feb7ccf7d4 [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: I269dd8f16ca63a3a96d63463e63649dd16ec9a7d
 2022-01-26 21:50:53 +00:00
TreeHugger Robot
80d3c80fdc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-26 21:47:45 +00:00
TreeHugger Robot
35fced00d7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-26 21:41:17 +00:00
TreeHugger Robot
ce235c1a97 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-26 21:30:24 +00:00
TreeHugger Robot
9eaef67c7a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-26 21:27:38 +00:00
Bill Yi
81af6fe33d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3081092718db7facbcd569fc85fd80a5f45268ea
 2022-01-26 04:05:39 +00:00
Bill Yi
4289a15ed3 [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: Idef26571164972f6dfcd439396c86e27635b8d39
 2022-01-26 04:03:44 +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
fc2111755c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I609befb5a0c8faa2b23b1e3cfcfc6fb11277ddcf
 2022-01-26 03:30:25 +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
c01fa7a66b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id371e409a010debe89806b24092b4d3510d538f3
 2022-01-26 02:28:28 +00:00
Bill Yi
2f020d6eda [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: Ic8728b3d01776920c598090c9e64f91fed445077
 2022-01-26 02:27:27 +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
a2c8e1354e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7a6495519e85c2f370228de1773df7085c7864aa
 2022-01-26 01:35:05 +00:00
Bill Yi
eb5ecbde7a [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: I19fe3377bc882029cef95f7049dbe79858f8cdfb
 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
2a0f953536 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1744fd0598b762bd8fbfcbbca786066ba693f7c4
 2022-01-26 01:29:55 +00:00
Bill Yi
36fd687019 [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: Ie05930ec5b8718d309a859444e4d714b6cd4f73e
 2022-01-26 01:28:50 +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
5fbe908a11 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie9f59c55d48029f23639a3f6653c978290572cbf
 2022-01-26 00:14:36 +00:00
Bill Yi
282fc9c2ff [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: I377dbf9eb5e9b84f534d109661a7ecd5c55323e5
 2022-01-26 00:12:17 +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
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
af390eecf2 [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: Ibef974616bc15db926bbe49048e98a37299384a3
 2022-01-21 04:31:52 +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
c6e54cabfc [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: I41521419b9e54588a3e48a156c8ff422dfe76756
 2022-01-21 04:08:40 +00:00
Julia Reynolds
078607957c [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: I981b99c4e37690b11ace90ecd48e6d91097b38e6
 2022-01-21 04:08:26 +00:00
Julia Reynolds
c3860fbb7c [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: I12bb649af0788d3b425ae58343d9a48182ab0031
 2022-01-21 04:08:02 +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