Commit Graph

615118 Commits

Author SHA1 Message Date
TreeHugger Robot
dfbda02fed Merge "Add SystemBatteryConsumer" 2020-12-14 22:07:09 +00:00
Lyn Han
26c610692b Merge "Remove anchor scrolling" 2020-12-14 22:04:50 +00:00
Lyn Han
1d52d80ee3 Merge "Disable notification background drawing" 2020-12-14 21:52:27 +00:00
Treehugger Robot
4af7c21be5 Merge "Add resources owners to core/jni and split-select" am: 2991744d47 am: 578171d320 am: 550156c202
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc1ed6c2245fe72e73b7aa046bf35d1e419bd2d1
2020-12-14 21:50:18 +00:00
Treehugger Robot
810afd3c55 Merge "Change the instrumentation app build target type" am: 4adb372fc7 am: a8fc52d7f5 am: 1ef41dd092
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522027

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I326dcb8666e867b7e43296c9e6bdcc1cff42bb7a
2020-12-14 21:49:51 +00:00
TreeHugger Robot
ef691ab2ff Merge "Add attachinfo information to ViewRootImpl dump" 2020-12-14 21:42:09 +00:00
Treehugger Robot
550156c202 Merge "Add resources owners to core/jni and split-select" am: 2991744d47 am: 578171d320
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c7c306f78522c509709fc532727dbe7e670f365
2020-12-14 21:34:49 +00:00
Treehugger Robot
1ef41dd092 Merge "Change the instrumentation app build target type" am: 4adb372fc7 am: a8fc52d7f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522027

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9c6a12b7e8f68a13c5c0caa96621e155847ff3a
2020-12-14 21:34:26 +00:00
TreeHugger Robot
e1344c3973 Merge "Manual revert of 5s FGS notification enforcement" 2020-12-14 21:28:21 +00:00
Terry Wang
064c925a56 Merge "Remove AppSearchException from java doc of AppSearchSession." 2020-12-14 21:13:42 +00:00
Treehugger Robot
578171d320 Merge "Add resources owners to core/jni and split-select" am: 2991744d47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddc1fdc40d62553d7179da4ee1ca522f3a4be43b
2020-12-14 21:12:49 +00:00
Treehugger Robot
a8fc52d7f5 Merge "Change the instrumentation app build target type" am: 4adb372fc7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522027

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief315674565dd6ba825b26045522c2c9cdd1b7cc
2020-12-14 21:02:35 +00:00
TreeHugger Robot
d68d7d360e Merge "Extract the SysUI Icons and Strings" 2020-12-14 20:53:44 +00:00
Lyn Han
ac508816ef Merge "Dedup onClickListener for clearing silent notifs" 2020-12-14 20:49:43 +00:00
Lyn Han
beca193c1d Merge "Remove unused code" 2020-12-14 20:46:30 +00:00
Treehugger Robot
2991744d47 Merge "Add resources owners to core/jni and split-select" 2020-12-14 20:35:10 +00:00
TreeHugger Robot
83352bf4e1 Merge "Add OWNERS file for display-device-config dirs." 2020-12-14 20:22:29 +00:00
Treehugger Robot
4adb372fc7 Merge "Change the instrumentation app build target type" 2020-12-14 20:04:23 +00:00
Dmitry Dementyev
89a8e2163c Merge "Protect account chooser activities against overlay." 2020-12-14 19:54:15 +00:00
TreeHugger Robot
a1c82b23a7 Merge "Add missing decreaseIndent." 2020-12-14 19:53:29 +00:00
TreeHugger Robot
d282f7d864 Merge "Reset mServiceDisabled when service dies" 2020-12-14 19:50:05 +00:00
Amos Bianchi
e4a23931cd Merge "Replace NFC_PAYMENT_COMPONENT with NFC_PAYMENT_DEFAULT_COMPONENT in comment." am: 4f631e337b am: 335da989d5 am: abfd17fce2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c2efbc11d24e8c661fd16d80e141c40967b0c99
2020-12-14 19:35:30 +00:00
Gavin Corkery
65bf421f1d [automerger skipped] Merge "Replace broadcast with adding a method in BugreportCallback" am: d45d533b6e am: 7611ac2a5a am: 11c28aeb13 -s ours
am skip reason: Change-Id Ibc1a5a8ac308c303399d28eb8c177096b805fdf9 with SHA-1 ec91d7700d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia43d834e90eeea6203973715df880688327479d5
2020-12-14 19:35:13 +00:00
Treehugger Robot
9af5953832 [automerger skipped] Merge "Add a path for GNSS time suggestions" am: 85ebf98dcf am: 4ef13ea0c9 am: c656403bed -s ours
am skip reason: Change-Id I5cb12b5545652ed885b72a3170940050ce0628a6 with SHA-1 7af0bcaccd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6191e5a52c29f2c7394401640d08f7abd92d5951
2020-12-14 19:34:34 +00:00
TreeHugger Robot
12ccc350c4 Merge "Send DROPBOX_ENTRY_ADDED to all users" into rvc-qpr-dev am: 3317653b8c am: a2302b01e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc85214040a14620caa2e41942d3fa7e5eea16bb
2020-12-14 19:34:12 +00:00
Darryl Johnson
9dc71fc5ac Merge "Add OWNERS file to device state XSD directory." 2020-12-14 19:30:12 +00:00
Nate Myren
65052dd37b Merge "Add RECORD_AUDIO_OUTPUT app op" 2020-12-14 19:20:30 +00:00
Amos Bianchi
abfd17fce2 Merge "Replace NFC_PAYMENT_COMPONENT with NFC_PAYMENT_DEFAULT_COMPONENT in comment." am: 4f631e337b am: 335da989d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If90808b1776648bb40ed108fb02bf7bbeac68c7b
2020-12-14 19:19:25 +00:00
Gavin Corkery
11c28aeb13 Merge "Replace broadcast with adding a method in BugreportCallback" am: d45d533b6e am: 7611ac2a5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507504

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib170bb6f36a086ac7fcab2c0bfc29153f9335a47
2020-12-14 19:19:08 +00:00
Treehugger Robot
c656403bed Merge "Add a path for GNSS time suggestions" am: 85ebf98dcf am: 4ef13ea0c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528193

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcef60976ab86fb527000594cc6698ae2cd7feb3
2020-12-14 19:18:04 +00:00
TreeHugger Robot
a2302b01e4 Merge "Send DROPBOX_ENTRY_ADDED to all users" into rvc-qpr-dev am: 3317653b8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie800690663f874bef21abee094269abb5ee79a58
2020-12-14 19:17:19 +00:00
Amos Bianchi
335da989d5 Merge "Replace NFC_PAYMENT_COMPONENT with NFC_PAYMENT_DEFAULT_COMPONENT in comment." am: 4f631e337b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib95b8b28971d041c11c9d11d00dfe991567612aa
2020-12-14 19:14:59 +00:00
Gavin Corkery
7611ac2a5a Merge "Replace broadcast with adding a method in BugreportCallback" am: d45d533b6e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507504

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied674d7ff891caf26d751b6f15af2db9f0eea08f
2020-12-14 19:11:58 +00:00
Ryan Mitchell
e147d00c9e Add resources owners to core/jni and split-select
Adds the owners of the resources sub-system to own resources related
classes in core/jni and the split-select tool previously owned by
adamlesinski@.

