Commit Graph

447555 Commits

Author SHA1 Message Date
Chiachang Wang
39d7170cf4 Merge "Move CaptivePortalDataTest to common test to support cts" am: fcdea07db4
Change-Id: If5a2f476285d3e276d6fdbb695514489de18cb50
2020-04-13 09:12:26 +00:00
Chiachang Wang
fcdea07db4 Merge "Move CaptivePortalDataTest to common test to support cts" 2020-04-13 08:56:31 +00:00
Chiachang Wang
f4ebfd4bde Move CaptivePortalDataTest to common test to support cts
Commit has to on top of aosp/1281921 to skip whole test in Q
device since CaptivePortalData class is introduced in R.

Result in Q will be:
[1/1] android.net.CaptivePortalDataTest#skippedClassForDevSdkMismatch: IGNORED

Bug: 152280218
Bug: 150640683
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalDataTest on
      both Q and R device
Change-Id: Iddd00e1c85abe767b1a41a1761d3266ba322dba6
2020-04-13 08:13:04 +00:00
Lorenzo Colitti
1b223b5f57 Merge "Set transport types to resolver" am: 964975c842
Change-Id: I26b6e523bbc6ccd6e57a1b30782b74c6c33a7fbb
2020-04-13 07:22:21 +00:00
Lorenzo Colitti
964975c842 Merge "Set transport types to resolver" 2020-04-13 07:03:20 +00:00
chenbruce
3d268e45fb Set transport types to resolver
For a given network, resolver doesn't know what transport types are.
Therefore, when a new network is created or transport types are changed
in a give network, transport types will be updated and sent by calling
setResolverConfiguration(). In the same time, if link properties or
transport types are null, setResolverConfiguration() won't be called.
The original behaviors of setResolverConfiguration() aren't changed.
Only increasing one new behavior that when a given network has transport
type change, calling setResolverConfiguration() directly and resolver
updates the transport types for that given network.

Bug: 143732914
Test: atest FrameworksNetTests
      atest FrameworksNetIntegrationTests
Merged-In: I03fc5c62dfd9a51a78a720860531df282fdecc20
Change-Id: I6527cde0e177ba08c886576131b35fc769c2bb53
2020-04-11 23:00:13 +08:00
Nikita Ioffe
8687792159 Merge "UserspaceRebootLogger: query sys.boot.reason.last" am: b332edd6a9
Change-Id: I15cdd5a71c0bcb35037213cac673734dfa04eddf
2020-04-11 11:29:10 +00:00
Nikita Ioffe
b332edd6a9 Merge "UserspaceRebootLogger: query sys.boot.reason.last" 2020-04-11 11:08:58 +00:00
Dan Willemsen
589adf61d3 Merge "Master is now S" am: f86f9eddd2
Change-Id: Ib2a25d33a71ce0bfc3bd14b702b7a2d80088b815
2020-04-11 01:30:32 +00:00
Dan Willemsen
f86f9eddd2 Merge "Master is now S" 2020-04-11 01:14:16 +00:00
Hall Liu
051340e548 Merge changes from topic "phonestatelistener-limit-rvc-dev" am: cc8b84c221
Change-Id: I23df0fed3c46b2aeb3bf561e82460ffc41a6928c
2020-04-11 00:56:02 +00:00
Hall Liu
c7781363ae [automerger skipped] Institute limit on PhoneStateListener am: 1002495afa -s ours
am skip reason: Change-Id I8486d86773a1e28b4018620c48003855dae75b9d with SHA-1 fa3034f2af is in history

Change-Id: Ib1fe051585d328564a5f4a80151d862582e1c845
2020-04-11 00:55:56 +00:00
Hall Liu
cc8b84c221 Merge changes from topic "phonestatelistener-limit-rvc-dev"
* changes:
  Add gating, logging for PhoneStateListener's limit
  Institute limit on PhoneStateListener
2020-04-11 00:36:13 +00:00
Treehugger Robot
5fc7c9d63a Merge "Need to check current user when triggering notification lights" am: 819d39bf3e
Change-Id: I68b1c195be82667bb41ffcb37aa09834c347457d
2020-04-10 22:58:33 +00:00
Treehugger Robot
819d39bf3e Merge "Need to check current user when triggering notification lights" 2020-04-10 22:30:28 +00:00
Nikita Ioffe
361274ed8f UserspaceRebootLogger: query sys.boot.reason.last
Also did a small refactoring in computeOutcome() method to make it work
for cases when boot reason has a sub-reason, e.g.:
reboot,mount_userdata_failed,no_userdata_in_fstab.

