drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
437,659 Commits 1 Branch 0 Tags
Commit Graph

437659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugene Susla
3b2fe616fd Use dataclass codegen on a few initial framework classes 
Test: presubmit
Change-Id: Ide3c21596f6489fdb1db8f72e1436a01b10f56ed
 2019-08-06 21:29:29 -07:00
TreeHugger Robot
c7ccc2cd5e Merge "Make AttestedKeyPair constructable" 2019-08-06 18:17:53 +00:00
Jean-Michel Trivi
f165a18a43 Merge "FocusRequester: refactor handleFocusLoss" 2019-08-06 17:51:14 +00:00
Nicolas Geoffray
bd01aac5ec Merge "Update boot profiles for zygote and system server." 2019-08-06 17:28:12 +00:00
Kevin Hufnagle
1ce530c67a Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev am: c80fe63001 am: 410f162645 am: d3f289b664 
am: 55d52c90a8

Change-Id: I5b62f42ad8437d671da592ae7c1c38c4d1ce79ec
 2019-08-06 09:55:22 -07:00
Steven Liu
80161fc4cb Merge "change from @hide to @SystemApi for wifi in CarrierConfig" 2019-08-06 16:47:00 +00:00
Android Build Merger (Role)
6a8adf5da2 Merge "Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev am: c80fe63001 am: ad1de8fbe4 am: 0f27f04f9b am: 7130f7ed6b" 2019-08-06 16:45:56 +00:00
Kevin Hufnagle
ac971c2c1c Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev am: c80fe63001 am: ad1de8fbe4 am: 0f27f04f9b 
am: 7130f7ed6b

Change-Id: Icd331ef8ed5fa1a2925b621d6670140aa03d7c09
 2019-08-06 09:45:11 -07:00
Eugene Susla
c40f4c706c Merge "Addresses further review comments from ag/8000041" 2019-08-06 16:44:45 +00:00
Kevin Hufnagle
55d52c90a8 Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev am: c80fe63001 am: 410f162645 
am: d3f289b664

Change-Id: I26f601f348b8b71f58d3c786d9430e5eee6d6a0b
 2019-08-06 09:43:06 -07:00
Kevin Hufnagle
7130f7ed6b Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev am: c80fe63001 am: ad1de8fbe4 
am: 0f27f04f9b

Change-Id: Ibafe22878438e3f1ce176647a3ba07544d753dbf
 2019-08-06 09:38:01 -07:00
Kevin Hufnagle
d3f289b664 Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev am: c80fe63001 
am: 410f162645

Change-Id: I26c8752c4dadd5200a944f816dd92a7b2d0c7d02
 2019-08-06 09:26:39 -07:00
Kevin Hufnagle
0f27f04f9b Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev am: c80fe63001 
am: ad1de8fbe4

Change-Id: I22a8b72e89aef3063c3f2b40e6d1f58c7155a7e8
 2019-08-06 09:23:03 -07:00
Nandana Dutt
ecc40227b6 Merge "Remove obsolete methods from DumpstateListener implementations" 2019-08-06 16:21:34 +00:00
TreeHugger Robot
4448d24bcf Merge "Update FooterPreference" 2019-08-06 16:10:28 +00:00
Kevin Hufnagle
410f162645 Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev 
am: c80fe63001

Change-Id: I3acf4d0a724d252b59a9e56fb1939187d741dcf7
 2019-08-06 09:09:56 -07:00
Kevin Hufnagle
ad1de8fbe4 Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev 
am: c80fe63001

Change-Id: I332332fc88e565a3842297b04769778ee1c344ca
 2019-08-06 09:09:56 -07:00
Kevin Hufnagle
c80fe63001 Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev 2019-08-06 15:53:40 +00:00
Eran Messeri
390539d11b Make AttestedKeyPair constructable 
Make the constructor for AttestedKeyPair public so instances of it can
be created for testing.

