Commit Graph

4775 Commits

Author SHA1 Message Date
Di Lu
0620c30651 Merge "Add test case for user quota management in IpSecService" am: cf1a4614e1 am: c9c65317e8
am: 0ec853390a

Change-Id: I84e81e261c93d2199e4932431ee57b75496ea2d5
2017-11-15 20:39:53 +00:00
Di Lu
0ec853390a Merge "Add test case for user quota management in IpSecService" am: cf1a4614e1
am: c9c65317e8

Change-Id: I1022151e9317194ac45501a59f68c9bba89e16df
2017-11-15 20:31:37 +00:00
Di Lu
c9c65317e8 Merge "Add test case for user quota management in IpSecService"
am: cf1a4614e1

Change-Id: Ib1887b2395f0b1391711a9df9bebe224b6be1643
2017-11-15 20:23:14 +00:00
Di Lu
cf1a4614e1 Merge "Add test case for user quota management in IpSecService" 2017-11-15 20:12:38 +00:00
TreeHugger Robot
b0f49a6021 Merge "Create colored shadows demo" 2017-11-15 20:11:31 +00:00
Xin Li
220871a697 Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-11-14 12:31:11 -08:00
Hugo Benichi
9769872de6 Merge "IP connectivity metrics: NetworkEvents have transports" am: f8fdb06c27 am: f3ada43f6e
am: 1b2e6c11e7

Change-Id: If452f742e50344e730f63b7329788b19d13280ec
2017-11-14 12:03:25 +00:00
Hugo Benichi
d80b572c1a Merge "Add L2~L4 information to packet wakeup logs and metrics" am: 6ee20ca7d3 am: ab15f7fc64
am: 4c0b7e52e4

Change-Id: Ia0b300662d4758f31ca583c9cf05f9186b8331aa
2017-11-14 11:55:45 +00:00
Hugo Benichi
1b2e6c11e7 Merge "IP connectivity metrics: NetworkEvents have transports" am: f8fdb06c27
am: f3ada43f6e

Change-Id: I8cd50ea805fe3e533c0fc21b220827155cb0d23b
2017-11-14 01:46:23 +00:00
Hugo Benichi
4c0b7e52e4 Merge "Add L2~L4 information to packet wakeup logs and metrics" am: 6ee20ca7d3
am: ab15f7fc64

Change-Id: I9dba29b10c824d382b08b16313e49cc8c775f7eb
2017-11-14 01:40:06 +00:00
John Reck
3c0369bf02 Create colored shadows demo
Test: HwAccelerationTest demo
Bug: 68211332
Change-Id: Ia53a6ac2854570d0495b355bbebee1dcec2f47ba
2017-11-13 16:53:48 -08:00
ludi
aa5c1dc6d3 Add test case for user quota management in IpSecService
Test: runtest frameworks-net
Bug: 65688605
Change-Id: I3210c4920d0ac1d09fecb56c25e392e2bcba641f
2017-11-13 14:14:11 -08:00
Hugo Benichi
97bfd276fb IP connectivity metrics: NetworkEvents have transports
Also removes netId field from inside NetworkEvent and stop populating
the network_id field of the NetworkEvent field, deprecating it.

Bug: 34901696
Test: runtest frameworks-net,
      manually looking at $ adb shell dumpsys connmetrics

Change-Id: I2c36860f976898883714f72f4d18e06da250c6a6
2017-11-13 14:15:51 +09:00
Hugo Benichi
d921bce5a6 Add L2~L4 information to packet wakeup logs and metrics
Example of $ adb shell dumpsys connmetrics list:
...
WakeupStats(wlan0, 21851s, total: 85, root: 0, system: 4, apps: 63, non-apps: 0, no uid: 18, l2 unicast/multicast/broadcast: 85/0/0, ethertype 0x800: 23, ethertype 0x86dd: 62, ipNxtHdr 6: 74, ipNxtHdr 17: 1, ipproto 58: 10)
...
WakeupEvent(06:55:54.094, wlan0, -1, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=216.58.200.110, dstIp=100.112.108.29, srcPort=443, dstPort=46878)
WakeupEvent(06:57:14.379, wlan0, -1, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=58, srcIp=ff02::1, dstIp=fe80::fa00:4:fd00:1)
WakeupEvent(06:57:52.786, wlan0, 1000, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=172.217.27.67, dstIp=100.112.108.29, srcPort=80, dstPort=49360)
WakeupEvent(06:58:02.919, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:809::200a, srcPort=443, dstPort=46197)
WakeupEvent(06:58:05.586, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:803::200a, srcPort=443, dstPort=46096)

