Commit Graph

413396 Commits

Author SHA1 Message Date
Chalard Jean
ab680b37d7 Move the latest AIDL update to the bottom
am: 9d1465d0b5

Change-Id: I93d3f69d3467faf4ffbb2dddddad03a9cedae862
2019-04-09 05:34:16 -07:00
Chiachang Wang
574705c4d1 Merge "Move data stall definitions out from Setting" into qt-dev
am: 6839f419de

Change-Id: I0a2a1e5d3de14ea86556ca471e26064df3481412
2019-04-09 05:30:34 -07:00
Neil Fuller
5948b83b0b Merge "Switch to HexEncoding from ByteStringUtils" am: 70f7a0bf04
am: 0cb55a64c4

Change-Id: I901a3c8caa11aa3d71defa31d9cd6d0c4cc2ddcc
2019-04-09 05:16:08 -07:00
Chalard Jean
9d1465d0b5 Move the latest AIDL update to the bottom
Test: m
Bug: 128803828
Change-Id: I3818eb8abb5a410663a6da633d5516cef4ecad8e
(cherry picked from commit 45ff048d40)
2019-04-09 12:04:26 +00:00
Chiachang Wang
6839f419de Merge "Move data stall definitions out from Setting" into qt-dev 2019-04-09 11:52:54 +00:00
Alison Cichowlas
32c773265c Merge "Sharesheet: Rank the first N apps, then show the rest alphabetically." into qt-dev
am: 5a56c2d9cc

Change-Id: Ib6b55e4a697d5caec62aed9068164c9c895643bf
2019-04-09 04:29:18 -07:00
TreeHugger Robot
5a56c2d9cc Merge "Sharesheet: Rank the first N apps, then show the rest alphabetically." into qt-dev 2019-04-09 11:10:00 +00:00
Lorenzo Colitti
fa9b198032 [automerger skipped] Merge "Fix ConnectivityServiceTest fail." into qt-dev
am: 54c7a055de -s ours
am skip reason: change_id I7f185e731db91c30a9b0f14aefbdbb067942190e with SHA1 7d21507852 is in history

Change-Id: I6eddfc7bae967c76c63521b7fbcabd78a913bfd4
2019-04-09 03:44:42 -07:00
Po-Chien Hsueh
ad9b28027b Merge "DynamicSystem string review followup" into qt-dev
am: 1ed8d8109f

Change-Id: I58e694e7a9e6a696d6a9aeb4279a137cc793c489
2019-04-09 03:40:23 -07:00
Chalard Jean
1e252837c8 Merge "Add a mechanism to pass the L2Key and group hint to IpClient" into qt-dev
am: 7c0d309886

Change-Id: I41164d6ac1efba76dc871ef28281276da9a48acc
2019-04-09 03:34:05 -07:00
Lorenzo Colitti
54c7a055de Merge "Fix ConnectivityServiceTest fail." into qt-dev 2019-04-09 10:25:10 +00:00
TreeHugger Robot
1ed8d8109f Merge "DynamicSystem string review followup" into qt-dev 2019-04-09 10:22:19 +00:00
TreeHugger Robot
7c0d309886 Merge "Add a mechanism to pass the L2Key and group hint to IpClient" into qt-dev 2019-04-09 10:21:39 +00:00
Neil Fuller
0cb55a64c4 Merge "Switch to HexEncoding from ByteStringUtils"
am: 70f7a0bf04

Change-Id: I36db54949275402b7f25d8e2a1ea2ed6558a44d2
2019-04-09 03:11:50 -07:00
Neil Fuller
70f7a0bf04 Merge "Switch to HexEncoding from ByteStringUtils" 2019-04-09 09:50:59 +00:00
Charles Chen
8da909ff3b Merge "Fix NPE in ActivityRecord" into qt-dev
am: abb606c5bd