Test: adb shell svc reboot userspace
Bug: 148767783
Change-Id: I13474d8a5be9382f56fdc8f17cf201666492e60d
Merged-In: I13474d8a5be9382f56fdc8f17cf201666492e60d
(cherry picked from commit 7bc82dd543)
2020-04-10 23:19:54 +01:00
Treehugger Robot
2e25448fff Merge "AppLaunch: use iorapd's dumpsys command interface" am: f2f9b0667e
Change-Id: I91a0e7a343e96062dfc9b6d5966abb301841f395
2020-04-10 21:59:29 +00:00
Treehugger Robot
f2f9b0667e Merge "AppLaunch: use iorapd's dumpsys command interface" 2020-04-10 21:39:55 +00:00
Igor Murashkin
1f3b306330 AppLaunch: use iorapd's dumpsys command interface
Make the iorapd compilation more robust by introducing retries and
switching to direct iorapd dumpsys commands instead of indirect
commands.

Test: forrest runs
Test: am instrument (manual)
Bug: 152322429
Change-Id: I7f75f0df95a1a5272237295a75bed8c34f95f859
Merged-In: I7f75f0df95a1a5272237295a75bed8c34f95f859
2020-04-10 13:17:38 -07:00
Xin Li
f68e6a03f1 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master 2020-04-10 18:42:15 +00:00
Treehugger Robot
668661d94c Merge "Fix a theoretical NPE" am: c312053b39
Change-Id: Idf4cb0acbfb9bc8fef43d42be477778e8ec2fc09
2020-04-10 16:44:25 +00:00
Treehugger Robot
c312053b39 Merge "Fix a theoretical NPE" 2020-04-10 16:25:07 +00:00
Anton Hansson
b85c57cd47 Merge "Use sdk_version: none for platform stubs" am: ad2433ffcd
Change-Id: Ifb6098d9997f4f9cec945323b8f25af4ccbfa5a9
2020-04-10 14:17:31 +00:00
Chalard Jean
3854ed0c53 Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627
Change-Id: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
2020-04-10 23:08:00 +09:00
Anton Hansson
ad2433ffcd Merge "Use sdk_version: none for platform stubs" 2020-04-10 14:00:16 +00:00
Treehugger Robot
2260bc18bd Merge "Don't ask libc for PT feature w/o kernel support." am: 758f448fe3
Change-Id: Ife490fbcf1482fef1b31e16273f5e196f9e8f0bc
2020-04-10 10:10:34 +00:00
Treehugger Robot
758f448fe3 Merge "Don't ask libc for PT feature w/o kernel support." 2020-04-10 09:46:42 +00:00
Treehugger Robot
99142fc4c6 Merge "Disable stubs generation when generating module_lib .txt file" am: 95f4ad098a
Change-Id: I95840a13332b4a6bc946bbe34d7b29f2b8889d38
2020-04-10 07:58:23 +00:00
Treehugger Robot
95f4ad098a Merge "Disable stubs generation when generating module_lib .txt file" 2020-04-10 07:29:48 +00:00
Dan Willemsen
0985ac8982 Master is now S
Bug: 150754986
Test: treehugger
Change-Id: I44d1b5a0fea74e2bb9e332dcb8486fd30fbd2f07
Merged-In: I44d1b5a0fea74e2bb9e332dcb8486fd30fbd2f07
2020-04-10 05:18:32 +00:00
Xin Li
1aaf25f338 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master
Bug: 151763422
Change-Id: Ib0e04b2f16105fad6be0165974ad41d3f5b26882
2020-04-09 18:41:51 -07:00
Mitch Phillips
41cd04b822 Don't ask libc for PT feature w/o kernel support.
Check that the kernel supports the Tagged Pointers feature before asking
libc to disable/enable pointer tagging.

Bug: 153114333
Test: Build coral, note no messages from SetHeapTaggingLevel.
Test: atest CtsTaggingHostTestCases