Bug: 66869042
Test: runtest frameworks-net
      + manual testing by monitoring $ dumpsys connmetrics list
Change-Id: I03215c0c9fb7feda3e6ceb1b916f61f4ffb15344
2017-11-12 18:51:28 +09:00
Adam Lesinski
6385bbd860 Merge "AAPT2: Workaround for feature splits without namespacing" into oc-mr1-dev
am: 751e69b38b

Change-Id: I8791a0cbfb32c25a0c73552c47509cce1d5f06e2
2017-11-10 10:13:26 +00:00
TreeHugger Robot
c8e3c7c816 Merge "AAPT2: Workaround for feature splits without namespacing" 2017-11-10 01:27:34 +00:00
Adam Lesinski
1210e8c81b AAPT2: Workaround for feature splits without namespacing
Android Instant Apps in its current iteration does not use namespaces,
but due to limitations on the Android resource runtime, needs to make
it look like it does.

This is due to a bug that treats any package ID that's not 0x01 or 0x7F
as a shared library. Shared libraries require unique package names.

As a workaround, and since Android Instant Apps can not have a feature
depend on another feature, we can alter the resource package name of a
feature split just before writing it out to disk. This avoids using a
unique package name while linking, thereby avoiding namespace issues.

Bug: 68820737
Test: manual
Merged-In: Ic553ed42656436bbb949393d0248ee7bb9d37860
Change-Id: Ic553ed42656436bbb949393d0248ee7bb9d37860
2017-11-09 23:00:56 +00:00
Adam Lesinski
490595a5fc AAPT2: Workaround for feature splits without namespacing
Android Instant Apps in its current iteration does not use namespaces,
but due to limitations on the Android resource runtime, needs to make
it look like it does.

This is due to a bug that treats any package ID that's not 0x01 or 0x7F
as a shared library. Shared libraries require unique package names.

As a workaround, and since Android Instant Apps can not have a feature
depend on another feature, we can alter the resource package name of a
feature split just before writing it out to disk. This avoids using a
unique package name while linking, thereby avoiding namespace issues.

Bug: 68820737
Test: manual
Change-Id: Ic553ed42656436bbb949393d0248ee7bb9d37860
2017-11-09 14:57:49 -08:00
Hugo Benichi
9c114081a8 Merge "MacAddress follow-up: define the core of the class" am: cd35c65b5b am: d39a50350a
am: f7c0f2e6bf

Change-Id: Iaa55c54a46844428da0ddd9d0a5ee899c0aa1dfb
2017-11-09 12:55:56 +00:00
Hugo Benichi
f7c0f2e6bf Merge "MacAddress follow-up: define the core of the class" am: cd35c65b5b
am: d39a50350a

Change-Id: I1063cbb5a468818f68ee5406e52b6cd74c85c4bf
2017-11-09 12:43:52 +00:00
Hugo Benichi
cd35c65b5b Merge "MacAddress follow-up: define the core of the class" 2017-11-09 12:22:17 +00:00
Hugo Benichi
ac52e40049 MacAddress follow-up: define the core of the class
Test: new unit test parts of $ runtest frameworks-net
Change-Id: I08c57d2d656802f7bdd7a93fde711a7e77247583
2017-11-09 16:36:45 +09:00
Benedict Wong
cdd1d0ae7f Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5 am: 6491b03410
am: d840f4d667

Change-Id: Ia0e1538feea2ddb0982875c925705c3648e50c8a
2017-11-08 18:27:06 +00:00
Benedict Wong
d840f4d667 Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5
am: 6491b03410

Change-Id: I5e61a9c28dac49f2dca554ce2fdf755ab7be0dab
2017-11-08 18:12:25 +00:00
Dake Gu
dd74774c86 Merge "convert Uibench test to aapt2" 2017-11-08 17:48:27 +00:00
Benedict Wong
3db35dfcd5 Merge "Update documentation for AES-GCM-ESP keymat length" 2017-11-08 17:47:40 +00:00
Hugo Benichi
ffdbb572e5 Merge "Define MacAddress class" am: 925349ac8f am: 37caaaa705
am: 76c2cd2a6a

