Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
622,364 Commits 3 Branches 0 Tags
e514636ebb7c9edc4532e0e05680dfd62038cca8
Commit Graph

622364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
e514636ebb Merge "[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d4c -s ours am: 4a241c28a7 -s ours am: aa11921d25 -s ours" into sc-dev 2021-02-04 01:12:36 +00:00
Rubin Xu
281fa6e0e2 [automerger skipped] Merge "Add DPM.hasKeyPair()" am: 46915d9a14 am: 5c04261dac am: a73c1787f3 -s ours 
am skip reason: Change-Id I15ca6190db1ef4dbf0caabe9d46008d92f758df5 with SHA-1 b73e15249b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If68b9e0e52e4bb99e969da9e000d8aad67efcb3b
 2021-02-04 01:12:25 +00:00
TreeHugger Robot
28447be3a7 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d4c -s ours am: 4a241c28a7 -s ours am: aa11921d25 -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 a154d7a648 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2210f13f9dd031a55d2c98a5b3f2d56fcdb7a9f9
 2021-02-04 01:12:19 +00:00
Automerger Merge Worker
8108474517 Merge "[automerger skipped] DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 am: bc878b6a4d am: 5eea1f904c -s ours" into sc-dev 2021-02-04 01:12:16 +00:00
TreeHugger Robot
d2a7f0ec81 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 am: a4e5fdf10a am: 06885a559e -s ours am: 290cbce8e1 -s ours am: f5682c0332 -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 a154d7a648 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib892b55975b2be2d9614aa7f9be179203c1f8ee5
 2021-02-04 01:12:02 +00:00
Evan Laird
e41f002e1e [automerger skipped] DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 am: bc878b6a4d am: 5eea1f904c -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bc05be324923a2ecb92f7dfc82b0ab6c6a5b1b8
 2021-02-04 01:11:55 +00:00
Automerger Merge Worker
ec2ec1c69f Merge "[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into rvc-dev am: 3c4f0c4946 am: a7026c2eca -s ours" into sc-dev 2021-02-04 01:11:55 +00:00
Treehugger Robot
3ae343dfd8 Merge "OWNERS for InlineSuggestion* in view/inputmethod" am: 2745c788a0 am: a42ad625ac am: a13d5a3cba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562186

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a018097be211007dc599da7eaee41250f4b58b9
 2021-02-04 01:11:37 +00:00