Change-Id: I9ed935316ba0427e4ee9372670f9c3b83c44c1c4
2019-04-09 02:40:32 -07:00
Lorenzo Colitti
c74356716d [automerger skipped] Merge "Fix flaky UdpEncapsulationSocket test" into qt-dev
am: 634dff01cb -s ours
am skip reason: change_id Idf040a67e53d9b9ec6e6c647ce24f8ada501d355 with SHA1 614ab3dd4e is in history

Change-Id: Ic9b6b8c2ca4aabd3ed18291a94992a2b67286064
2019-04-09 02:31:35 -07:00
TreeHugger Robot
abb606c5bd Merge "Fix NPE in ActivityRecord" into qt-dev 2019-04-09 09:16:02 +00:00
TreeHugger Robot
634dff01cb Merge "Fix flaky UdpEncapsulationSocket test" into qt-dev 2019-04-09 09:15:02 +00:00
Lorenzo Colitti
5db813ad69 [automerger skipped] Merge "Extend support for requestRouteToHostAddress for backward compatibility" into qt-dev
am: 8d994400b5 -s ours
am skip reason: change_id Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d with SHA1 2eea7ac272 is in history

Change-Id: I7cd14e336c2ab60e92c247e42d9acddf08316edf
2019-04-09 02:13:26 -07:00
Lorenzo Colitti
916159726d [automerger skipped] Merge "Don't leak captive portal broadcast receivers." into qt-dev
am: 15bff87527 -s ours
am skip reason: change_id I1db24fe05ada8b3a37a9a60aa568b6153bf51ad8 with SHA1 3a1c0ad3ee is in history

Change-Id: I5181077b53454a52cd49e01bfaca64ab37ecad7e
2019-04-09 01:58:29 -07:00
paulhu
1677869191 Fix ConnectivityServiceTest fail.
NetdService#getInstance() will get null object in
WrappedConnectivityService constructor. Then pass this null
INetd object to PermissionMonitor will case NPE in
PermissionMonitor#sendPackagePermissionsToNetd()

Bug: 128024100
Test: atest FrameworksNetTests
Change-Id: Ia1c80f9600a19c4aaf3f3c1b497b355d96c49c8e
Merged-In: I7f185e731db91c30a9b0f14aefbdbb067942190e
Merged-In: Ic77ef73841266da487401ffd657ef63562b6fc1e
(cherry picked from commit 7d21507852)
2019-04-09 08:57:08 +00:00
Lorenzo Colitti
40d84ed850 [automerger skipped] Disable InetDiagSocketTest in a better way.
am: b878dff849 -s ours
am skip reason: change_id I3d8cebec00dde7d0b61469f36887cd5afface043 with SHA1 2373c8a129 is in history

Change-Id: I33f5d21548fa4213d9cb9af7dc046f4fd42bcd8c
2019-04-09 01:52:54 -07:00
Lorenzo Colitti
43eb1e3009 [automerger skipped] Temporarily disable InetDiagSocketTest.
am: db54f46641 -s ours
am skip reason: change_id Ic580b9261e0d556ec10f92ddffd8f2766e25f424 with SHA1 fdc03bab0b is in history

Change-Id: I6da399d1fbc52f51eee1c51cd9ac26fbfccadd75
2019-04-09 01:49:40 -07:00
Lorenzo Colitti
8d994400b5 Merge "Extend support for requestRouteToHostAddress for backward compatibility" into qt-dev 2019-04-09 08:46:12 +00:00
Lorenzo Colitti
15bff87527 Merge "Don't leak captive portal broadcast receivers." into qt-dev 2019-04-09 08:39:22 +00:00
Chiachang Wang
0b98441205 Move data stall definitions out from Setting
From mainline perspective, we should use android flag api
instead of using Settings. Thus, move the definitions into
NetworkStack.

