OSDN Git Service
Joel Galenson [Tue, 23 Apr 2019 22:39:26 +0000 (15:39 -0700)]
Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev am:
5bac48f7c0
am:
b070dcf5ce
Change-Id: I21b37902f568637a35d64b0b6e49956aa7c904e3
Sunny Goyal [Tue, 23 Apr 2019 22:33:23 +0000 (15:33 -0700)]
Merge "Adding callback when surface params are applied" into qt-dev am:
8cb5228673
am:
0b4dea9809
Change-Id: I9967123991fde314b50203c322bd50aec7c7c297
Chenbo Feng [Tue, 23 Apr 2019 22:27:25 +0000 (15:27 -0700)]
[automerger skipped] Merge "Add a lock to protect persistent stats snapshot" into qt-dev am:
ac8913be19 -s ours
am:
a5b48c10dc -s ours
am skip reason: change_id I73851336452110afb74d6dd1ca5e50047d5b3d4a with SHA1
25243b4eb9 is in history
Change-Id: Id3eca996369f20b684f2d3d0436a79288193c7b0
Michael Groover [Tue, 23 Apr 2019 22:18:55 +0000 (15:18 -0700)]
Merge "Add content description to sensors off icon in status bar" into qt-dev am:
fa7a24ef8e
am:
ece28e1afa
Change-Id: Ic01f4618324ea98e8970b8121b2b90734699af36
Arc Wang [Tue, 23 Apr 2019 22:00:57 +0000 (15:00 -0700)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev am:
831dc426f1
am:
f460464eeb
Change-Id: I8bf3f2b22488ce1632ccc19a3943bda3aedaf089
Shuo Qian [Tue, 23 Apr 2019 21:54:40 +0000 (14:54 -0700)]
[automerger skipped] Merge "Fix urn compare in EmergencyNumber" into qt-dev am:
8fb57ca86c -s ours
am:
03b6250d66 -s ours
am skip reason: change_id I585ecafcf9996e24befec2dbe86465a1d5a0f030 with SHA1
3b35404279 is in history
Change-Id: I5ae36080b61e1a9387b65f1ae36d88dc2b994180
Christopher Ferris [Tue, 23 Apr 2019 21:41:10 +0000 (14:41 -0700)]
Merge "[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am:
aba4de21e0 am:
df4acb4d8c -s ours
am:
58722b4558 -s ours
am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1
4740d54243 is in history
Change-Id: I11d68de26dbcc95869609440f0ca491493805d71
Christopher Ferris [Tue, 23 Apr 2019 21:19:47 +0000 (14:19 -0700)]
[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am:
aba4de21e0 am:
df4acb4d8c -s ours
am:
8e0431be66 -s ours
am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1
4740d54243 is in history
Change-Id: Id9f81cb5187623bf44ca0c73189b29b8e386e842
Greg Daniel [Tue, 23 Apr 2019 20:11:53 +0000 (13:11 -0700)]
Merge "Make sure to sync GPU after deleting memory in trimMemory." into qt-dev am:
68406a2dd5
am:
663ab50411
Change-Id: I7e22af48449386dde99a9ce222414376a96b6958
Steven Moreland [Tue, 23 Apr 2019 20:06:37 +0000 (20:06 +0000)]
Merge "HwBlob: s/malloc/calloc/"
TreeHugger Robot [Tue, 23 Apr 2019 19:48:25 +0000 (19:48 +0000)]
Merge "use colormatrix w/o legacy apis"
Joel Galenson [Tue, 23 Apr 2019 19:47:52 +0000 (12:47 -0700)]
Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev
am:
5bac48f7c0
Change-Id: Ief691feb48e7e2e8b471d00c5caaf73f9a023365
Santos Cordon [Tue, 23 Apr 2019 19:46:00 +0000 (12:46 -0700)]
Merge "Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev am:
65cf57bf6c" into qt-dev-plus-aosp
am:
d2877e3209
Change-Id: I498597d62688429c5dc7c1471c3dcdabd5a2fc19
Sunny Goyal [Tue, 23 Apr 2019 19:30:13 +0000 (12:30 -0700)]
Merge "Adding callback when surface params are applied" into qt-dev
am:
8cb5228673
Change-Id: I399ae23877efc46ff02d43c1804440fd388cd127
Fabian Kozynski [Tue, 23 Apr 2019 19:28:45 +0000 (12:28 -0700)]
Merge "Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev am:
aeb929a3f9" into qt-dev-plus-aosp
am:
8a8be29510
Change-Id: I38db76b9b0e71b4f7f7b6895bcb656c0f49d09a1
Chenbo Feng [Tue, 23 Apr 2019 19:23:12 +0000 (12:23 -0700)]
[automerger skipped] Merge "Add a lock to protect persistent stats snapshot" into qt-dev
am:
ac8913be19 -s ours
am skip reason: change_id I73851336452110afb74d6dd1ca5e50047d5b3d4a with SHA1
25243b4eb9 is in history
Change-Id: I30d66ea36a7beee9ccf940c547c47a6f7220e0a2
Michael Groover [Tue, 23 Apr 2019 19:17:36 +0000 (12:17 -0700)]
Merge "Add content description to sensors off icon in status bar" into qt-dev
am:
fa7a24ef8e
Change-Id: I7dde4ab81d058514b88a41f747473508074c9898
Lucas Dupin [Tue, 23 Apr 2019 19:17:31 +0000 (12:17 -0700)]
Merge "Merge "Add ID field to the Callback" into qt-dev am:
14d351d41b" into qt-dev-plus-aosp
am:
dd57e9dcec
Change-Id: I3f2f183bb37d02110ec12ae25636e434ed190299
TreeHugger Robot [Tue, 23 Apr 2019 19:11:26 +0000 (19:11 +0000)]
Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev
Jack Yu [Tue, 23 Apr 2019 19:05:44 +0000 (12:05 -0700)]
[automerger skipped] Merge "Fixed that emergency alert dialog not popped up" am:
4da7f91b23 am:
480903bbcb -s ours
am:
044ae8a5b6 -s ours
am skip reason: change_id Ie563a8f11ac991ab9568f65df6a4d14eebe47c5e with SHA1
974607aac8 is in history
Change-Id: I29119046d1bcd10c286b5d970e90638b783e9269
Arc Wang [Tue, 23 Apr 2019 19:04:46 +0000 (12:04 -0700)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev
am:
831dc426f1
Change-Id: If2b162dd82a0d6c8fd48989ad6a31f0368534047
Amin Shaikh [Tue, 23 Apr 2019 18:56:46 +0000 (11:56 -0700)]
Merge "Set config_bottomDialogCornerRadius for square icon shape." into qt-dev am:
4a81a539f4
am:
ef80b3408f
Change-Id: Iefae6a58bd1ffa3591e891d3d1c6d68e38b8d131
Shuo Qian [Tue, 23 Apr 2019 18:47:00 +0000 (11:47 -0700)]
[automerger skipped] Merge "Fix urn compare in EmergencyNumber" into qt-dev
am:
8fb57ca86c -s ours
am skip reason: change_id I585ecafcf9996e24befec2dbe86465a1d5a0f030 with SHA1
3b35404279 is in history
Change-Id: Ic36dba3e62e26f0699467d1ccbfe9087c5d19c29
Android Build Merger (Role) [Tue, 23 Apr 2019 18:34:17 +0000 (18:34 +0000)]
Merge "[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am:
aba4de21e0 am:
df4acb4d8c -s ours am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1
4740d54243 is in history" into qt-dev-plus-aosp
TreeHugger Robot [Tue, 23 Apr 2019 18:32:26 +0000 (18:32 +0000)]
Merge "Adding callback when surface params are applied" into qt-dev
Christopher Ferris [Tue, 23 Apr 2019 18:31:49 +0000 (11:31 -0700)]
[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am:
aba4de21e0
am:
df4acb4d8c -s ours
am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1
4740d54243 is in history
Change-Id: Idaf690cb8b3050a0109a50f036024341a03dd3cc
Greg Daniel [Tue, 23 Apr 2019 18:31:47 +0000 (11:31 -0700)]
Merge "Make sure to sync GPU after deleting memory in trimMemory." into qt-dev
am:
68406a2dd5
Change-Id: I67a9c2e15ec9b6691befec3cd8d439924fbfa5b4
Vishnu Nair [Tue, 23 Apr 2019 18:27:11 +0000 (11:27 -0700)]
Merge "[wm] Add tests to check adjust bounds logic will always exit" into qt-dev am:
f243662ba3
am:
7ba3da51a6
Change-Id: Ic27cc31f9bfe5a44e4460ddd3cad93bb46dc785a
Android Build Merger (Role) [Tue, 23 Apr 2019 18:21:49 +0000 (18:21 +0000)]
Merge "Merge "Merge "Add a timeout for the DNS probe." am:
e721b4b83e am:
133fe15fc0" into qt-dev-plus-aosp am:
3c8c88e2da"
Lorenzo Colitti [Tue, 23 Apr 2019 18:21:19 +0000 (11:21 -0700)]
Merge "Merge "Add a timeout for the DNS probe." am:
e721b4b83e am:
133fe15fc0" into qt-dev-plus-aosp
am:
3c8c88e2da
Change-Id: I2fc69f26c4df366b6ff407dda386145bf9e0528e
TreeHugger Robot [Tue, 23 Apr 2019 18:19:06 +0000 (18:19 +0000)]
Merge "Add a lock to protect persistent stats snapshot" into qt-dev
Jordan Liu [Tue, 23 Apr 2019 18:12:57 +0000 (18:12 +0000)]
Merge "Do not populate SLOT_KEY with wrong slot info"
Anil Admal [Tue, 23 Apr 2019 18:06:49 +0000 (11:06 -0700)]
Merge "Add separate hasCapabilityName() methods in GnssCapabilities" into qt-dev am:
d4203ddebf
am:
ca2e942b7f
Change-Id: I10248f220686f1edbdfa00d5be322bfccba01496
Christopher Ferris [Tue, 23 Apr 2019 18:03:08 +0000 (11:03 -0700)]
Merge "Move to android_mallopt for malloc debug calls."
am:
aba4de21e0
Change-Id: Ibd755a60e862ff6db869bc412145d0058b9f7d41
Paul Hu [Tue, 23 Apr 2019 18:00:58 +0000 (11:00 -0700)]
Merge "Merge "Add tests for DhcpErrorEvent" am:
367c758601 am:
faef1f66ed" into qt-dev-plus-aosp
am:
2a9ec5525d
Change-Id: I78d78dd421cc3ffea774ff5eaa6aa758debc9cf2
Android Build Merger (Role) [Tue, 23 Apr 2019 18:00:43 +0000 (18:00 +0000)]
Merge "Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev am:
65cf57bf6c" into qt-dev-plus-aosp
Santos Cordon [Tue, 23 Apr 2019 17:59:51 +0000 (10:59 -0700)]
Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev
am:
65cf57bf6c
Change-Id: I063e124f45cf7d55d04217ad1123db9ce9b14bf0
Mike Reed [Tue, 23 Apr 2019 17:57:35 +0000 (13:57 -0400)]
use colormatrix w/o legacy apis
Test: make
Change-Id: I01e29bd36ed3788c4f996092c81310c17f5039cd
TreeHugger Robot [Tue, 23 Apr 2019 17:56:46 +0000 (17:56 +0000)]
Merge "Add content description to sensors off icon in status bar" into qt-dev
Android Build Merger (Role) [Tue, 23 Apr 2019 17:52:29 +0000 (17:52 +0000)]
Merge "Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev am:
aeb929a3f9" into qt-dev-plus-aosp
Fabian Kozynski [Tue, 23 Apr 2019 17:52:05 +0000 (10:52 -0700)]
Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev
am:
aeb929a3f9
Change-Id: I3d4e3f1684ac08df8a2ea01273e3cf30cb3cb688
Android Build Merger (Role) [Tue, 23 Apr 2019 17:47:27 +0000 (17:47 +0000)]
Merge "Merge "Add ID field to the Callback" into qt-dev am:
14d351d41b" into qt-dev-plus-aosp
Lucas Dupin [Tue, 23 Apr 2019 17:47:05 +0000 (10:47 -0700)]
Merge "Add ID field to the Callback" into qt-dev
am:
14d351d41b
Change-Id: Icb0cab0607d98b40420bd52a3b3ff8c5bb48fec6
Anil Admal [Tue, 23 Apr 2019 17:46:32 +0000 (10:46 -0700)]
Merge "Change getGnssCapabilites() return type to @NonNull" into qt-dev am:
69195f2b92
am:
f249ed895b
Change-Id: I84f4ae837fa24b089defc7a6ffc39b39dd880858
Christopher Ferris [Tue, 23 Apr 2019 17:45:01 +0000 (17:45 +0000)]
Merge "Move to android_mallopt for malloc debug calls."
Jack Yu [Tue, 23 Apr 2019 17:44:54 +0000 (10:44 -0700)]
[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
Amin Shaikh [Tue, 23 Apr 2019 17:40:24 +0000 (10:40 -0700)]
Merge "Set config_bottomDialogCornerRadius for square icon shape." into qt-dev
am:
4a81a539f4
Change-Id: I14df9268ecd0aba03da1b9618aa1fd21296e251a
Blake Kragten [Tue, 23 Apr 2019 17:40:05 +0000 (10:40 -0700)]
Merge "Update Rail Data Collection Frequency" into qt-dev am:
25b06f04d4
am:
953b34015c
Change-Id: I0a2a22c6725e3eeaa4500b31a654b2a67d067b13
TreeHugger Robot [Tue, 23 Apr 2019 17:36:54 +0000 (17:36 +0000)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev
Lorenzo Colitti [Tue, 23 Apr 2019 17:30:28 +0000 (10:30 -0700)]
[automerger skipped] Merge "Freeze the networkstack-aidl-interfaces interface" into qt-dev am:
c2f1cc8b8e -s ours
am:
fbfbf45b16 -s ours
am skip reason: change_id Ideabe73fc93bbefca2d624ee9ca190cf31419424 with SHA1
1232fe37be is in history
Change-Id: I4407d6f86052f0a31615b387d98c1f0df770889a
Shuo Qian [Tue, 23 Apr 2019 17:27:26 +0000 (17:27 +0000)]
Merge "Fix urn compare in EmergencyNumber" into qt-dev
Jack Yu [Tue, 23 Apr 2019 17:21:10 +0000 (10:21 -0700)]
Merge "Fixed that emergency alert dialog not popped up"
am:
4da7f91b23
Change-Id: Iba1c3d277171a1727953509438d3cabacb9c45cb
Fabian Kozynski [Tue, 23 Apr 2019 17:11:06 +0000 (10:11 -0700)]
Merge "Remove QS initial tooltip" into qt-dev am:
9aa53da1be
am:
78bdaff746
Change-Id: I0fd85c771ebeed4a63a4f08d016a6421a0d539e6
Amy Zhang [Tue, 23 Apr 2019 17:07:34 +0000 (17:07 +0000)]
Merge "Init ARC before init System Audio Mode from AVR"
Vishnu Nair [Tue, 23 Apr 2019 17:02:44 +0000 (10:02 -0700)]
Merge "[wm] Add tests to check adjust bounds logic will always exit" into qt-dev
am:
f243662ba3
Change-Id: I5574a9c70a774afbe2bd0a1dfea60ceac7f53315
Android Build Merger (Role) [Tue, 23 Apr 2019 16:58:16 +0000 (16:58 +0000)]
Merge "Merge "Add a timeout for the DNS probe." am:
e721b4b83e am:
133fe15fc0" into qt-dev-plus-aosp
Lorenzo Colitti [Tue, 23 Apr 2019 16:57:47 +0000 (09:57 -0700)]
Merge "Add a timeout for the DNS probe." am:
e721b4b83e
am:
133fe15fc0
Change-Id: I01d3e82828ccba060c35cc34c0f28c0535ed4ac7
Jack Yu [Tue, 23 Apr 2019 16:57:04 +0000 (16:57 +0000)]
Merge "Fixed that emergency alert dialog not popped up"
Anil Admal [Tue, 23 Apr 2019 16:56:40 +0000 (09:56 -0700)]
Merge "Add separate hasCapabilityName() methods in GnssCapabilities" into qt-dev
am:
d4203ddebf
Change-Id: Ifaf7ae51533fce57faa8cfde01d5e245b0b555e6
Greg Daniel [Tue, 23 Apr 2019 16:52:06 +0000 (16:52 +0000)]
Merge "Make sure to sync GPU after deleting memory in trimMemory." into qt-dev
Android Build Merger (Role) [Tue, 23 Apr 2019 16:50:53 +0000 (16:50 +0000)]
Merge "Merge "Add tests for DhcpErrorEvent" am:
367c758601 am:
faef1f66ed" into qt-dev-plus-aosp
Paul Hu [Tue, 23 Apr 2019 16:50:28 +0000 (09:50 -0700)]
Merge "Add tests for DhcpErrorEvent" am:
367c758601
am:
faef1f66ed
Change-Id: I9b65a2eef94567d2b79a9955619938e64906080d
Anil Admal [Tue, 23 Apr 2019 16:50:14 +0000 (09:50 -0700)]
Merge "Change getGnssCapabilites() return type to @NonNull" into qt-dev
am:
69195f2b92
Change-Id: I5764dcda8bd5c5c542c957f98d573f5a8269cddc
Alan Stokes [Tue, 23 Apr 2019 16:48:07 +0000 (09:48 -0700)]
Merge "Allow second consecutive activity start." into qt-dev am:
8cee482fdd
am:
3462cbdbf3
Change-Id: I9b2bbb16a4f2cec7aad64c414215645c26131cf1
Blake Kragten [Tue, 23 Apr 2019 16:43:44 +0000 (09:43 -0700)]
Merge "Update Rail Data Collection Frequency" into qt-dev
am:
25b06f04d4
Change-Id: I6e850eab5e6511f1f8c77a378cdb335532b95376
Fabian Kozynski [Tue, 23 Apr 2019 16:42:02 +0000 (09:42 -0700)]
Merge "Make QSCarrierText always selected" into qt-dev am:
4aef4e57c8
am:
03dc9060f7
Change-Id: Ia8f8494d764ce836bd0e60630a77806877a525d1
Lorenzo Colitti [Tue, 23 Apr 2019 16:37:54 +0000 (09:37 -0700)]
[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
Louis Chang [Tue, 23 Apr 2019 16:35:44 +0000 (09:35 -0700)]
Merge "Fix NPE when scheduling transaction for null client" into qt-dev am:
ec4c269f94
am:
d4fef4dca1
Change-Id: Ie9d06daa699055784155b4c97bdaa43a6734a738
Fabian Kozynski [Tue, 23 Apr 2019 16:33:27 +0000 (09:33 -0700)]
Merge "Remove QS initial tooltip" into qt-dev
am:
9aa53da1be
Change-Id: Icc104a1f17e90c656588c4df9e80f484faff8177
TreeHugger Robot [Tue, 23 Apr 2019 16:31:24 +0000 (16:31 +0000)]
Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev
Alan Stokes [Tue, 23 Apr 2019 16:27:50 +0000 (09:27 -0700)]
Merge "Allow second consecutive activity start." into qt-dev
am:
8cee482fdd
Change-Id: I8962f77bffe7b146ebb87c9a3b34aa2e95c4dd79
Fabian Kozynski [Tue, 23 Apr 2019 16:21:57 +0000 (16:21 +0000)]
Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev
Fabian Kozynski [Tue, 23 Apr 2019 16:21:16 +0000 (09:21 -0700)]
Merge "Make QSCarrierText always selected" into qt-dev
am:
4aef4e57c8
Change-Id: I0e3a7200c86670259e597f2f307716c9b8cd2963
Lorenzo Colitti [Tue, 23 Apr 2019 16:17:49 +0000 (09:17 -0700)]
Merge "Add a timeout for the DNS probe."
am:
e721b4b83e
Change-Id: Ieca3cc8bd1983794aaa6268cdf4237d19b23cbea
Paul Hu [Tue, 23 Apr 2019 16:12:25 +0000 (09:12 -0700)]
Merge "Add tests for DhcpErrorEvent"
am:
367c758601
Change-Id: I7e6271e9becc974ea38d405914a87859ab700877
Louis Chang [Tue, 23 Apr 2019 16:11:55 +0000 (09:11 -0700)]
Merge "Fix NPE when scheduling transaction for null client" into qt-dev
am:
ec4c269f94
Change-Id: I404d1bcbd00a6db869d92e4ca4af1b05d7a3d7b9
Lucas Dupin [Tue, 23 Apr 2019 16:11:20 +0000 (16:11 +0000)]
Merge "Add ID field to the Callback" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 16:03:47 +0000 (16:03 +0000)]
Merge "Set config_bottomDialogCornerRadius for square icon shape." into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 15:57:37 +0000 (15:57 +0000)]
Merge "[wm] Add tests to check adjust bounds logic will always exit" into qt-dev
Anil Admal [Tue, 23 Apr 2019 15:32:05 +0000 (15:32 +0000)]
Merge "Add separate hasCapabilityName() methods in GnssCapabilities" into qt-dev
Anil Admal [Tue, 23 Apr 2019 15:31:48 +0000 (15:31 +0000)]
Merge "Change getGnssCapabilites() return type to @NonNull" into qt-dev
Blake Kragten [Tue, 23 Apr 2019 14:26:48 +0000 (14:26 +0000)]
Merge "Update Rail Data Collection Frequency" into qt-dev
Chenbo Feng [Fri, 12 Apr 2019 01:44:45 +0000 (18:44 -0700)]
Add a lock to protect persistent stats snapshot
Since the network stats could be polled from multiple services at
runtime, it is not thread safe for networkStatsFactory to hold a
persistent stats snapshot without any protection. Use a internal lock to
prevent concurrent modification on mPersistentSnapshot to fix the
problem.
Bug:
124764595
Test: android.app.usage.cts.NetworkUsageStatsTest
android.net.cts.TrafficStatsTest
Change-Id: I73851336452110afb74d6dd1ca5e50047d5b3d4a
Merged-In: I73851336452110afb74d6dd1ca5e50047d5b3d4a
Merged-In: I22afb46f17697e8b6359d4f593802e0f4b95db8b
(cherry picked from commit
25243b4eb93c234412a35f9e5d9f1649f8964f83)
TreeHugger Robot [Tue, 23 Apr 2019 14:15:25 +0000 (14:15 +0000)]
Merge "Freeze the networkstack-aidl-interfaces interface" into qt-dev
Lorenzo Colitti [Tue, 23 Apr 2019 14:13:14 +0000 (14:13 +0000)]
Merge "Add a timeout for the DNS probe."
Fabian Kozynski [Tue, 23 Apr 2019 14:08:25 +0000 (14:08 +0000)]
Merge "Remove QS initial tooltip" into qt-dev
Sunny Goyal [Wed, 10 Apr 2019 22:48:06 +0000 (15:48 -0700)]
Adding callback when surface params are applied
Bug:
123874711
Test: Verified that there are no leak logs
Change-Id: I5dcb27c9c44d674363824e703b923fa83e3132b9
Alan Stokes [Tue, 23 Apr 2019 13:26:40 +0000 (13:26 +0000)]
Merge "Allow second consecutive activity start." into qt-dev
Fabian Kozynski [Tue, 23 Apr 2019 12:58:11 +0000 (12:58 +0000)]
Merge "Make QSCarrierText always selected" into qt-dev
Paul Hu [Tue, 23 Apr 2019 11:31:03 +0000 (11:31 +0000)]
Merge "Add tests for DhcpErrorEvent"
Santos Cordon [Tue, 9 Apr 2019 16:02:38 +0000 (17:02 +0100)]
Add delay to power-button power-off after gesture wakeup.
Adds a small delay to avoid turning off the device if the user
hits the power button right after the device wakes up via a gesture.
Bug:
126560003
Test: Manual
Change-Id: I3116ce98f244e5660573d5fa764a77083aee7fc5
TreeHugger Robot [Tue, 23 Apr 2019 10:35:27 +0000 (10:35 +0000)]
Merge "Fix NPE when scheduling transaction for null client" into qt-dev
Yunfan Chen [Tue, 23 Apr 2019 09:48:02 +0000 (02:48 -0700)]
Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev am:
7c3708170c
am:
d7b885d8da
Change-Id: I165677f932881cb9b46af34fb10241ba05550908
Xiao Ma [Tue, 23 Apr 2019 09:42:37 +0000 (02:42 -0700)]
[automerger skipped] Merge "provide a resource overlay to configure customized DNS Server." into qt-dev am:
27ad19ee9e -s ours
am:
9f7760dd21 -s ours
am skip reason: change_id I123b3d4516cc6ba6d17629eb74daf448ba7121eb with SHA1
a4d0122048 is in history
Change-Id: I37d42112fbe79882265e44c55cc16ad44797ad4e
Lorenzo Colitti [Tue, 23 Apr 2019 08:55:01 +0000 (01:55 -0700)]
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
9b89cdaaf401a6b77e160807039c06e537fa600a)
Yunfan Chen [Tue, 23 Apr 2019 09:33:44 +0000 (02:33 -0700)]
Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev
am:
7c3708170c
Change-Id: I7c728394b290c0a965022cfc1e9f73728af3afd3
Tadashi G. Takaoka [Tue, 23 Apr 2019 09:33:33 +0000 (02:33 -0700)]
Merge "Remove CtsActivityManagerDeviceTestCases reference" into qt-dev am:
c4fbf3f080
am:
31b7cbd9e6
Change-Id: I857270f33417e77e2f64b28770c6b897227e9e6c
Xiao Ma [Tue, 23 Apr 2019 09:28:06 +0000 (02:28 -0700)]
[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
Mathew Inwood [Tue, 23 Apr 2019 09:24:26 +0000 (02:24 -0700)]
Merge "Move some telephony methods to max-sdk-p list." into qt-dev am:
33ff97d7f6
am:
ddb5cf9e2a
Change-Id: I4eef9dedede0c33d3e8ca644a7dd213edf70877c
Tadashi G. Takaoka [Tue, 23 Apr 2019 09:20:37 +0000 (02:20 -0700)]
Merge "Remove CtsActivityManagerDeviceTestCases reference" into qt-dev
am:
c4fbf3f080
Change-Id: I7c2e12b324da15c5028e4df246374fabb7df72dc
OSDN Git Service