Change-Id: I0e09e64bb2a6306c0422443038351fabf10e2d6e
2017-11-08 06:57:00 +00:00
Hugo Benichi
76c2cd2a6a Merge "Define MacAddress class" am: 925349ac8f
am: 37caaaa705

Change-Id: I377de35ab9ce9d8bf44bd90295a2a41fbea06d7a
2017-11-08 06:46:49 +00:00
Dake Gu
bffef1f024 convert Uibench test to aapt2
Bug: NA
Test: build
Change-Id: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
2017-11-07 19:11:22 -08:00
Hugo Benichi
59c8e423a8 Define MacAddress class
Test: new unit tests part of $ runtest frameworks-net
Change-Id: I5a6a868ff86e9bffdc551d4e2bb486b585525c30
2017-11-08 11:09:49 +09:00
Benedict Wong
4ebc2c5968 Update documentation for AES-GCM-ESP keymat length
Added notes that keymat length must include 32 bits of salt.

Bug: 68672051
Test: Frameworks-net unit tests & IpSecManager CTS tests run
Change-Id: I0ae0c5be8a45b2374783b3bd1fa8bf930f15e687
2017-11-07 17:39:35 -08:00
Hugo Benichi
aab9077049 Merge "Refactor ApfFilter creation" am: 5e619dce66 am: 6c25e1e24d
am: 55939f351b

Change-Id: Iff87d6efa0bb55c84e852a84489a0218acd21100
2017-11-07 23:22:39 +00:00
Hugo Benichi
55939f351b Merge "Refactor ApfFilter creation" am: 5e619dce66
am: 6c25e1e24d

Change-Id: I3f406b08287092d4e2bc23f158693cea6f6646e4
2017-11-07 22:53:09 +00:00
TreeHugger Robot
4325b9fc53 Merge "Add wide gamut trivial animation to UIBench" 2017-11-07 18:11:14 +00:00
Hugo Benichi
7216636a62 Refactor ApfFilter creation
This patch introduces a helper ApfConfiguration class for passing filter
parameters to the constructor of ApfFilter. The benefits are:
  - less parameter boilerplate across IpManager, ApfFilter, ApfTest
  - easier to add more parameters in the future (useful for hardware
    counters options and further gservices configurable options)

There is no functional changes otherwise.

Test: runtest frameworks-net
Change-Id: I47231c21df80bc36b6d4e15369748017b50b8da1
2017-11-07 21:42:39 +09:00
John Reck
fe38ceab32 Add wide gamut trivial animation to UIBench
Test: Opened activity, verified SF in wide gamut
Bug: 67382861
Change-Id: I0754580fcbd53600d677757871d26548f273c46b
2017-11-06 15:58:25 -08:00
Hugo Benichi
3bac2487a2 Merge "DefaultNetworkEvent metrics: rehaul" am: 69c9402a29 am: d025358166
am: 384d458c8f

Change-Id: Ia5c19bfbdf9eea553f4517f312295c14c2f02046
2017-11-06 07:41:53 +00:00
Hugo Benichi
384d458c8f Merge "DefaultNetworkEvent metrics: rehaul" am: 69c9402a29
am: d025358166

Change-Id: If6bf966ba547a2ce50e17340e0374dd9b75b80d9
2017-11-06 07:31:39 +00:00
Hugo Benichi
69c9402a29 Merge "DefaultNetworkEvent metrics: rehaul" 2017-11-06 07:09:49 +00:00
Hugo Benichi
380a063858 DefaultNetworkEvent metrics: rehaul
This patch changes instrumentation of default networks and default
network events:
- stop logging events for default network transitions,
  but instead consistently log one event per continuous segment
  when one given network was the default, including logging an
  event for when there is no default network.
- keep a separate rolling buffer of DefaultNetworkEvent for
  dumpsys and bug reports.

These changes allow to simplify post aggregation of default network
event metrics by removing any need to do time series processing.
Instead, metrics and counters can be implemented withouth any ambiguity
by following the recipe:

% of x = sum(duration | x = true) / sum (all durations)

where x can be various conditions such as:
- the default network was validated
- the default network was WiFi
- the default network was IPv6
- there was no default network
- ...

Most importantly, this new logging scheme allows to measure much more
reliably:
- the % of the time that a device had Internet, in the sense that the
default network was validated.
- the time transitions between default networks, keyed by previous and
new transports/link layer, which allows to derive wakelock durations
and wakelock power costs from default network switches.

