Commit Graph

628320 Commits

Author SHA1 Message Date
TreeHugger Robot
0fc7ecde5c Merge "Update the Call Strength icons to support 0~4 bars" into sc-dev 2021-03-09 21:14:42 +00:00
Ryan Mitchell
aff259e622 Merge "OMS: 'cmd overlay lookup': support --user" am: 5267d0e0d6 am: d64094cf30 am: 7203735926
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01d0774f15b1df263aef631aa06db41bf1feb6dd
2021-03-09 20:47:29 +00:00
Tianjie Xu
aa7c7cc3e9 Merge "Make the new proto build" am: 606a64f7da am: 3077dfa613 am: 86f922435f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff934cbf94a2abd4cc941a60c316538cdf787e15
2021-03-09 20:46:41 +00:00
Tianjie Xu
5e5e891851 Merge "Fix ResumeOnRebootServiceProviderTests" am: db8ed62e01 am: aae8912a37 am: 1c5e5fe444
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id02a0b6f083dd7b448aa6c08f614630fe10bcd7f
2021-03-09 20:45:43 +00:00
Todd Kennedy
f990e60707 Merge "Add owners" am: ca9bcca560 am: 84812f6d12 am: 1f3a49233f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80a1e6c9ee88be605a8087efea73d9d25391dcf7
2021-03-09 20:45:21 +00:00
Jeff Sharkey
119cf833ad Merge "Update OWNERS file for GraphicsEnvironment" am: 5b7186f65d am: f4a2795bb8 am: dce433b181
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f8d55be3864027ed5f65d6fefd58d13e1b4c175
2021-03-09 20:44:58 +00:00
Ryan Mitchell
7203735926 Merge "OMS: 'cmd overlay lookup': support --user" am: 5267d0e0d6 am: d64094cf30
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2961b4276f4f6cc4095a15b9159912ee5c571f4
2021-03-09 20:19:20 +00:00
Tianjie Xu
86f922435f Merge "Make the new proto build" am: 606a64f7da am: 3077dfa613
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a55613a0b49a51bf1901a4eaed01a8d7ab6255c
2021-03-09 20:00:23 +00:00
Tianjie Xu
1c5e5fe444 Merge "Fix ResumeOnRebootServiceProviderTests" am: db8ed62e01 am: aae8912a37
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81d0d2d799150d8bcf66b350b9a52998999b347a
2021-03-09 19:59:36 +00:00
Todd Kennedy
1f3a49233f Merge "Add owners" am: ca9bcca560 am: 84812f6d12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23ed90655e4aed009960086b20d98bbe3b24dd6c
2021-03-09 19:59:21 +00:00
Jeff Sharkey
dce433b181 Merge "Update OWNERS file for GraphicsEnvironment" am: 5b7186f65d am: f4a2795bb8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9be0b00869616ae72f6a51be4732693b7f66b22
2021-03-09 19:59:04 +00:00
Ryan Mitchell
d64094cf30 Merge "OMS: 'cmd overlay lookup': support --user" am: 5267d0e0d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I906257c415070a165bd91e6f51ab84aa51ce46b5
2021-03-09 19:57:55 +00:00
Fabian Kozynski
e4ba4f837d Merge "Fix color animation" into sc-dev 2021-03-09 19:54:24 +00:00
Youngjun Kwak
c7677faff0 [automerger skipped] Merge "DO NOT MERGE Do not reinflate the layout if it has not been already inflated." into rvc-qpr-dev am: ed260d837f am: 57cefc366e -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fcb5d9f416078a24cf3aedcd26058fc0b14b251
2021-03-09 19:42:44 +00:00
kwaky
92e92b6b72 [automerger skipped] DO NOT MERGE Do not reinflate the layout if it has not been already inflated. am: b700beab66 am: 15780ebbc0 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c852a8883c62bb9d547cf0ae0ec7d834c03adca
2021-03-09 19:42:19 +00:00
Ryan Mitchell
5267d0e0d6 Merge "OMS: 'cmd overlay lookup': support --user" 2021-03-09 19:41:34 +00:00
Tianjie Xu
3077dfa613 Merge "Make the new proto build" am: 606a64f7da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id591371447cccbe6ad90ff2ff066068f9ead3167
2021-03-09 19:27:16 +00:00
Tianjie Xu
aae8912a37 Merge "Fix ResumeOnRebootServiceProviderTests" am: db8ed62e01
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aec1678237a4d243da65d21f65026f5334591c3
2021-03-09 19:23:08 +00:00
Tianjie Xu
606a64f7da Merge "Make the new proto build" 2021-03-09 19:22:18 +00:00
Tianjie Xu
db8ed62e01 Merge "Fix ResumeOnRebootServiceProviderTests" 2021-03-09 19:20:17 +00:00
Todd Kennedy
84812f6d12 Merge "Add owners" am: ca9bcca560
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic533ddddac42b44406b7197af31d4224143f0c54
2021-03-09 19:20:14 +00:00
Jeff Sharkey
f4a2795bb8 Merge "Update OWNERS file for GraphicsEnvironment" am: 5b7186f65d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d4bc7d14df6bbf3f965d91daf4933cc0dd40178
2021-03-09 19:17:03 +00:00
Todd Kennedy
ca9bcca560 Merge "Add owners" 2021-03-09 19:11:05 +00:00
Adam He
a47c17768c Merge "Full refactor of Translation APIs." into sc-dev 2021-03-09 19:05:54 +00:00
Felipe Leme
8ead8216dd Merge "Restricts PersonalAppsSuspensionHelper.dump() to system user." into sc-dev 2021-03-09 19:02:44 +00:00
Youngjun Kwak
57cefc366e Merge "DO NOT MERGE Do not reinflate the layout if it has not been already inflated." into rvc-qpr-dev am: ed260d837f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13807481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa728a75c7514ea433947333d082ee613305801c
2021-03-09 18:56:40 +00:00
kwaky
15780ebbc0 DO NOT MERGE Do not reinflate the layout if it has not been already inflated. am: b700beab66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13807481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6cc751dbf46a6e45c04b605cf5f07194a2f20b4f
2021-03-09 18:56:30 +00:00
Dmitri Plotnikov
f0a755448b Merge "Prevent crash when power profile has incorrect freq counts" into sc-dev 2021-03-09 18:44:29 +00:00
Jeff Sharkey
5b7186f65d Merge "Update OWNERS file for GraphicsEnvironment" 2021-03-09 18:40:42 +00:00
Yiwei Zhang
0400f05249 Update OWNERS file for GraphicsEnvironment
Test: build
Change-Id: I077a9ea03ada04608396f40f153527cc22ea83ca
2021-03-09 18:25:37 +00:00
Youngjun Kwak
ed260d837f Merge "DO NOT MERGE Do not reinflate the layout if it has not been already inflated." into rvc-qpr-dev 2021-03-09 18:19:26 +00:00
Makoto Onuki
85399be2db Merge "Dump FgsStartTempAllowList in dumpsys activity processes" into sc-dev 2021-03-09 18:13:49 +00:00
Sergey Volnov
50f0175f3e Merge "Allow shell to temporary change speech recognition service" am: aa212a0109 am: a7c55dc99e am: 82abc59b39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604913

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6413ed4352ba6d967742063ab73b8e321f88dee
2021-03-09 17:05:40 +00:00
Sergey Volnov
82abc59b39 Merge "Allow shell to temporary change speech recognition service" am: aa212a0109 am: a7c55dc99e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604913

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac4f7ed714d9493ff4235a8ae162ee6d801cecc5
2021-03-09 16:39:55 +00:00
Bram Bonné
8d90f15a45 Merge "Build Rust bindings for PermissionController" am: d5b27fd3eb am: 4e786abc4f am: 8cb2a537a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18d9dd4fbcbc10fa5041cc10987fe11e433a5a4a
2021-03-09 16:26:20 +00:00
Todd Kennedy
238e1bac60 Add owners
Change-Id: I5d42a09fb431b600232af078a02b4f9c9a7835b0
2021-03-09 16:13:48 +00:00
Sergey Volnov
a7c55dc99e Merge "Allow shell to temporary change speech recognition service" am: aa212a0109
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604913

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I403cf7e8ec2b758fae26fdd688282fbdc03632eb
2021-03-09 16:01:16 +00:00
Bram Bonné
8cb2a537a2 Merge "Build Rust bindings for PermissionController" am: d5b27fd3eb am: 4e786abc4f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51183f21469451f5620fed31bd98d4982c636dca
2021-03-09 15:43:38 +00:00
Kalesh Singh
c7f9fc813a Merge "getDmabufMappedSizeKb: Use ReadDmaBufMapRefs()" am: 36f5f53a61 am: 0010cbec06 am: d3c84f7d31
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e3750251670837afafdc51da41ab0ba148c2659
2021-03-09 15:25:02 +00:00
Sergey Volnov
aa212a0109 Merge "Allow shell to temporary change speech recognition service" 2021-03-09 15:24:32 +00:00
Bram Bonné
4e786abc4f Merge "Build Rust bindings for PermissionController" am: d5b27fd3eb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia82a9dadf7c8bb5b7da70b679931b9f55eba6499
2021-03-09 15:06:31 +00:00
Kalesh Singh
d3c84f7d31 Merge "getDmabufMappedSizeKb: Use ReadDmaBufMapRefs()" am: 36f5f53a61 am: 0010cbec06
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I353c6157d3dc051481da2840436c34e606a39b9b
2021-03-09 14:44:18 +00:00
Bram Bonné
d5b27fd3eb Merge "Build Rust bindings for PermissionController" 2021-03-09 14:35:06 +00:00
Bernardo Rufino
11687fae2c Merge "Annotate obscuring opacity getter/setter w/ @FloatRange" into sc-dev 2021-03-09 14:18:28 +00:00
TreeHugger Robot
5cab2b0c71 Merge "Do not collapse shade auto when SysUI start activities" into sc-dev 2021-03-09 14:18:04 +00:00
Kalesh Singh
0010cbec06 Merge "getDmabufMappedSizeKb: Use ReadDmaBufMapRefs()" am: 36f5f53a61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67afcf295241c4ef183a3d0eae5f23535839290c
2021-03-09 14:05:36 +00:00
SongFerng Wang
1971fbc747 [automerger skipped] Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: dfbd3a4072 am: 4bf02f2282 am: 4c8d91f2c8 -s ours
am skip reason: Change-Id I48d36d73d016f7aa7fabec25a725abe03b1dee8d with SHA-1 ed6078c020 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie53d918cf8bf1ee51f8397a060d6a24a97511b57
2021-03-09 13:51:23 +00:00
Lais Andrade
9080ab7c85 Merge "Clarify delay parameter documentation in VibrationEffect" am: 2b9f0c7623 am: cdbc51fa52 am: 3afe20a305
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2edda8cecdd7d7d8f16d0505629fc9c71805274
2021-03-09 13:50:00 +00:00
Kalesh Singh
36f5f53a61 Merge "getDmabufMappedSizeKb: Use ReadDmaBufMapRefs()" 2021-03-09 13:34:38 +00:00
SongFerng Wang
4c8d91f2c8 Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: dfbd3a4072 am: 4bf02f2282
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614991

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I952841fe940d2224b9e78dd19d295866a7f7eb54
2021-03-09 13:25:55 +00:00