Bug:120013793
Test: atest NetworkStackTests SettingsBackupTest
Change-Id: I8e1fb5b47fff3bf624131ba1f5732daabd991e6d
2019-04-09 08:32:55 +00:00
Chalard Jean
d3c34d4c59 Add a mechanism to pass the L2Key and group hint to IpClient
Test: IpClientTest
Bug: 128803828
Change-Id: I399b20ce29a385a74971b7a7248a48cb4d66deb6
(cherry picked from commit 3cab290648)
2019-04-09 07:55:17 +00:00
Tarandeep Singh
87c02d1120 Merge "Fix InsetsSourceConsumer visibility" into qt-dev
am: 16f682cac6

Change-Id: Ie1237cb7560c271beae493e10967f280c74db649
2019-04-09 00:33:49 -07:00
Philip P. Moltmann
22b380fbe9 Merge changes from topic "AlwaysExpandLocationQ" into qt-dev
am: 0d5d43c713

Change-Id: Ic3d0608b803ae89a941b700308273d5016624fc8
2019-04-09 00:21:52 -07:00
Charles Chen
69362cde87 Fix NPE in ActivityRecord
This issue happened when we get null ActivityRecord.
Add a null check to prevent.

Also fix typo in ActivityStack.

Test: atest ActivityRecordTest
Fix: 129485624

Change-Id: I93b7dda1577b34f58fb5daed201404de4cfbad2e
2019-04-09 15:11:30 +08:00
Orion Hodson
7af4f77219 Merge "ActivityManager: process stop needs a process to stop" am: e467620566
am: 26f99236f3

Change-Id: I87c412ed5e7a26a2b36a1f7deaf4055471b708a5
2019-04-09 00:10:16 -07:00
Orion Hodson
26f99236f3 Merge "ActivityManager: process stop needs a process to stop"
am: e467620566

Change-Id: I9316853c0625b8a9f352f321208f0414184e2d43
2019-04-09 00:03:22 -07:00
Android Build Merger (Role)
2bab4ee107 Merge "Merge "Address leftover comments on aosp/894233" am: 8781aa3fbe am: 7e5e4734a8" into qt-dev-plus-aosp 2019-04-09 06:53:01 +00:00
Chalard Jean
7a76252cb4 Merge "Address leftover comments on aosp/894233" am: 8781aa3fbe
am: 7e5e4734a8

Change-Id: Ia08104f839ef37139a8761e2e625bb10c94c275f
2019-04-08 23:52:35 -07:00
Treehugger Robot
e467620566 Merge "ActivityManager: process stop needs a process to stop" 2019-04-09 06:50:43 +00:00
Android Build Merger (Role)
20f935ea87 Merge "Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev am: e945aa8ba1" into qt-dev-plus-aosp 2019-04-09 06:50:19 +00:00
Remi NGUYEN VAN
cdc45fc77c Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev
am: e945aa8ba1

Change-Id: If7d54cb1cf7f4f271c16cfbdc7629934800fddfc
2019-04-08 23:49:20 -07:00
Tej Singh
2f052818b1 [automerger skipped] Merge "Mainline logging to statsd: native static libs" am: fe3ebab0b3
am: a99fe6e2bf -s ours
am skip reason: change_id I78064f81fb4971eede8e97dacce5424e3eefd8bb with SHA1 810eeb3eed is in history

Change-Id: I8623ae868fca10320e84f55f12eac5fade99a53d
2019-04-08 23:47:04 -07:00
Anil Admal
e41992c16e Extend support for requestRouteToHostAddress for backward compatibility
The gnss@2.0 HAL and the framework GNSS Location Provider code is
updated in Q to not call the deprecated requestRouteToHost() method.
However, devices upgrading to Q which are still using gnss@1.1 or
earlier HAL must continued to be supported.

Fixes: 121222025
Test: Tested with gnss@1.1 HAL and first API level P.  The
      ConnectivityService log message "This method exists only for
      app backwards compatibility and must not be called by system
      services" is not present for devices with first API level P.

