OSDN Git Service
Pengquan Meng [Tue, 23 Apr 2019 20:51:29 +0000 (13:51 -0700)]
[automerger skipped] Merge "Add carrier display name related CarrierConfig" am:
570f5dcae1
am:
9bc0b85dae -s ours
am skip reason: change_id I79836b2912be5223a2269e660bfaadf4aa72b930 with SHA1
057b94f43b is in history
Change-Id: Ib323032763a0521745e1d2ffb4f9484afc7fd107
Matt Pape [Tue, 23 Apr 2019 20:46:04 +0000 (13:46 -0700)]
Merge "Update settings to properties mapper to use multi property listener." into qt-dev
am:
b4a49aa45b
Change-Id: Ic5700c6044fb1a1cd57803fe5269bf5428a39d07
Yin-Chia Yeh [Tue, 23 Apr 2019 20:40:33 +0000 (13:40 -0700)]
Merge "Camera: fix null pointer dereference" into qt-dev
am:
dc7de27113
Change-Id: Ifcd0da978fe11f873e07310ef2513b87ba3415a8
Pengquan Meng [Tue, 23 Apr 2019 20:39:26 +0000 (13:39 -0700)]
Merge "Add carrier display name related CarrierConfig"
am:
570f5dcae1
Change-Id: I8162117716296d3e707a192e4b61dc5fb3727fee
Howard Ro [Tue, 23 Apr 2019 20:34:43 +0000 (13:34 -0700)]
Merge "Revert "Add apex packages to uid_mapping"" into qt-dev
am:
14e7eb7108
Change-Id: I3e36cb4117118e0e62c2718d5e42144c210f93cd
Makoto Onuki [Tue, 23 Apr 2019 20:28:56 +0000 (13:28 -0700)]
Merge "pm set-home-activity waits until completion" into qt-dev
am:
ec41ca2aa7
Change-Id: I1b1ea6b9cdfdc7db542903debee4fc60cd26d425
Pengquan Meng [Tue, 23 Apr 2019 20:23:20 +0000 (20:23 +0000)]
Merge "Add carrier display name related CarrierConfig"
Nick Chalko [Tue, 23 Apr 2019 20:22:45 +0000 (13:22 -0700)]
Merge "Don't start an observer without an extcon device" into qt-dev
am:
9c505c5572
Change-Id: Ied990b9c3cf425a182242ea163565dc77af8769b
Mike Digman [Tue, 23 Apr 2019 20:13:17 +0000 (13:13 -0700)]
Merge "Sharesheet - make work profile badges render" into qt-dev
am:
aabebff4b8
Change-Id: Ia61d8663873fb2ab60a67167f7d4c66e9eac9c06
Matt Pape [Tue, 23 Apr 2019 19:54:38 +0000 (19:54 +0000)]
Merge "Update settings to properties mapper to use multi property listener." into qt-dev
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
TreeHugger Robot [Tue, 23 Apr 2019 19:37:25 +0000 (19:37 +0000)]
Merge "Camera: fix null pointer dereference" into qt-dev
Howard Ro [Tue, 23 Apr 2019 19:36:25 +0000 (19:36 +0000)]
Merge "Revert "Add apex packages to uid_mapping"" into qt-dev
Makoto Onuki [Tue, 23 Apr 2019 19:36:08 +0000 (19:36 +0000)]
Merge "pm set-home-activity waits until completion" into qt-dev
Howard Ro [Tue, 23 Apr 2019 18:59:33 +0000 (18:59 +0000)]
Revert "Add apex packages to uid_mapping"
This reverts commit
67b1e54327e828a39a0706740d3898a8b561a81f.
Bug:
131167067
Reason for revert: b/
131167067
Change-Id: I9a6aa7121a83c50fc99954bd2485eccfb26d74f5
TreeHugger Robot [Tue, 23 Apr 2019 19:33:35 +0000 (19:33 +0000)]
Merge "Don't start an observer without an extcon device" into qt-dev
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
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
TreeHugger Robot [Tue, 23 Apr 2019 19:20:56 +0000 (19:20 +0000)]
Merge "Sharesheet - make work profile badges render" into qt-dev
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
TreeHugger Robot [Tue, 23 Apr 2019 19:11:26 +0000 (19:11 +0000)]
Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Tue, 23 Apr 2019 09:15:26 +0000 (09:15 +0000)]
Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev
Mathew Inwood [Tue, 23 Apr 2019 09:14:53 +0000 (02:14 -0700)]
Merge "Move some telephony methods to max-sdk-p list." into qt-dev
am:
33ff97d7f6
Change-Id: Idff38b84f152c6c231a2f34a13dff9458ca051b1
TreeHugger Robot [Tue, 23 Apr 2019 09:05:45 +0000 (09:05 +0000)]
Merge "provide a resource overlay to configure customized DNS Server." into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 09:00:25 +0000 (09:00 +0000)]
Merge "Remove CtsActivityManagerDeviceTestCases reference" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 08:58:36 +0000 (08:58 +0000)]
Merge "Move some telephony methods to max-sdk-p list." into qt-dev
Lorenzo Colitti [Tue, 23 Apr 2019 08:55:01 +0000 (01:55 -0700)]
Merge "Freeze the networkstack-aidl-interfaces interface" am:
950767f9f9
am:
6c88bf9bd7
Change-Id: I0bc827a6c7995eb7b50b4afeed11317ad8e29666
Lorenzo Colitti [Tue, 23 Apr 2019 08:45:40 +0000 (01:45 -0700)]
Merge "Freeze the networkstack-aidl-interfaces interface"
am:
950767f9f9
Change-Id: I32e335756927110e3200f002d32f9e1e8acfd779
Lorenzo Colitti [Tue, 23 Apr 2019 08:33:41 +0000 (08:33 +0000)]
Merge "Freeze the networkstack-aidl-interfaces interface"
Junyu Lai [Tue, 23 Apr 2019 08:18:54 +0000 (01:18 -0700)]
Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am:
fb36d44462
am:
91dab790e7
Change-Id: I410acc19ceb13e32c65cbdf3095da9db0802470c
Alan Stokes [Thu, 18 Apr 2019 12:41:58 +0000 (13:41 +0100)]
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
Junyu Lai [Tue, 23 Apr 2019 08:08:39 +0000 (01:08 -0700)]
Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
am:
fb36d44462
Change-Id: I2f5e0e11494866b054668c9224a8732cd8c035f9
Junyu Lai [Tue, 23 Apr 2019 07:48:08 +0000 (07:48 +0000)]
Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
Chalard Jean [Tue, 23 Apr 2019 07:27:22 +0000 (00:27 -0700)]
[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
Chalard Jean [Tue, 23 Apr 2019 07:22:24 +0000 (00:22 -0700)]
[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
Chalard Jean [Tue, 23 Apr 2019 07:04:26 +0000 (07:04 +0000)]
Merge "Fix an argument to the legacy broadcast" into qt-dev
Chalard Jean [Tue, 23 Apr 2019 07:03:24 +0000 (07:03 +0000)]
Merge "Fix a bug where + before % is ignored" into qt-dev
Remi NGUYEN VAN [Fri, 5 Apr 2019 06:15:48 +0000 (15:15 +0900)]
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
Mingguang Xu [Tue, 23 Apr 2019 06:17:39 +0000 (23:17 -0700)]
Merge "Wifi usability: Add timestamp in WifiUsabilityStats" into qt-dev
am:
b09eed2309
Change-Id: I4ad447892ab421fa99908214de86e95e96fc001a
Mingguang Xu [Tue, 23 Apr 2019 06:00:22 +0000 (06:00 +0000)]
Merge "Wifi usability: Add timestamp in WifiUsabilityStats" into qt-dev
OSDN Git Service
