Commit Graph

1185 Commits

Author SHA1 Message Date
Glen Kuhne
8902f81589 Merge "Move ipconnectivity.proto to services-proto.jar" 2016-10-27 16:27:27 +00:00
Hugo Benichi
0ef948d76c Merge "ConnectivityServiceTest: mark flaky test as such" 2016-10-27 05:21:33 +00:00
Hugo Benichi
c8c1027762 ConnectivityServiceTest: mark flaky test as such
This patch extracts into its own independent test a test sub-block looking
for a race condition when not waiting on handlers to become idle:
there is no way to prevent the race from not happening when looking for
it this way. This makes the test flakky.

This new independent test is tagged with @FlakkyTest(tolerance = 3).

Test: ConnectivityServiceTest passes, with higher probability.
Bug: 31479480
Change-Id: Ic0e2ffbe669f2ea8cc62e8a0d4763703368db019
2016-10-27 09:38:54 +09:00
Glen Kuhne
0719940ce4 Move ipconnectivity.proto to services-proto.jar
Moved ipconnectivity.proto from services.core.jar to
framework-protos.jar.
Replaced 'mergeFrom' MessageNano base class calls, with 'parseFrom'
IpConnectivityLog calls.

This solves an issue where the services.jar would conflict with
duplicate nano proto base class definitions in other .jars
(wifi-service.jar).

Bug: 32261442
Test: Existing unit tests pass
Change-Id: I49100935fcae2e85e12eaa7f3462864f3a340b97
2016-10-26 10:18:46 -07:00
Christopher Wiley
34077850ba Merge "Add script to expedite running passing tests" am: 4d1c2922f0 am: 2bb707b1c1 am: c65ca7708a
am: a415d687b7

Change-Id: I7dd927246b912593f3138f6e274ed75d8d260e16
2016-10-25 23:18:58 +00:00
Christopher Wiley
c65ca7708a Merge "Add script to expedite running passing tests" am: 4d1c2922f0
am: 2bb707b1c1

Change-Id: I42f000895fcba0c12c5301578a791ce17668df3d
2016-10-25 23:10:49 +00:00
Christopher Wiley
2bb707b1c1 Merge "Add script to expedite running passing tests"
am: 4d1c2922f0

Change-Id: I1b85b8ffd3f6de26d3226f5b1e1475ad87e8def6
2016-10-25 23:06:51 +00:00
Christopher Wiley
012ab10642 Add script to expedite running passing tests
Developers can run this script from within a shell where they have
source'd build/envsetup.sh and lunched a target.  It builds, installs,
and runs whitelisted test packages.

Bug: None
Test: This script is useful for iterating rapidly on unittests.

Change-Id: I44c32a0f75da1be2c69a8b1a67c0080a68def738
2016-10-25 14:05:29 -07:00
Christopher Wiley
fbc27b1e9e Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am: 836ffa6e1c am: c29f2575f2 am: a7bb5ad809
am: 2ae41619ae

Change-Id: Iee7c8575ee22a494e2657e15e1aaae9b05a37045
2016-10-25 18:43:16 +00:00
Christopher Wiley
a7bb5ad809 Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am: 836ffa6e1c
am: c29f2575f2

Change-Id: Ica704d0a64dde80ae0a9f1cef0250bfbdafcd49a
2016-10-25 18:31:02 +00:00
Christopher Wiley
c29f2575f2 Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
am: 836ffa6e1c

Change-Id: I1dab386e3891c01a2917c32847d2aecdbfa10102
2016-10-25 18:23:02 +00:00
Treehugger Robot
836ffa6e1c Merge "Add unit tests for Tethering.isTetherProvisioningRequired" 2016-10-25 18:12:42 +00:00
Christopher Wiley
497c147b82 Add unit tests for Tethering.isTetherProvisioningRequired
Check that we tolerate various dependencies not being available.

Bug: 31946071
Test: These are tests

Change-Id: Ic0a9cd6f255ba9ff4c774dee640df1a0bdf8dc39
2016-10-24 17:07:05 -07:00
TreeHugger Robot
03db8e4b58 Merge changes I1a544a8d,Ie78d3fb0
* changes:
  IpConnectivityMetrics: rate limit ApfProgramEvents
  IpConnectivityMetrics reads buffer size in settings
2016-10-24 14:45:46 +00:00
Hugo Benichi
e1c173d224 IpConnectivityMetrics: rate limit ApfProgramEvents
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).

Test: new test in IpConnectivityMetricsTest
Bug: 1550402
Change-Id: I1a544a8d62e6b02f0ed0088ab76c4bad338d2f44
2016-10-24 21:54:37 +09:00
Hugo Benichi
05686dbb6b IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637
Change-Id: Ie78d3fb03cea7883585549dac4f2063f0a8d9f4b
2016-10-24 13:52:41 +09:00
Robert Sesek
02bf0b6dbc Merge "Create the WebViewZygote and implement WebViewZygoteInit." am: 8be2850546 am: f80fab010a
am: aa544e975e

