Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
416,021 Commits 3 Branches 0 Tags
044ae8a5b610734435f49c9ac94d89cd7a5992eb
Commit Graph

416021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Yu
044ae8a5b6 [automerger skipped] Merge "Fixed that emergency alert dialog not popped up" am: 4da7f91b23 
am: 480903bbcb -s ours
am skip reason: change_id Ie563a8f11ac991ab9568f65df6a4d14eebe47c5e with SHA1 974607aac8 is in history

Change-Id: I606baf2e1cdb05e5e286285bc268cb61441e59e0
 2019-04-23 10:44:54 -07:00
Amin Shaikh
ef80b3408f Merge "Set config_bottomDialogCornerRadius for square icon shape." into qt-dev 
am: 4a81a539f4

Change-Id: I14df9268ecd0aba03da1b9618aa1fd21296e251a
 2019-04-23 10:40:24 -07:00
Jack Yu
480903bbcb Merge "Fixed that emergency alert dialog not popped up" 
am: 4da7f91b23

Change-Id: Iba1c3d277171a1727953509438d3cabacb9c45cb
 2019-04-23 10:21:10 -07:00
Vishnu Nair
7ba3da51a6 Merge "[wm] Add tests to check adjust bounds logic will always exit" into qt-dev 
am: f243662ba3

Change-Id: I5574a9c70a774afbe2bd0a1dfea60ceac7f53315
 2019-04-23 10:02:44 -07:00
Android Build Merger (Role)
3c8c88e2da Merge "Merge "Add a timeout for the DNS probe." am: e721b4b83e am: 133fe15fc0" into qt-dev-plus-aosp 2019-04-23 16:58:16 +00:00
Lorenzo Colitti
c7204f689d Merge "Add a timeout for the DNS probe." am: e721b4b83e 
am: 133fe15fc0

Change-Id: I01d3e82828ccba060c35cc34c0f28c0535ed4ac7
 2019-04-23 09:57:47 -07:00
Jack Yu
4da7f91b23 Merge "Fixed that emergency alert dialog not popped up" 2019-04-23 16:57:04 +00:00
Anil Admal
ca2e942b7f Merge "Add separate hasCapabilityName() methods in GnssCapabilities" into qt-dev 
am: d4203ddebf

Change-Id: Ifaf7ae51533fce57faa8cfde01d5e245b0b555e6
 2019-04-23 09:56:40 -07:00
Android Build Merger (Role)
2a9ec5525d Merge "Merge "Add tests for DhcpErrorEvent" am: 367c758601 am: faef1f66ed" into qt-dev-plus-aosp 2019-04-23 16:50:53 +00:00
Paul Hu
09ad5e2545 Merge "Add tests for DhcpErrorEvent" am: 367c758601 
am: faef1f66ed

Change-Id: I9b65a2eef94567d2b79a9955619938e64906080d
 2019-04-23 09:50:28 -07:00
Anil Admal
f249ed895b Merge "Change getGnssCapabilites() return type to @NonNull" into qt-dev 
am: 69195f2b92

Change-Id: I5764dcda8bd5c5c542c957f98d573f5a8269cddc
 2019-04-23 09:50:14 -07:00
Blake Kragten
953b34015c Merge "Update Rail Data Collection Frequency" into qt-dev 
am: 25b06f04d4

Change-Id: I6e850eab5e6511f1f8c77a378cdb335532b95376
 2019-04-23 09:43:44 -07:00
Lorenzo Colitti
fbfbf45b16 [automerger skipped] Merge "Freeze the networkstack-aidl-interfaces interface" into qt-dev 
am: c2f1cc8b8e -s ours
am skip reason: change_id Ideabe73fc93bbefca2d624ee9ca190cf31419424 with SHA1 1232fe37be is in history

Change-Id: I39438b1a3204aa82550ac83117a96f7549d19e42
 2019-04-23 09:37:54 -07:00
Fabian Kozynski
78bdaff746 Merge "Remove QS initial tooltip" into qt-dev 
am: 9aa53da1be

Change-Id: Icc104a1f17e90c656588c4df9e80f484faff8177
 2019-04-23 09:33:27 -07:00
Alan Stokes
3462cbdbf3 Merge "Allow second consecutive activity start." into qt-dev 
am: 8cee482fdd