TreeHugger Robot
1c4e7831dc [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into rvc-dev am: 3c4f0c4946 am: a7026c2eca -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 a154d7a648 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c34446e8e6410b51db233a8795b9d8fe48f107f
 2021-02-04 01:11:32 +00:00
Anton Hansson
0b5a20abac Merge "Update OWNERS to ref existing file" am: c3d4d00270 am: 09e7ab4ddb am: 8ced652a53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7e16769818fa388a14a441d589f7aac74022d4d
 2021-02-04 01:11:14 +00:00
TreeHugger Robot
d4354fb775 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9b6399bea6 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I303fa011bf0b874104ebd33c927f36f8e838f5f6
 2021-02-04 01:10:20 +00:00
Chris Ye
a539c9da30 Merge "Remove @UnsupportedAppUsage annotation from InputDevice constroctor" into sc-dev 2021-02-04 01:10:10 +00:00
Kevin Chyn
1c312ceb12 Merge "Fix SensorRect location" into sc-dev 2021-02-04 00:59:36 +00:00
Rubin Xu
a73c1787f3 Merge "Add DPM.hasKeyPair()" am: 46915d9a14 am: 5c04261dac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58f9d4a93709ffe0013e0fadd27d991a75c77605
 2021-02-04 00:53:50 +00:00
Evan Laird
5eea1f904c DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 am: bc878b6a4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5a5bab3e6788c7483b148aceaa4087cec09ad37
 2021-02-04 00:53:16 +00:00
Treehugger Robot
a13d5a3cba Merge "OWNERS for InlineSuggestion* in view/inputmethod" am: 2745c788a0 am: a42ad625ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562186

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c009ee37657466cc94974af0331d922aa413279
 2021-02-04 00:40:33 +00:00
Rubin Xu
5c04261dac Merge "Add DPM.hasKeyPair()" am: 46915d9a14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I738273da4664a6248f219688d9d90b76a6f04c11
 2021-02-04 00:40:07 +00:00
Anton Hansson
8ced652a53 Merge "Update OWNERS to ref existing file" am: c3d4d00270 am: 09e7ab4ddb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d56847ec40e60c040a17296d3cc5f18fd3d106e
 2021-02-04 00:40:04 +00:00
Adam Bookatz
52534776ec Merge "Measured screen energy into BatteryStatsHelper" into sc-dev 2021-02-04 00:33:10 +00:00
Evan Laird
bc878b6a4d DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1e59e74decf4453eb0489bbc7139032b9e0387c
 2021-02-04 00:24:25 +00:00
Matt Casey
5e05f48109 Merge changes I16e9e3d7,I546ae4a7 into sc-dev 
* changes:
  Add Save button to long screenshot
  Honor crop bounds for long screenshot bitmap export
 2021-02-04 00:23:32 +00:00
TreeHugger Robot
7ba56c57ee Merge "Prevent interacting with secondary handle if not initialized" into sc-dev 2021-02-04 00:16:00 +00:00
Treehugger Robot
a42ad625ac Merge "OWNERS for InlineSuggestion* in view/inputmethod" am: 2745c788a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562186

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5055a233152ec44c8bc98561d8736d205c4e5b14
 2021-02-03 23:38:17 +00:00
Anton Hansson
09e7ab4ddb Merge "Update OWNERS to ref existing file" am: c3d4d00270 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd30278360b8ad629c5b297b126d882119bb1d33
 2021-02-03 23:24:00 +00:00
Treehugger Robot
de291dabb4 Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a35a am: f8a276f313 am: da743b68a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91ccdfa9250800092160c1fb79e168213af87c43
 2021-02-03 23:23:20 +00:00
Treehugger Robot
0a817569eb Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6 am: acb38137cd am: 5a1c256180 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6cad0419179b893a4b936ec03bc2f3ab9a92e5c5
 2021-02-03 23:22:56 +00:00
Songchun Fan
933f1de97a Merge "Fix system_server's main thread name." am: 7fa0e63bc3 am: a184cbd7fb am: a3ba5784d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I362576dac4741ce88761d2ffe808ed5e5c469039
 2021-02-03 23:22:26 +00:00
Treehugger Robot
da743b68a4 Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a35a am: f8a276f313 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fbbcbf584778a03d9844623a18966f4a775d1e5
 2021-02-03 23:13:26 +00:00
Treehugger Robot
5a1c256180 Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6 am: acb38137cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80de479b73c6e8acb62c314ab25e2e93f5ed0669
 2021-02-03 23:13:08 +00:00
Treehugger Robot
f8a276f313 Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a35a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8742a4f74a0e5339af6d35f03a2d6173a700680
 2021-02-03 23:00:35 +00:00
Songchun Fan
a3ba5784d3 Merge "Fix system_server's main thread name." am: 7fa0e63bc3 am: a184cbd7fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6747d8a5e2341338d3e0f71692876bf183609b3a
 2021-02-03 22:57:02 +00:00
Treehugger Robot
acb38137cd Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I568b51ac671aab2e0d5614fb65bdc3cc797268fa
 2021-02-03 22:45:42 +00:00
Rubin Xu
46915d9a14 Merge "Add DPM.hasKeyPair()" 2021-02-03 22:35:41 +00:00
TreeHugger Robot
4415e09852 Merge "Update dark theme colors and dividers" into sc-dev 2021-02-03 22:14:58 +00:00
Treehugger Robot
2745c788a0 Merge "OWNERS for InlineSuggestion* in view/inputmethod" 2021-02-03 22:14:04 +00:00
Vinit Nayak
de29032500 Prevent interacting with secondary handle if not initialized 
Bug: 167831766
Change-Id: Id63e7f60806ba6ea3d8cffbbb2849b2d0323e802
 2021-02-03 14:11:11 -08:00
Rob Carr
9e2a817443 Merge "SurfaceView: Release BBQ where we release Surface" into sc-dev 2021-02-03 22:09:55 +00:00
Eugene Susla
114246c80e Merge "Don't crash on unknown CDM profile name" into sc-dev 2021-02-03 22:01:51 +00:00
Kevin Chyn
df1ae22403 Merge "Use StatusBar expansion instead of alpha to sync UDFPS animations" into sc-dev 2021-02-03 22:01:09 +00:00
Steven Moreland
1cf1bbe0e6 Merge "binder: race condition by parcel finalize" am: 52f933552a am: 5cb323c59e am: 2795e91f14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553275

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaac87c24d1acd513b9743e2630168c6e28ca7ebc
 2021-02-03 21:56:04 +00:00
Miranda Kephart
6a2f6639f5 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-dev am: ec9dd28b39 am: a27a700887 am: 2660868cf4 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8fce488c3ba0b5d31da47ca544af7145272f9ee1
 2021-02-03 21:55:39 +00:00
Songchun Fan
a184cbd7fb Merge "Fix system_server's main thread name." am: 7fa0e63bc3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06c78cb351f3fed294c28e664e9d337ff97de1fd
 2021-02-03 21:55:27 +00:00
Miranda Kephart
3b6a80edd0 [automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: a5141a4b96 -s ours am: c70d040f48 am: 1177c0bb88 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d772abfe7c7ca99549408a49346e058957f6ed7
 2021-02-03 21:55:25 +00:00
Steven Moreland
2795e91f14 Merge "binder: race condition by parcel finalize" am: 52f933552a am: 5cb323c59e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553275

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3edc89022f831d7d0301bdd4734e45b62c49649
 2021-02-03 21:43:03 +00:00
Miranda Kephart
2660868cf4 Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-dev am: ec9dd28b39 am: a27a700887 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I514dad7c10a2d450e2d8d877213bd0a501eac0c7
 2021-02-03 21:30:49 +00:00
Miranda Kephart
1177c0bb88 [automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: a5141a4b96 -s ours am: c70d040f48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3e21261f65417fde0c78b96061c12edeb9b4eed
 2021-02-03 21:30:33 +00:00
Bo Hu
d84462dfa5 Merge "[pm] reject installs of apks with renderscript on 64-bit only devices" into sc-dev 2021-02-03 21:18:20 +00:00
TreeHugger Robot
e10c0c05b1 Merge "Dependency injection of AssetProviders into ApkAssets" into sc-dev 2021-02-03 21:13:11 +00:00
TreeHugger Robot
455cbb77ce Merge "Clarify this is a debug message only." into sc-dev 2021-02-03 21:04:59 +00:00
Kohsuke Yatoh
944681eda5 Merge "Split lock in FontManagerService." into sc-dev 2021-02-03 21:00:56 +00:00