Change-Id: I10199776ea413dc256dbf0771e6cb3eedb334495
Merged-In: Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d
Merged-In: Ifa4ec98d5c942522dfd569664f169fa841d495ed
(cherry picked from commit 2eea7ac272)
2019-04-09 06:45:57 +00:00
Lorenzo Colitti
f0d45503bc Fix flaky UdpEncapsulationSocket test
This commit reduces the flakiness of the
testOpenAndCloseUdpEncapsulationSocket by retrying up to three times.
Unfortunately, testing port-selected socket creation is racy against
other applications. This helps to handle the same race condition as done
in IpSecService#bindToRandomPort

Bug: 128024100
Test: 200x runs of testOpenAndCloseUdpEncapsulationSocket
Change-Id: I7e036ce821019dbac6c50899bd0894e89d2fe82a
Merged-In: Idf040a67e53d9b9ec6e6c647ce24f8ada501d355
Merged-In: Iad9aea4b42cd8b31a5a2659bb9cb54dd1c64e8b7
(cherry picked from commit 614ab3dd4e)
2019-04-09 06:44:32 +00:00
Android Build Merger (Role)
c8659c8b9d Merge "Merge "Respect the hardware buffer usage flags set by the consumer." into qt-dev am: 66846fe825" into qt-dev-plus-aosp 2019-04-09 06:42:11 +00:00
Derek Sollenberger
9324dda3c6 Merge "Respect the hardware buffer usage flags set by the consumer." into qt-dev
am: 66846fe825

Change-Id: I5f26b7dd125d8aff52c2f1441f9908dbaff9481d
2019-04-08 23:41:47 -07:00
Lorenzo Colitti
b878dff849 Disable InetDiagSocketTest in a better way.
Test: treehugger
Bug: 124354087
Bug: 128024100
Change-Id: I3048625a2507e70402ce376e7208f58cdf5ddfba
Merged-In: I3d8cebec00dde7d0b61469f36887cd5afface043
Merged-In: I1fcb9ca292777fb017e9108a3e12cffba87e1985
(cherry picked from commit 2373c8a129)
2019-04-09 06:40:07 +00:00
Remi NGUYEN VAN
8beec384fd Merge "Expose captive portal urls for configuration" am: 7bb487a582
am: 2877796f70

Change-Id: I54050b28bbfb93e0b7e509dbe0e987a0b902b7d9
2019-04-08 23:40:05 -07:00
Chalard Jean
7e5e4734a8 Merge "Address leftover comments on aosp/894233"
am: 8781aa3fbe

Change-Id: I87f120778b2dc6743edc7fdd4e5390b68de05590
2019-04-08 23:38:53 -07:00
Lorenzo Colitti
db54f46641 Temporarily disable InetDiagSocketTest.
This test is too flaky to run in presubmits.

Bug: 124354087
Test: atest InetDiagSocketTest
Change-Id: I90bc52a6f5b92d634862e3464634dfdbd3cada6a
Merged-In: Ic580b9261e0d556ec10f92ddffd8f2766e25f424
Merged-In: Ide5ac3f5316c4671b17fb9486ac56fc5feaf7b08
(cherry picked from commit fdc03bab0b)
2019-04-09 06:38:08 +00:00
Tej Singh
a99fe6e2bf Merge "Mainline logging to statsd: native static libs"
am: fe3ebab0b3

Change-Id: I7c241f209b133ec5465a47e384528c16c4026744
2019-04-08 23:34:40 -07:00
Remi NGUYEN VAN
2877796f70 Merge "Expose captive portal urls for configuration"
am: 7bb487a582

Change-Id: If5970fdafa7c624855ef9d29921542e2fb6fdfa0
2019-04-08 23:29:46 -07:00
Po-Chien Hsueh
9a1627f521 DynamicSystem string review followup
Some changes to follow string review suggestions:
- Simplify some messages.
- Replace 'Reboot' with 'Restart'.
- Notification action button order: 'Restart' button on the right.

Bug: 129100345
Test: verified with test app
Change-Id: I1ee97b0adbf74add68d3561fc647dc4923ee7237
2019-04-09 14:26:38 +08:00