Change-Id: I8962f77bffe7b146ebb87c9a3b34aa2e95c4dd79
 2019-04-23 09:27:50 -07:00
Fabian Kozynski
03dc9060f7 Merge "Make QSCarrierText always selected" into qt-dev 
am: 4aef4e57c8

Change-Id: I0e3a7200c86670259e597f2f307716c9b8cd2963
 2019-04-23 09:21:16 -07:00
Lorenzo Colitti
133fe15fc0 Merge "Add a timeout for the DNS probe." 
am: e721b4b83e

Change-Id: Ieca3cc8bd1983794aaa6268cdf4237d19b23cbea
 2019-04-23 09:17:49 -07:00
Paul Hu
faef1f66ed Merge "Add tests for DhcpErrorEvent" 
am: 367c758601

Change-Id: I7e6271e9becc974ea38d405914a87859ab700877
 2019-04-23 09:12:25 -07:00
Louis Chang
d4fef4dca1 Merge "Fix NPE when scheduling transaction for null client" into qt-dev 
am: ec4c269f94

Change-Id: I404d1bcbd00a6db869d92e4ca4af1b05d7a3d7b9
 2019-04-23 09:11:55 -07:00
TreeHugger Robot
4a81a539f4 Merge "Set config_bottomDialogCornerRadius for square icon shape." into qt-dev 2019-04-23 16:03:47 +00:00
TreeHugger Robot
f243662ba3 Merge "[wm] Add tests to check adjust bounds logic will always exit" into qt-dev 2019-04-23 15:57:37 +00:00
Anil Admal
d4203ddebf Merge "Add separate hasCapabilityName() methods in GnssCapabilities" into qt-dev 2019-04-23 15:32:05 +00:00
Anil Admal
69195f2b92 Merge "Change getGnssCapabilites() return type to @NonNull" into qt-dev 2019-04-23 15:31:48 +00:00
Blake Kragten
25b06f04d4 Merge "Update Rail Data Collection Frequency" into qt-dev 2019-04-23 14:26:48 +00:00
TreeHugger Robot
c2f1cc8b8e Merge "Freeze the networkstack-aidl-interfaces interface" into qt-dev 2019-04-23 14:15:25 +00:00
Lorenzo Colitti
e721b4b83e Merge "Add a timeout for the DNS probe." 2019-04-23 14:13:14 +00:00
Fabian Kozynski
9aa53da1be Merge "Remove QS initial tooltip" into qt-dev 2019-04-23 14:08:25 +00:00
Alan Stokes
8cee482fdd Merge "Allow second consecutive activity start." into qt-dev 2019-04-23 13:26:40 +00:00
Fabian Kozynski
4aef4e57c8 Merge "Make QSCarrierText always selected" into qt-dev 2019-04-23 12:58:11 +00:00
Paul Hu
367c758601 Merge "Add tests for DhcpErrorEvent" 2019-04-23 11:31:03 +00:00
TreeHugger Robot
ec4c269f94 Merge "Fix NPE when scheduling transaction for null client" into qt-dev 2019-04-23 10:35:27 +00:00
Lorenzo Colitti
e8660ef639 Freeze the networkstack-aidl-interfaces interface 
This freezes the interface as of the latest beta build, not the tip of
tree. IIpClient#setL2KeyAndGroupHint is not in the frozen definition in
particular.

Generated with:
m networkstack-aidl-interfaces-freeze-api \
    ipmemorystore-aidl-interfaces-freeze-api

Test: flashed, booted, WiFi and captive portal working
Bug: 128803828
Change-Id: Ideabe73fc93bbefca2d624ee9ca190cf31419424
Merged-In: Ideabe73fc93bbefca2d624ee9ca190cf31419424
(cherry picked from commit 9b89cdaaf4)
 2019-04-23 09:41:44 +00:00
Yunfan Chen
d7b885d8da Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev 
am: 7c3708170c

Change-Id: I7c728394b290c0a965022cfc1e9f73728af3afd3
 2019-04-23 02:33:44 -07:00
Xiao Ma
9f7760dd21 [automerger skipped] Merge "provide a resource overlay to configure customized DNS Server." into qt-dev 
am: 27ad19ee9e -s ours
am skip reason: change_id I123b3d4516cc6ba6d17629eb74daf448ba7121eb with SHA1 a4d0122048 is in history

