OSDN Git Service
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
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
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
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: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
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
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
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"
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
Jean-Michel Trivi [Tue, 23 Apr 2019 05:29:37 +0000 (22:29 -0700)]
Merge "AudioService: manage hearing aid volume for calls" into qt-dev
am:
0591251363
Change-Id: Ibeec03cb9e0ee4accc736e3f833e8ef425b57137
Jean-Michel Trivi [Tue, 23 Apr 2019 05:07:11 +0000 (05:07 +0000)]
Merge "AudioService: manage hearing aid volume for calls" into qt-dev
junyulai [Tue, 16 Apr 2019 11:32:32 +0000 (19:32 +0800)]
[KA11] Verify fd ownership and allocate resource for NattKeepalive
Since socket keepalive APIs for UDP encapsulation sockets are
public to generic app. In order to ensure the given fd is valid,
this change verifies the resource id inside the UDP
encapsulation socket by using methods provided by IpSecService.
Bug:
125517194
Fix:
123968920
Test: 1. atest FrameworksNetTests --generate-new-metrics 10
2. atestcom.android.server.ConnectivityServiceTest \
#testNattSocketKeepalives --generate-new-metrics 100
Change-Id: I408aacc19b364683854d15a095c34e72389a6e5b
Chalard Jean [Thu, 11 Apr 2019 05:09:07 +0000 (14:09 +0900)]
Fix an argument to the legacy broadcast
Test: new test for this
Fixes:
62650382
Change-Id: I918b8271d3c3c058553ca888cb54cd36a6efba66
Merged-In: I0fc408d546ae9d72b7dd9415e502252b484d4329
Merged-In: I9282930106d1eee3274d9e5c4e89de60e929a0e6
Yiwei Zhang [Tue, 23 Apr 2019 02:26:57 +0000 (19:26 -0700)]
Merge "Vulkan Doc: update descriptions for Vulkan feature flags" into qt-dev
am:
606f1c9ffb
Change-Id: I7dcd205ea53ff81eadb701b074d07591d4b35a95
Tadashi G. Takaoka [Tue, 23 Apr 2019 02:01:48 +0000 (11:01 +0900)]
Remove CtsActivityManagerDeviceTestCases reference
Bug:
130526034
Test: atest --test-mapping frameworks/base/services/core/java/com/android/server/am
Change-Id: I68e3645bc5fc32c5c577551c18b9e8560c3f1216
Louis Chang [Wed, 17 Apr 2019 09:15:01 +0000 (17:15 +0800)]
Fix NPE when scheduling transaction for null client
Application process was crash and the application thread was set
to null when obtaining the client transaction object. NPE was
thrown by using it to schedule transaction.
Bug:
130006936
Test: WindowProcessControllerTests
Test: ActivityStartControllerTests
Test: RootActivityContainerTests
Change-Id: I65ecb124e014e5d80ebc283884475619f95239fa
Sara Kato [Tue, 23 Apr 2019 02:17:05 +0000 (19:17 -0700)]
Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev
am:
9498153dfd
Change-Id: I5ff7a8c6e5130c6e5c38cfb181c17a2093eef5a3
Jeff Chang [Tue, 23 Apr 2019 02:10:45 +0000 (19:10 -0700)]
Merge "Adjust toast window parameters to support FLAG_SHOW_WHEN_LOCKED" into qt-dev
am:
77e2b7b4ca
Change-Id: I12371d35dc82745a458ba92a8a6a69e49e9dd882
Rob Carr [Tue, 23 Apr 2019 02:04:39 +0000 (19:04 -0700)]
Merge "DimLayer: More release fixes." into qt-dev
am:
0d168340d1
Change-Id: Iac648c69e352050d7aa84595b9a72c5defae8705
TreeHugger Robot [Tue, 23 Apr 2019 02:04:05 +0000 (02:04 +0000)]
Merge "Vulkan Doc: update descriptions for Vulkan feature flags" into qt-dev
Android Build Merger (Role) [Tue, 23 Apr 2019 01:53:26 +0000 (01:53 +0000)]
Merge "Merge "Update dark mode custom accent colors." into qt-dev am:
79760f0745" into qt-dev-plus-aosp
Amin Shaikh [Tue, 23 Apr 2019 01:52:46 +0000 (18:52 -0700)]
Merge "Update dark mode custom accent colors." into qt-dev
am:
79760f0745
Change-Id: I8190b01fee17bc67d38310c97149fa725b4d83aa
sqian [Tue, 23 Apr 2019 01:49:35 +0000 (18:49 -0700)]
Merge "Fix urn compare in EmergencyNumber" am:
1f55cbf416
am:
c85174ba3d
Change-Id: Ic7c6db0747d594f54212c81da008cca20b471b71
Priyank Singh [Tue, 23 Apr 2019 01:42:53 +0000 (18:42 -0700)]
Merge "Handle NPE when the notification shade is opened via click on button." into qt-dev
am:
62ad8b9ccc
Change-Id: I6d985834d3da90e91c54f144aaa8108fffce9c38
sqian [Tue, 23 Apr 2019 01:39:09 +0000 (18:39 -0700)]
Merge "Fix urn compare in EmergencyNumber"
am:
1f55cbf416
Change-Id: I722e0b9093a569aa609ed9b239dc517442e74a2f
Pengquan Meng [Tue, 23 Apr 2019 01:37:06 +0000 (18:37 -0700)]
Add carrier display name related CarrierConfig
am:
057b94f43b
Change-Id: Ifcf272fa5f0a5c56c58d6124883296d171bc9266
Sunny Goyal [Tue, 23 Apr 2019 01:34:28 +0000 (18:34 -0700)]
Merge "Adding null check when unregistering slice relay handler" into qt-dev
am:
29fe1106dd
Change-Id: Ic406c2e0b8e07e1812713e1b4e5b7b5a7b7ac17f
Treehugger Robot [Tue, 23 Apr 2019 01:29:25 +0000 (01:29 +0000)]
Merge "Fix urn compare in EmergencyNumber"
Sara Kato [Tue, 23 Apr 2019 01:28:23 +0000 (01:28 +0000)]
Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev
Hui Yu [Tue, 23 Apr 2019 01:27:47 +0000 (18:27 -0700)]
Merge "No service timeout when debbuger is attached" into qt-dev
am:
095ab6c3c7
Change-Id: Ic54c3c80063f670238c00a028d5aac55f142a4ec
Jeff Chang [Tue, 23 Apr 2019 01:25:48 +0000 (01:25 +0000)]
Merge "Adjust toast window parameters to support FLAG_SHOW_WHEN_LOCKED" into qt-dev
Matt Pietal [Tue, 23 Apr 2019 01:19:08 +0000 (18:19 -0700)]
Merge "Sharesheet - Dark theme tweaks" into qt-dev
am:
ef25fb621b
Change-Id: Iacefefd32d21cace3e739d4f8cc4d441cbae1cad
Rob Carr [Tue, 23 Apr 2019 01:15:20 +0000 (01:15 +0000)]
Merge "DimLayer: More release fixes." into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 01:13:59 +0000 (01:13 +0000)]
Merge "Update dark mode custom accent colors." into qt-dev
Chalard Jean [Tue, 23 Apr 2019 01:12:27 +0000 (18:12 -0700)]
Merge "Fix an argument to the legacy broadcast" am:
b00786fe21
am:
b39b829601
Change-Id: I0fc408d546ae9d72b7dd9415e502252b484d4329
Chalard Jean [Tue, 23 Apr 2019 01:00:01 +0000 (18:00 -0700)]
Merge "Fix an argument to the legacy broadcast"
am:
b00786fe21
Change-Id: I76149167598a862a2cc519fbf0b08df0887b27f0
Brad Stenning [Tue, 23 Apr 2019 00:49:03 +0000 (17:49 -0700)]
Merge "Fix NPE for devices that don't use a lock icon on the bouncer." into qt-dev
am:
55bf4fd6b6
Change-Id: If39b55c2c62760ad8db0ba37cbfaefc94694a6a8
TreeHugger Robot [Tue, 23 Apr 2019 00:44:47 +0000 (00:44 +0000)]
Merge "Handle NPE when the notification shade is opened via click on button." into qt-dev
Chalard Jean [Tue, 23 Apr 2019 00:38:10 +0000 (00:38 +0000)]
Merge "Fix an argument to the legacy broadcast"
Colin Cross [Tue, 23 Apr 2019 00:29:55 +0000 (17:29 -0700)]
[automerger skipped] Merge "Remove framework.aidl rules" into qt-dev
am:
696a644fab -s ours
am skip reason: change_id I4e8ee725e660e52aa56c2a10b626dff517669869 with SHA1
b9cb74b048 is in history
Change-Id: Ibf11932dff9f955902ff7ff64f902d9a44b7c22b
Colin Cross [Tue, 23 Apr 2019 00:17:49 +0000 (17:17 -0700)]
[automerger skipped] Remove framework.aidl rules
am:
b9cb74b048 -s ours
am skip reason: change_id I4e8ee725e660e52aa56c2a10b626dff517669869 with SHA1
196fa2947e is in history
Change-Id: I5669d9c865041295c5f6134dd75d8d945cc056ab
Pengquan Meng [Thu, 18 Apr 2019 02:36:58 +0000 (19:36 -0700)]
Add carrier display name related CarrierConfig
Bug:
122921456
Test: build
Change-Id: I79836b2912be5223a2269e660bfaadf4aa72b930
TreeHugger Robot [Tue, 23 Apr 2019 00:04:28 +0000 (00:04 +0000)]
Merge "Adding null check when unregistering slice relay handler" into qt-dev
TreeHugger Robot [Mon, 22 Apr 2019 23:58:26 +0000 (23:58 +0000)]
Merge "No service timeout when debbuger is attached" into qt-dev
TreeHugger Robot [Mon, 22 Apr 2019 23:56:27 +0000 (23:56 +0000)]
Merge "Sharesheet - Dark theme tweaks" into qt-dev
Blake Kragten [Tue, 16 Apr 2019 17:23:11 +0000 (10:23 -0700)]
Update Rail Data Collection Frequency
Fixed the frequency of the rail updates by updating the rails when
either the wifi or radio activity info is updated.
Test: Compiled onto phone, ran wifi and modem test cases and collected
bug report. Viewed a more accurate frequency of rail energy data.
Bug:
130174319
Change-Id: I4d79e58dfcc90e1c30253f524c85f26a8299f8d6
Jean-Michel Trivi [Mon, 22 Apr 2019 19:21:50 +0000 (12:21 -0700)]
AudioService: manage hearing aid volume for calls
Add a mechanism to support audio devices that behave like "absolute
volume" in AVRCP, but that support multiple use cases based on
the audio mode.
Treat hearing aid as such a device:
any change in audio mode will cause the volume of the corresponding
dominent use case to be applied.
Fix a typo in SCO client death that caused a class cast issue.
Bug:
131091438
Bug:
129163231
Test: set hearing aid volume to X for media, take phone call and set volume to Y,
end call, verify volume is X for media.
Change-Id: Id778f69b98825c83b7137917bd81e973298ab8bb
TreeHugger Robot [Mon, 22 Apr 2019 23:30:57 +0000 (23:30 +0000)]
Merge "Fix NPE for devices that don't use a lock icon on the bouncer." into qt-dev
Colin Cross [Mon, 22 Apr 2019 23:26:55 +0000 (23:26 +0000)]
Merge "Remove framework.aidl rules" into qt-dev
Felipe Leme [Mon, 22 Apr 2019 23:24:14 +0000 (16:24 -0700)]
Merge "Fixed content capture whitelist for specific activities." into qt-dev
am:
845d5ee587
Change-Id: I7b4817d097067667e518ad8e58bd2ed5f17c2b8d
TreeHugger Robot [Mon, 22 Apr 2019 22:34:09 +0000 (22:34 +0000)]
Merge "Fixed content capture whitelist for specific activities." into qt-dev
Fan Zhang [Mon, 22 Apr 2019 22:22:20 +0000 (15:22 -0700)]
Merge "Add logging enums for 3 new SIM related pages." into qt-dev
am:
7feb1a1f7d
Change-Id: I620189316adfff96ba305427d30e0eee02e15a6f
Howard Ro [Mon, 22 Apr 2019 22:11:06 +0000 (15:11 -0700)]
Merge "Add apex packages to uid_mapping" into qt-dev
am:
330a3d89fa
Change-Id: I7fe7037887e22cde409ef8a2177e5974fcfe7633
Robert Snoeberger [Mon, 22 Apr 2019 21:50:51 +0000 (14:50 -0700)]
Merge "Add doc for system health guidelines for AOD clock faces." into qt-dev
am:
c7c2a50e7d
Change-Id: I6cc454c8739bb4393457c4ce4a3a0651899af4d4
TreeHugger Robot [Mon, 22 Apr 2019 21:37:29 +0000 (21:37 +0000)]
Merge "Add logging enums for 3 new SIM related pages." into qt-dev
TreeHugger Robot [Mon, 22 Apr 2019 21:37:08 +0000 (21:37 +0000)]
Merge "Add apex packages to uid_mapping" into qt-dev
Chenbo Feng [Mon, 22 Apr 2019 21:33:35 +0000 (14:33 -0700)]
[automerger skipped] Merge "Add smoke test for jni library" into qt-dev
am:
47159d969f -s ours
am skip reason: change_id Id24e7f0558b5643e4ad7393e85f1f0a2bd875615 with SHA1
5f8a630da7 is in history
Change-Id: Ib3f66d33a54be4216c098e2cde2023ece3fbf41e
Beverly [Mon, 22 Apr 2019 21:27:23 +0000 (14:27 -0700)]
Merge "Set min width of checkbox to 48dp" into qt-dev
am:
f49ca51851
Change-Id: I03c6c1280d956594913ecbcfe787ff6b838cccd2
Chris Tate [Mon, 22 Apr 2019 21:18:15 +0000 (14:18 -0700)]
Merge "Remove spurious Slog.wtf()" into qt-dev
am:
ef4c181a05
Change-Id: I9922562a664747ee6e16c10e045ccc16443cf6cf
Mathieu Chartier [Mon, 22 Apr 2019 21:10:59 +0000 (14:10 -0700)]
[automerger skipped] Merge "Disable iorap test mapping" am:
46b3d6d05d
am:
27ee83dca3 -s ours
am skip reason: change_id I17befa52ebad92413122253f692168cf93cbab6e with SHA1
6565a34d7f is in history
Change-Id: Id9ed8d34572fc3614337df49cfaaad8037351223
Mathieu Chartier [Mon, 22 Apr 2019 21:01:38 +0000 (14:01 -0700)]
Merge "Disable iorap test mapping"
am:
46b3d6d05d
Change-Id: Ic644f166fee8f74818e03b8ec72cbae1756795bf
Android Build Merger (Role) [Mon, 22 Apr 2019 20:48:42 +0000 (20:48 +0000)]
Merge "Merge "add media.swcodec to native watchdog" into qt-dev am:
a37cd55e10" into qt-dev-plus-aosp
OSDN Git Service