Change-Id: I561fff0f56bdbfdeb6c92c11c3fce12cf3fe28be
2016-10-22 03:22:50 +00:00
Robert Sesek
aa544e975e Merge "Create the WebViewZygote and implement WebViewZygoteInit." am: 8be2850546
am: f80fab010a

Change-Id: I37d0d62662ee96a9eefe2dfa71670d8e4b724889
2016-10-22 03:17:15 +00:00
Robert Sesek
f80fab010a Merge "Create the WebViewZygote and implement WebViewZygoteInit."
am: 8be2850546

Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
2016-10-22 03:12:18 +00:00
Andrii Kulian
3c46e09267 Merge "Fix NPEs when display is added or removed" 2016-10-21 16:56:35 +00:00
Hugo Benichi
1ca2ee7837 Merge "IpConnectivity metrics: add version number" 2016-10-21 04:35:52 +00:00
Andrii Kulian
b94292e5fe Fix NPEs when display is added or removed
- In WindowContainer set parent of the child after it is actually
  added. This way if the child class depends on this in overridden
  methods it will be in correct state.
- Reconfigure display only if it is attached. Otherwise there is no
  corresponding DisplayContent record with configuration.

Change-Id: I20c51522d82f9d0ca98f098070585e6472a23e98
Test: Updated WindowContainerTests.
2016-10-20 19:02:12 -07:00
Calvin On
4a048f9964 Add option to skip and avoid captive portals.
am: 4bc78eba6f

Change-Id: Id38d5c03d06822f9b20abd65db9dd04c90110b63
2016-10-20 20:18:10 +00:00
Calvin On
4bc78eba6f Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
(cherry picked from commit be96da11cc)
2016-10-20 18:50:46 +00:00
Julia Reynolds
e2b77a55b3 Merge "Move autogrouping into framework." 2016-10-20 15:23:27 +00:00
TreeHugger Robot
b9df32d1ff Merge "Add option to skip and avoid captive portals." 2016-10-20 09:50:07 +00:00
Calvin On
be96da11cc Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
2016-10-20 00:51:39 -07:00
Julia Reynolds
8f488d3f2f Move autogrouping into framework.
Test: runtest systemui, and post and dismiss notifications, checking that they
are grouped (or not) appropriately.

Change-Id: I8f3ec497cebcb14a7853fac98b844a3fd4503141
2016-10-19 22:30:58 +00:00
Wale Ogunwale
cfca258639 Fixed monkey test failure
Avoid duplicate attempt to remove WindowToken from its parent
container when removeImmediately is called by first removing the
token from the display before calling super.removeImmediately
which only tries to remove the child from the parent container
if it is still attached to the parent.

Also, added test for the failure case the monkey test was
triggering.

Bug: 32239922
Test: WindowTokenTests.testChildRemoval passes
Change-Id: I4153669d18260d956c4b570944d2f48516d692ac
2016-10-19 09:53:25 -07:00
TreeHugger Robot
905e807ee2 Merge "Add an API for retrieving information about the current WebView package." 2016-10-17 18:06:48 +00:00
TreeHugger Robot
c12469bd90 Merge "Show notification for always-on app VPN" 2016-10-17 15:33:59 +00:00
Gustav Sennton
bf683e07c3 Add an API for retrieving information about the current WebView package.
Now that WebView can be loaded from one out of a set of packages we
provide an API for fetching information about this package.
Such API is especially useful for debugging crashes.

Bug: 30597460

Change-Id: I13dd746f7efcf2917b517053010b73ea35241325
2016-10-17 07:26:37 +00:00
Hugo Benichi
d680d4c856 IpConnectivity metrics: add version number
This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.

Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug: 32127906
Change-Id: I1439f012b7f9b4211d5d5429c274ad03d2ac9d6b
2016-10-17 16:24:19 +09:00
Julia Reynolds
3752e50766 Merge "Add support for snoozing notifications" 2016-10-14 12:38:17 +00:00
Andrii Kulian
e56e9b6507 Merge "Use ConfigurationContainer for holding configs in AM hierarchy" 2016-10-14 05:21:24 +00:00
Michal Karpinski
fd0d22750f Don't expose default strong auth timeout as constant am: 6dbf67fc48
am: bc755da55c

Change-Id: Idb118df5cf1a763645f4187bcddfa4bb9b8b42ee
2016-10-13 23:00:24 +00:00
Julia Reynolds
72f1cbb3b9 Add support for snoozing notifications
To a notification listener, snoozing will appear as a cancel
(with reason snoozed) followed by a post (when the snooze period
ends).

Apps can repost a snoozed notification, but the updates will not be shown
to the user until the snooze period ends.