Bug: 138409426
Test: That it compiles
Change-Id: Iab8fbf1ad2293a91347701eb67631a8f3a3bd3fa
 2019-08-06 15:55:17 +01:00
Nicolas Geoffray
bb7eaa2680 Update boot profiles for zygote and system server. 
Same simpleperf input than previous version, but:
- Look at all threads of system server instead of the main one.
- Order by execution order instead of hotness order.

Test: boot
Bug: 119800099
Change-Id: I2830c16e488c261f9e05a4733ab2f220f9d645c1
 2019-08-06 15:51:24 +01:00
Sunny Shao
2b4f24a82c Update FooterPreference 
Display user specified icon if android:icon has value, otherwise shows default.

Fixes: 138965988
Test: manual test
Change-Id: I78771103e52bd2b10aeae312d354fce27ec436fb
 2019-08-06 20:54:41 +08:00
Eino-Ville Talvala
1234469cda [automerger skipped] Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction am: 9971348a0c am: 433ee38af2" into qt-qpr1-dev-plus-aosp 
am: 78a356fd43 -s ours
am skip reason: subject contains skip directive

Change-Id: I53459463221714ea97dab5403de690b0d4bcb653
 2019-08-06 03:33:46 -07:00
Bernardo Rufino
4c308436d1 Merge "Eagerly initialize BMS in Trampoline's constructor" 2019-08-06 10:29:31 +00:00
Eino-Ville Talvala
90cf683bce [automerger skipped] [RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction am: 9971348a0c am: 433ee38af2 
am: 1da4e635dc -s ours
am skip reason: subject contains skip directive

Change-Id: I866c855abd019223e472ec3041383784e5154467
 2019-08-06 03:28:23 -07:00
Sherry Huang
d5e42b6546 Merge "Merge "Only show the thermal shutdown warning when thermal reboot" into qt-r1-dev am: 553b8bf2c1 am: d9baadcf15" into qt-qpr1-dev-plus-aosp 
am: 23eaeb8898

Change-Id: Id5dd60d462fff10deecefd6dbf709fb463a7784a
 2019-08-06 03:23:35 -07:00
Bill Yi
ff59a09b07 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 3ca8c70e38 -s ours am: 2a6dabcd6a -s ours 
am: 80940c8826 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib0ac478c71e05a3546e652d49fe3b7bf714b97db
 2019-08-06 03:22:33 -07:00
Roshan Pius
2bb6734240 Merge "Merge "XmlUtils: Fix hex parsing in readThisByteArrayXml" into qt-qpr1-dev am: 2883327fba" into qt-qpr1-dev-plus-aosp 
am: defbe4d33e

Change-Id: I2c00bc9087566de626666f82380d353c961c3ea7
 2019-08-06 03:21:49 -07:00
sqian
ddf54a00b3 Merge "Merge "Add a documentation in EmergencyNumber#getNumber" into qt-r1-dev am: 46b82fd3ce am: 66ef0077f2" into qt-qpr1-dev-plus-aosp 
am: 24993c2179

Change-Id: Ib7cceac3ce28902901519b2cef17f4c097462f87
 2019-08-06 03:21:02 -07:00
Adrian Roos
bcf88f9c3e Merge "GestureNav: Log exclusion rect heights am: 5f2c9a14f5 am: ad19429212" into qt-qpr1-dev-plus-aosp 
am: 5113d405a9

Change-Id: Ibbd1733143a8464ac2aed4a051a75e34a33ff1b9
 2019-08-06 03:19:56 -07:00
Sooraj Sasindran
8b9f454508 Merge "Merge "Add carrier config for exit hysteresis time" into qt-qpr1-dev am: 3010c40175" into qt-qpr1-dev-plus-aosp 
am: f17298b349

Change-Id: I411cf70136c2acb8e2b2cf8abdcd6848a6647813
 2019-08-06 03:19:02 -07:00
Yin-Chia Yeh
5453cbe868 Merge "Merge "ImageWriter: increase timeout for BufDetachThread" into qt-qpr1-dev am: 997adc05e8" into qt-qpr1-dev-plus-aosp 
am: bb9c471449

Change-Id: Ib54b48943ee016634a2542b52be47b8e7259ad05
 2019-08-06 03:18:08 -07:00
Jorim Jaggi
be3c4f6e68 Merge "Merge "Fix overlapping remote and recents animations" into qt-r1-dev am: b248a0343f am: f76a0f8376" into qt-qpr1-dev-plus-aosp 
am: 6578c2e540

Change-Id: I69d4966e352738f0e26b94ef9a2733f531a2bd18
 2019-08-06 03:17:15 -07:00
Fabian Kozynski
9aabb8d36a [automerger skipped] Merge "Merge "Restore SignalTileView in CellularTile" into qt-qpr1-dev am: d97ded0165" into qt-qpr1-dev-plus-aosp 
am: b2ac9ae8ce -s ours
am skip reason: change_id I9df951e97d7908c018aafb3d175fa557078aedcf with SHA1 242b38a8a6 is in history

Change-Id: I740fd2d3db58edacf93b360e4c09b17c8a05327c
 2019-08-06 03:16:34 -07:00
Bill Yi
17ad0de71c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab6ef4f0df -s ours am: 3633c30ccd -s ours am: 884b0ce1ec -s ours 
am: 317af33691 -s ours
am skip reason: subject contains skip directive

Change-Id: I04a48ae0fd98b4f48e579ebd4287b6146de0a5c8
 2019-08-06 03:15:50 -07:00
Bill Yi
0eaa620dba Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 83b7531e1b -s ours am: 5621f5b11c -s ours 
am: d6947882d7 -s ours
am skip reason: subject contains skip directive

Change-Id: I41950cdd20fd10c8ca9ac7e89b9d6246f2be2e02
 2019-08-06 03:15:06 -07:00
Santos Cordon
7d1422cafa Merge "Merge "Acquire display suspend blocker for DozeService" into qt-r1-dev am: 403bf951fd am: 3f8fda2f23" into qt-qpr1-dev-plus-aosp 
am: e787f765e0

Change-Id: I1407be50c5435cd0e9754b5e483b5287379770e1
 2019-08-06 03:14:23 -07:00
Hyunyoung Song
96d5d5b2fd Merge "[automerger skipped] Merge "create ExclusionRectStateChanged/BackGesture atom" into qt-r1-dev am: 7e9c5d047d am: e1b40b0aa2 -s ours 
am: 1b84736dae -s ours
am skip reason: change_id Id4b36c89ed5bf3330795107fb6cd6750edcd0dbf with SHA1 f1b935ea2e is in history

Change-Id: Ic03cc5822d0650e7db727ec4a66c889f526437ac
 2019-08-06 03:13:19 -07:00
Eino-Ville Talvala
df9e2d751e [automerger skipped] Merge "Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction" into qt-r1-dev am: 33c07d1c38 am: 99b8fb7518" into qt-qpr1-dev-plus-aosp 
am: 69d066cd8c -s ours
am skip reason: subject contains skip directive

Change-Id: If50434aa9677af9e5d05adf4150161a15ea20798
 2019-08-06 03:12:27 -07:00
Hai Zhang
f7104f33dc [automerger skipped] Merge "Merge "DO NOT MERGE Fix PermissionManagerService throwing exception for unknown package." into qt-r1-dev am: 40921e6c7e am: 785def68dd" into qt-qpr1-dev-plus-aosp 
am: 5296dfdb7f -s ours
am skip reason: subject contains skip directive

Change-Id: I1d3fef69fe6b30c160ebe634a4543d36719090fd
 2019-08-06 03:11:31 -07:00
Hai Zhang
d327b1d51e [automerger skipped] Merge "DO NOT MERGE Fix PermissionManagerService throwing exception for unknown package. am: 03bb8eeeaa am: f0c48cec19" into qt-qpr1-dev-plus-aosp 
am: 2c18c55a8e -s ours
am skip reason: subject contains skip directive

Change-Id: I18eebed0001e486fc89f002511df054bcb3c0e3e
 2019-08-06 03:10:49 -07:00
Bill Yi
ef73fbf1a1 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f4c88573a1 -s ours 
am: 93bee18da0 -s ours
am skip reason: subject contains skip directive

Change-Id: I22c32db90bf25c3b69dafd82974010ad9f3d2009
 2019-08-06 03:10:07 -07:00
Lucas Dupin
29b74a2c17 Merge "Merge "Clearer message when face auth fails" into qt-qpr1-dev am: 298994875d" into qt-qpr1-dev-plus-aosp 
am: b4bb490d4f

Change-Id: I51e322b399077651ea08c1b3acab1d06eb38ec49
 2019-08-06 03:09:23 -07:00
Long Ling
55a5f95945 Merge "Merge "Responsiveness improvement for BrightnessObserver" into qt-r1-dev am: 6348d1e923 am: c04f49e005" into qt-qpr1-dev-plus-aosp 
am: 7eeff17c62

Change-Id: Ifce45c81875be494556e14c83b08f7a3af30569c
 2019-08-06 03:08:38 -07:00
Yin-Chia Yeh
f042ad8802 Merge "Camera: fix getKeys impl for vendor keys am: 1b1f14ebff" into qt-qpr1-dev-plus-aosp 
am: d1e6177672

Change-Id: If317e03171bdb9ee87556fca89d7e3f363f8cddf
 2019-08-06 03:07:42 -07:00
Shuo Qian
9577165f21 Merge "Merge "Add documentation in TelephonyManager#getNetworkCountryIso" into qt-r1-dev am: cd4208e080 am: d0daec0289" into qt-qpr1-dev-plus-aosp 
am: c63f5346ee

Change-Id: Iad1b3641749b91038d062f2e0767665cc87f9428
 2019-08-06 03:05:55 -07:00
Tarandeep Singh
34b640a315 Merge "Merge "Keep IME above starting window." into qt-r1-dev am: ced28f91bb am: 9775a24e9a" into qt-qpr1-dev-plus-aosp 
am: 43e1d38903

Change-Id: I4f7b8d83c86e2084c73d9d089ccb0833e4d3ab41
 2019-08-06 03:04:55 -07:00
Selim Cinek
74fee60e77 Merge "Merge "Fixes breaking test" into qt-r1-dev am: 4c1435a8eb am: bac83940c1" into qt-qpr1-dev-plus-aosp 
am: 8cfbf722d1

Change-Id: I404bdd0eb8fd4c3a77c45788844f4f5c98814e21
 2019-08-06 03:04:03 -07:00
Fabian Kozynski
c0587f5329 Merge "Merge "Fix "Invalid card" text on CarrierTextController" into qt-r1-dev am: 96585dea65 am: 9e00da8390" into qt-qpr1-dev-plus-aosp 
am: cc6a92c450

Change-Id: Id9d29dd36130d916df168424cb6da234f68cff6d
 2019-08-06 02:46:40 -07:00
James O'Leary
55041fc245 Merge "Merge "Don't tell Assistant to hide on gesture completion or cancel" into qt-r1-dev am: bea597d404 am: 8dfb53e474" into qt-qpr1-dev-plus-aosp 
am: d0caccb4e9

Change-Id: Ib033f020d9776824ede6bd818471fe203fe4188b
 2019-08-06 02:43:23 -07:00
Android Build Merger (Role)
78a356fd43 Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction am: 9971348a0c am: 433ee38af2" into qt-qpr1-dev-plus-aosp 2019-08-06 09:40:11 +00:00