Bug: none
Test: none
Change-Id: I0117b0ccb258fb0b9a3e075dfd81c0351abecd3a
2020-12-14 11:07:19 -08:00
TreeHugger Robot
7e16c27aaf Merge "Marks Settings.mPackages as VisibleForTesting" 2020-12-14 19:02:58 +00:00
Amos Bianchi
4f631e337b Merge "Replace NFC_PAYMENT_COMPONENT with NFC_PAYMENT_DEFAULT_COMPONENT in comment." 2020-12-14 19:02:23 +00:00
Gavin Corkery
d45d533b6e Merge "Replace broadcast with adding a method in BugreportCallback" 2020-12-14 18:55:55 +00:00
Santos Cordon
1aeb886e88 Add OWNERS file for display-device-config dirs.
Test: No test, just owners change
Change-Id: I5acd0994f4337bff27af2af5d4ca09ea80e5e6ea
2020-12-14 18:43:21 +00:00
Mehdi Alizadeh
849332255e Merge "Don't reset default launcher if the user is not loaded" 2020-12-14 18:34:52 +00:00
Zimuzo Ezeozue
155e594fee Merge "Fix transcode_optimize flags" 2020-12-14 18:27:12 +00:00
Treehugger Robot
4ef13ea0c9 Merge "Add a path for GNSS time suggestions" am: 85ebf98dcf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528193

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3753cb40af786a702f8d65ec2192a55a97229f36
2020-12-14 18:21:21 +00:00
TreeHugger Robot
3317653b8c Merge "Send DROPBOX_ENTRY_ADDED to all users" into rvc-qpr-dev 2020-12-14 18:16:43 +00:00
TreeHugger Robot
869b1dc1e5 Merge "Make hardware buttons just wake up device" 2020-12-14 18:13:46 +00:00
Treehugger Robot
85ebf98dcf Merge "Add a path for GNSS time suggestions" 2020-12-14 18:02:50 +00:00
TreeHugger Robot
c5de978212 Merge "Combine CpuTimePerUidFreq uids using base uids" 2020-12-14 18:00:43 +00:00
TreeHugger Robot
e0ac9eb555 [automerger skipped] Merge "Revert "DO NOT MERGE Add RECORD_AUDIO_OUTPUT app op"" into rvc-qpr-dev-plus-aosp am: 78c4844b69 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dd9dd5f183a05905bb60aec776d02d543e5f1cb
2020-12-14 17:57:25 +00:00
TreeHugger Robot
78c4844b69 Merge "Revert "DO NOT MERGE Add RECORD_AUDIO_OUTPUT app op"" into rvc-qpr-dev-plus-aosp 2020-12-14 17:52:27 +00:00
Wale Ogunwale
f7ecdf6988 Merge "Add more OWNERS coverages(2/n)" am: a2c85ce0ba am: 700b3d812f am: dfbbd0e5d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b99215f99e165cbfc0ee925878d291746d94163
2020-12-14 17:49:34 +00:00
Darryl L Johnson
a11a21fd12 Add OWNERS file to device state XSD directory.
Bug: 159401801
Test: None
Change-Id: I7470dd3a25aff77e07b0cf6742bbe16d8daf8c0a
2020-12-14 09:31:12 -08:00
Wale Ogunwale
dfbbd0e5d7 Merge "Add more OWNERS coverages(2/n)" am: a2c85ce0ba am: 700b3d812f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d1525ba52d4365241785b4789f7363aac0d32c4
2020-12-14 17:30:00 +00:00