Change-Id: Id5fbd731aa70f7b0a75525387479f6123628a012
Merged-In: Id5fbd731aa70f7b0a75525387479f6123628a012
2020-04-09 15:35:05 -07:00
Cody Kesting
245ef6bdf9 Merge "Fix typo in VpnManager Docs." am: 138575a48c
Change-Id: I8e32b11c6a4b4437ba2977742a013d78856b5386
2020-04-09 21:37:28 +00:00
Cody Kesting
138575a48c Merge "Fix typo in VpnManager Docs." 2020-04-09 21:12:23 +00:00
Eric Laurent
b8975ce9ae Merge "AudioService: fix audio mode not reset to MODE_NORMAL" am: 87685d3648 am: bcfd42d906
Change-Id: Ib4aacd394a0c1d137222b253e15fd85a781b0ebd
2020-04-09 19:18:06 +00:00
Eric Laurent
bcfd42d906 Merge "AudioService: fix audio mode not reset to MODE_NORMAL" am: 87685d3648
Change-Id: I545f4a8b8971fd10387bb28420c3940d67ef91ce
2020-04-09 19:05:25 +00:00
Nikita Ioffe
e054e6becd Merge "Introduce static @hide PowerManager.isRebootingUserspaceSupportedImpl()" am: d8f9951f21 am: a3fd43040b
Change-Id: I4d8a505fb215e45a318e8222f924aa29a6ab5dea
2020-04-09 18:52:24 +00:00
Eric Laurent
87685d3648 Merge "AudioService: fix audio mode not reset to MODE_NORMAL" 2020-04-09 18:52:02 +00:00
Nikita Ioffe
a3fd43040b Merge "Introduce static @hide PowerManager.isRebootingUserspaceSupportedImpl()" am: d8f9951f21
Change-Id: I35e5111b5db8be175c85032a90c82336ff9373be
2020-04-09 18:28:37 +00:00
Nikita Ioffe
d8f9951f21 Merge "Introduce static @hide PowerManager.isRebootingUserspaceSupportedImpl()" 2020-04-09 18:12:09 +00:00
Paul Duffin
4c5dc18da5 Disable stubs generation when generating module_lib .txt file
Avoids droidstubs doing unnecessary work to create stubs files that are
not actually used.

Bug: 146727827
Test: framework-sdkextensions-api-module_libs_api
Change-Id: Ic537fda99b564877709666025fb8df872144d827
2020-04-09 18:11:26 +01:00
Tyler Gunn
11a4a5e3e9 [automerger skipped] Merge "Telecom API doc cleanup." am: 45b77f9e8b -s ours am: a79fd0515b -s ours
am skip reason: Change-Id I3e55166e4d0d9e68449ac7c157959e8471c16354 with SHA-1 3e65d3e457 is in history

Change-Id: I96d9db13f27f53b6a6400c6a50b16173ac3858b1
2020-04-09 17:10:17 +00:00
Tyler Gunn
a79fd0515b [automerger skipped] Merge "Telecom API doc cleanup." am: 45b77f9e8b -s ours
am skip reason: Change-Id I3e55166e4d0d9e68449ac7c157959e8471c16354 with SHA-1 3e65d3e457 is in history

Change-Id: Ib6ea621262525c0dc8cefded6ab01b287eb9ece2
2020-04-09 16:58:12 +00:00
Nikita Ioffe
cca499411f Introduce static @hide PowerManager.isRebootingUserspaceSupportedImpl()
This method consolidates logic of testing whenever rebooting userspace
is supported in a place that can be used both from
PowerMager.isRebootingUserspaceSupported() API and from
PowerManagerService.reboot() implementation.

Consequently, this makes `adb shell svc power reboot userspace` also
benefit from that check, and fail userspace reboot on devices that don't
support it.

Also tweaked logic of ignoring RemoteException to take into account
userspace reboot.

Test: adb root
Test: adb shell setprop init.userspace_reboot.is_supported 0
Test: adb shell svc power reboot userspace & verified error message
Test: adb shell setprop init.userspace_reboot.is_supported 1
Test: adb shell svc power reboot userspace & verified no error message
Test: atest PowerManagerTest
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 152803929
Change-Id: I2d3a8e0ae1320c408a838c5c5fdf4cd977b167b3
Merged-In: I2d3a8e0ae1320c408a838c5c5fdf4cd977b167b3
(cherry picked from commit 57300d9057)
2020-04-09 17:56:25 +01:00
Tyler Gunn
45b77f9e8b Merge "Telecom API doc cleanup." 2020-04-09 16:40:50 +00:00
Tyler Gunn
5d4add658f Merge "Hide car barring with password API." am: be8256ea76 am: 724896dff5
Change-Id: Iaf35d8c1f48922cbe34a1365bcbe269530b0d070
2020-04-09 16:17:00 +00:00
Tyler Gunn
18f1df42d9 Merge "Fix Telecom ConnectionTest." am: 3722ba37e8 am: 6974530a07
Change-Id: I4c2ef670c505137f3e9d1c3a9b80b571412f5fbe
2020-04-09 16:16:42 +00:00
Tyler Gunn
724896dff5 Merge "Hide car barring with password API." am: be8256ea76
Change-Id: Ia31f2457cb17a0b092c1a4f622b74ed443895243
2020-04-09 16:03:09 +00:00
Tyler Gunn
6974530a07 Merge "Fix Telecom ConnectionTest." am: 3722ba37e8
Change-Id: I5471a86ced663e344bbeb17fd4c5f5eb02d8755a
2020-04-09 16:02:34 +00:00
Tyler Gunn
2544d21d8f Merge "Document that some Telecom broadcast and extra keys are dead-ends." am: 175ae029ee am: 9b43be9092
Change-Id: I40b6d18eead88cb51ef22b9ee18bcf5da89e236e
2020-04-09 15:57:37 +00:00