Change-Id: Ia4a68691a8f7113c9575b4856a47f9c011a21653
 2019-04-23 02:28:06 -07:00
Tadashi G. Takaoka
31b7cbd9e6 Merge "Remove CtsActivityManagerDeviceTestCases reference" into qt-dev 
am: c4fbf3f080

Change-Id: I7c2e12b324da15c5028e4df246374fabb7df72dc
 2019-04-23 02:20:37 -07:00
TreeHugger Robot
7c3708170c Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev 2019-04-23 09:15:26 +00:00
Mathew Inwood
ddb5cf9e2a Merge "Move some telephony methods to max-sdk-p list." into qt-dev 
am: 33ff97d7f6

Change-Id: Idff38b84f152c6c231a2f34a13dff9458ca051b1
 2019-04-23 02:14:53 -07:00
TreeHugger Robot
27ad19ee9e Merge "provide a resource overlay to configure customized DNS Server." into qt-dev 2019-04-23 09:05:45 +00:00
TreeHugger Robot
c4fbf3f080 Merge "Remove CtsActivityManagerDeviceTestCases reference" into qt-dev 2019-04-23 09:00:25 +00:00
TreeHugger Robot
33ff97d7f6 Merge "Move some telephony methods to max-sdk-p list." into qt-dev 2019-04-23 08:58:36 +00:00
Lorenzo Colitti
9b89cdaaf4 Merge "Freeze the networkstack-aidl-interfaces interface" am: 950767f9f9 
am: 6c88bf9bd7

Change-Id: I0bc827a6c7995eb7b50b4afeed11317ad8e29666
 2019-04-23 01:55:01 -07:00
Lorenzo Colitti
6c88bf9bd7 Merge "Freeze the networkstack-aidl-interfaces interface" 
am: 950767f9f9

Change-Id: I32e335756927110e3200f002d32f9e1e8acfd779
 2019-04-23 01:45:40 -07:00
Lorenzo Colitti
950767f9f9 Merge "Freeze the networkstack-aidl-interfaces interface" 2019-04-23 08:33:41 +00:00
Junyu Lai
df9591a4dc Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am: fb36d44462 
am: 91dab790e7

Change-Id: I410acc19ceb13e32c65cbdf3095da9db0802470c
 2019-04-23 01:18:54 -07:00
Alan Stokes
ac9a12924a Allow second consecutive activity start. 
If we start two activities in onCreate the second one was being
blocked - because the current activity is no longer top but the new
activity is not yet visible. So we treat an INITIALIZING activity
as being visible for this purpose.

Bug: 130645908
Test: atest BackgroundActivityLaunchTest RootWindowContainerTests \
WmTests:ActivityStarterTests \
CtsWindowManagerDeviceTestCases:ActivityStarterTests
Change-Id: I96749f8b4d385527c91725827880bd12371d2411
 2019-04-23 09:09:59 +01:00
Junyu Lai
91dab790e7 Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" 
am: fb36d44462

Change-Id: I2f5e0e11494866b054668c9224a8732cd8c035f9
 2019-04-23 01:08:39 -07:00
Junyu Lai
fb36d44462 Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" 2019-04-23 07:48:08 +00:00
Chalard Jean
58d9ece0d3 [automerger skipped] Merge "Fix an argument to the legacy broadcast" into qt-dev 
am: 27f23459d2 -s ours
am skip reason: change_id I0fc408d546ae9d72b7dd9415e502252b484d4329 with SHA1 807983b976 is in history

Change-Id: I5ebe636715e8cf1ea5e42d12236c1f5fa07c38d0
 2019-04-23 00:27:22 -07:00
Chalard Jean
243b5c104c [automerger skipped] Merge "Fix a bug where + before % is ignored" into qt-dev 
am: 55a1d5bd5f -s ours
am skip reason: change_id Ibe73a33264569b08cac4c00b4dda838f1e5551fc with SHA1 76c76902a6 is in history

Change-Id: I1cb91f0b62492eb0c1ffa9112d7a3d94164852e0
 2019-04-23 00:22:24 -07:00
Chalard Jean
27f23459d2 Merge "Fix an argument to the legacy broadcast" into qt-dev 2019-04-23 07:04:26 +00:00