Snoozing is canceled if the posting app or a notification listener
cancels the notification.

Any notification listener can snooze a notification. Technically apps
can snooze their own notifications also, though that's not public.

In this iteration snoozed notifications will be lost on device reboot.

Test: included. Also, various post, snooze, update, cancel tests with
a listener.

Bug: 30997603
Change-Id: I568a6448196f0992a17d20a4dac296321ec5092b
2016-10-13 16:18:11 -04:00
Felipe Leme
f4006d9b0b Implemented a PriorityDump helper.
dumpsys / dumpstate will soon dump services in buckets (CRITICAL, HIGH,
NORMAL) and services must check the --dump_priority argument to select
which sections to dump.

PriorityDump parses the args checking for that argument, making it
easier to implement bucket dumping.

BUG: 27429130

Test: com.android.server.utils.PriorityDumpTest passes

Change-Id: Ia5ee08a3dc5bd0fde80b8a5616e1311e1b3bf7ba
2016-10-13 09:33:00 -07:00
Andrii Kulian
1779e6108a Use ConfigurationContainer for holding configs in AM hierarchy
Extract configuration holding and handling into separate class
and use it both in hierarchy in AM.

Change-Id: I19ca20152f7473af2c4a7bbedeff69422b1454eb
Test: ConfigurationContainerTests
Test: Existing and manual tests still pass.
2016-10-12 21:58:25 -07:00
Wale Ogunwale
360a8bce73 Switch WindowState to get display content from its window token
WindowState no longer needs to track what display it is on now
that the window token can only be on one display.

Test: Existing tests pass.
Change-Id: Ia0530d73da0b1ecc17f596ec62c933637bd1c2c3
2016-10-12 15:49:13 +00:00
Wale Ogunwale
02319a6192 Associate WindowToken object with only one display at a time
WindowTokens were global objects that contained windows that could
be on multiple displays. This model does not work with the
WindowContainer hierarachy as children (window tokens) can not have
mulitple parents (displays).
We now:
- Track the mapping of binder tokens to window tokens per display
instead of globally . So, you can have a binder token map to
individual WindowToken objects per display.
- WMS.addWindowToken is used to create a WindowToken that clients
can then later add windows to. However, when addWindowToken is called
we don't know the display the client(s) would like to add window to.
So, we track binder tokens that we are allowed to add window for in
the RootWindowContainer and create a window token for the binder on
a specific display when we try to add a window.

Bug: 30060889
Test: Manual testing and existing tests pass.
Change-Id: I81a52a32b01c33ed32169d2da0506b688ea9bc8a
2016-10-12 13:29:33 +00:00
Michal Karpinski
5f9b85ff4c Merge "Extending DNS event reporting" 2016-10-12 11:33:33 +00:00
Michal Karpinski
6dbf67fc48 Don't expose default strong auth timeout as constant
The admin can instead use the value of 0 to reset to default.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

Bug: 31430135
Change-Id: I0d6b29ca4eca65d7ca72a8975a0c28c9050a946c
(cherry picked from commit 943aabd11c)
2016-10-12 09:34:12 +00:00
TreeHugger Robot
d227a66aad Merge "Don't expose default strong auth timeout as constant" 2016-10-11 18:34:08 +00:00
Tony Mak
9643fa4add Merge "Allow device owner to inflate managed profile" 2016-10-11 14:42:54 +00:00
Tony Mak
6dc428f677 Allow device owner to inflate managed profile
1. Modify DPM.isProvisioningAllowed to allow it to happen
2. Introduce hidden API createProfileForUserEvenWhenDisallowed for
   ManagedProvisioning app to create profile under DO.
   Apps with MANAGE_USERS permission can clear the
   DISALLOW_ADD_USER restriction anyway, so they do not gain extra power.

Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.CustomDeviceOwnerTest#testIsProvisioningAllowed

Bug: 31895999

Change-Id: I10dc3043653130ae717a1d3d8256c9e73231bb21
2016-10-11 12:46:32 +00:00
Michal Karpinski
943aabd11c Don't expose default strong auth timeout as constant
The admin can instead use the value of 0 to reset to default.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

Bug: 31430135
Change-Id: I0d6b29ca4eca65d7ca72a8975a0c28c9050a946c
2016-10-11 10:12:30 +01:00
Hugo Benichi
8acea76a2b Add fuzzing tests to ApfFilter RA processing
Test: added new unit tests
Change-Id: Ie352eb1514b762e032b9140d633abc06180d0ade
2016-10-11 10:04:42 +09:00
Michal Karpinski
14c9d2d0df Extending DNS event reporting
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.

Test: for now just the benchmarking, in the future unit and CTS

Bug: 29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
2016-10-10 16:49:07 +01:00
TreeHugger Robot
ba039066d8 Merge "Allow some packages to be excluded during during work profile creation." 2016-10-08 19:23:29 +00:00