This patch also simplifies the dumpsys interface of the connmetrics
service and reduces the commands to three:
- "flush" for metrics upload.
- "proto" for printing buffered event in text proto format.
- "list" for listing all events and statistics.

Bug: 34901696
Bug: 65700460
Test: runtest frameworks-net
Change-Id: I0521f1681a60cca07ac3bfd5741d64ce44de4cdd
2017-11-06 09:04:02 +09:00
Jeff Sharkey
e4595d58b6 Merge "Define NOT_ROAMING network capability." am: 8f380ab29c am: 3fe1ae29cd
am: 69b31d4eb0

Change-Id: I04220ff55fc87dbf8d417a30f15a06a877b412d4
2017-11-03 23:18:45 +00:00
Jeff Sharkey
69b31d4eb0 Merge "Define NOT_ROAMING network capability." am: 8f380ab29c
am: 3fe1ae29cd

Change-Id: Ib511f7af82c80fd4e95f4da9de1fdce200deb987
2017-11-03 23:07:03 +00:00
Jeff Sharkey
72f9c42b9e Define NOT_ROAMING network capability.
The "roaming" state of a network really belongs on NetworkCapabilities
instead of being published through NetworkInfo.isRoaming().  One major
reason is to support developers creating NetworkRequests for a
non-roaming network.

Watch for any capability changes that network statistics are
interested in (either metered or roaming) and notify it to perform
an update pass; fixes bug where we previously only triggered on
roaming changes.

Fix bug in VPNs where metered/roaming capabilities of underlying
networks weren't being propagated; this was probably preventing
some jobs from running over unmetered networks, and causing other
jobs to run over roaming networks!  Also passes along link bandwidth
information from underlying networks, and propegates any changes
to underlying networks.

Fix race condition by reading prevNc inside lock.  Utility methods
correctly calculate min/max link bandwidth values.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.,com.android.server.ConnectivityServiceTest
Bug: 68397798, 16207332
Change-Id: I3e1a6544c902bf3a79356b72d3616af1fd2b0f49
2017-11-01 19:05:42 -06:00
David Chen
c28b2bbb00 Adds logging to push settings changed to statsd.
Introduces atom and logging for every time a setting is updated.
We also include the previous value to validate our logging
data quality. We need to add the INTERACT_ACROSS_USERS_FULL
permission to prevent a security exception during testing; since the
logging occurs from system_server uid, this security exception should
not occur normally.

Test: Manual by inspecting the statsd output while toggling settings.
Change-Id: I92ca2afa596e54e61936e22611d749bb60ccb364
2017-10-31 18:30:57 -07:00
Guang Zhu
9068ccc9d1 limit the verbosity of app crash failure message am: 3bd7187267
am: 88956a7186

Change-Id: I67197523ef57fe140d4cb7fb68343e66727d3d40
2017-10-28 01:02:27 +00:00
Guang Zhu
88956a7186 limit the verbosity of app crash failure message
am: 3bd7187267

Change-Id: I193f8b7964c4757f5ac873758ad433fe94d3885a
2017-10-28 00:52:18 +00:00
Guang Zhu
3bd7187267 limit the verbosity of app crash failure message
- reporting full dropbox content for all detected crashes leads
  to overly verbose test failure message

Bug: 67002148
Test: http://sponge/4ff3ccb5-c455-45e2-9614-d3527e1f711d
Change-Id: Ic2cd2ba4ce2af0954f186b196c18cc76c19f2007
2017-10-27 12:02:54 -07:00
Manoj Boopathi Raj
26b78bc9d1 Merge "Fixed NullPointerException in IpSecService-Netd binder layer" am: bf74a93eb2 am: a096e8d177
am: 45e455582e

Change-Id: I8c51bfa708622dfb47ae55438f08b98f04c1d6c6
2017-10-27 18:21:48 +00:00
Manoj Boopathi Raj
45e455582e Merge "Fixed NullPointerException in IpSecService-Netd binder layer" am: bf74a93eb2
am: a096e8d177

Change-Id: I23ea94140ac3e34fc92fdc6a2c0d694396489e03
2017-10-27 18:06:09 +00:00
Manoj Boopathi Raj
bf74a93eb2 Merge "Fixed NullPointerException in IpSecService-Netd binder layer" 2017-10-27 17:32:56 +00:00