4000 Commits

Author SHA1 Message Date
Felipe Leme
efb2bf2681 Merge "Don't print sensitive data on AssistStructure.dump()" into oc-dev am: 7bd1d3e48b
am: 122b3ce4ff

Change-Id: Ia1f5481e0684e13a3e36e7dcf71fbd27a0a81c13
2017-05-14 04:00:14 +00:00
Felipe Leme
122b3ce4ff Merge "Don't print sensitive data on AssistStructure.dump()" into oc-dev
am: 7bd1d3e48b

Change-Id: I8a186cf8fefe19d936acbbf19ae65a6e645eca4d
2017-05-14 03:51:16 +00:00
Felipe Leme
bc561eb06e Don't print sensitive data on AssistStructure.dump()
Test: manual verification

Bug: 38205945
Change-Id: Ic184ee6da313a2c0f8e0dd11979f6985d8023140
2017-05-13 18:20:51 -07:00
Tomasz Wasilczyk
9df2d39c73 Merge "Implement handling hardware failures of ITuner." 2017-05-13 02:28:32 +00:00
Tomasz Wasilczyk
f13b8419b8 Implement handling hardware failures of ITuner.
Test: instrumentation tests for other features pass, no tests added
Bug: b/36863239
Change-Id: Iaab9ac06bacc3dcdfde100427653ef1c429d13c6
2017-05-12 15:47:20 -07:00
Chris Wren
e96b36922f Merge changes from topic 'b/36021111' into oc-dev am: 69ab8e1d56
am: 68c7ccc94d

Change-Id: Iaa6782cb3354c7ac0219ea18b254577ecf0d9733
2017-05-12 08:44:46 +00:00
Chris Wren
68c7ccc94d Merge changes from topic 'b/36021111' into oc-dev
am: 69ab8e1d56

Change-Id: I4bf9b7425c86a8725e9d7c055ab4c4f389fe3a2b
2017-05-12 05:57:40 +00:00
Chris Wren
629c20c999 extend TestableSettingsProvider to multiuser
Bug: 36021111
Test: runtest -x frameworks/base/tests/testables

Change-Id: I13dc2b33a39a01954034fa3d69ae9645d23c3304
2017-05-11 17:17:15 -04:00
TreeHugger Robot
717f0e81c5 Merge "Build TestablesTests as part of top-level make" 2017-05-11 15:03:19 +00:00
Hugo Benichi
36af98c6ba Merge "Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0 am: 164854bde2" into oc-dev-plus-aosp
am: b09b85471c

Change-Id: I8b1b20d81efa2d86345b3b15600bed4cd40bb6e8
2017-05-11 14:52:23 +00:00
Hugo Benichi
3ec835303c Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0
am: 164854bde2

Change-Id: I1495249f1ced84438dbd5dd0ad6678e2ee4062cb
2017-05-11 14:28:23 +00:00
Hugo Benichi
cc9f695ba0 Merge changes Ie762ce75,I611fd791
am: 21a57f263f

Change-Id: Ibb291720f6c257a8ead2c039f584f4b3ecc69be5
2017-05-11 12:43:42 +00:00
Hugo Benichi
6e039a13cc ConnectivityManager: unit test for argument validation
Bug: 36701874, 37107940
Test: new test passes
Change-Id: Ie762ce758b3d94052b7438a67fc55bef4690cbbb
2017-05-11 14:15:20 +09:00
Hugo Benichi
cb88323dd2 ConnectivityManager: uses service error codes and exceptions
This patch introduces between ConnectivityManager and
ConnectivityService a mechanism for propagating back to clients
informative errors in the form of error codes and associated custom
runtime exceptions.

Without error code, the service can only throw a limited number of
different exceptions over Binder. Furthermore the throw site stack
traces are always loss. Although for individual instances of a throw,
the error message can be inspected, aggregations of stack traces from
app crashes sanitize error messages and only leaves the stack traces.

This makes debugging dificult for some service calls such as
requestNetwork that can have a variety of failure modes.

In this patch only one failure mode is codified. More can be added later
at a light cost by: 1) defining an error code, 2) defining an
associated exception, 3) mapping the code to the exception. This patch
can serves as a template for doing so.

Test: $ runtest frameworks-net,
      #testNetworkRequestMaximum() detects the new exception type.
Bug:  36556809, 36701874
Change-Id: I611fd7915575c9e418f7149fcdc8a879d2a3716d
2017-05-11 14:15:15 +09:00
Geoffrey Pitsch
51bdbad90a Build TestablesTests as part of top-level make
Necessary for postsubmit to work.

Test: make -j48 TestablesTests
Change-Id: Ifaeed98681621cf6a4a9d580cd3e0096ad98bb67
2017-05-10 13:18:27 -04:00
Tomasz Wasilczyk
b61b618aed Merge "Implement tune, cancel and getProgramInformation calls of ITuner." 2017-05-10 15:15:20 +00:00
Paul Duffin
fa6f8a76fb Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild

(cherry picked from commit 00229bc6cfd74c3221d02af6df07960a0f36af1a)

Change-Id: I7fea20f92a5a92885733bc6ecb83b7276a48fbc2
Merged-In: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749
2017-05-10 09:42:29 +01:00
Hugo Benichi
f37b271894 Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" into oc-dev 2017-05-10 08:19:57 +00:00
TreeHugger Robot
8926f1bb11 Merge "Refactor and improve logging." into oc-dev 2017-05-10 06:08:19 +00:00
Erik Kline
38356e9024 Refactor and improve logging.
Test: as follows
    - build
    - flashed
    - booted
    - "runtest frameworks-net" passed
    - "dumpsys connectivity" shows new log output
Bug: 32163131
Bug: 36504926

Merged-In: Ieb9a8e3f85f41d18056a7827997f12986ff13ca1
Merged-In: I744b048224e0b8bf6fe4da763833b755441c0911
Merged-In: Ic0c384547687572058d5ef62977163b2560bfc69
Merged-In: Iae91c43d1bfd9fbedc88821a0bd3a5168ad3b719
Merged-In: I52606d4375c9b16de03123995737a994ba58b4d7
Merged-In: I35110b6479280abc650e0ee257045d241923faf9
Change-Id: I14d6da18660223f7cace156cb6594ee18928a7b0
(cherry picked from commit 1fdc2e23b5d8136e06cafd7de896b49e5f929c7f)
2017-05-10 13:07:08 +09:00
Hugo Benichi
87ae16f017 Merge "Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am: ba666e0621 am: 76dc14ec88 am: 1697d48faf" into oc-dev-plus-aosp
am: f8dbdba5a2

Change-Id: Ie09f2b4e04749e61923781f4b13e796054108fad
2017-05-10 02:06:06 +00:00
Hugo Benichi
32a2d02a65 Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am: ba666e0621 am: 76dc14ec88
am: 1697d48faf

Change-Id: I7dbfe3c96678e2325eb533f31523ad10d861ad02
2017-05-10 00:40:28 +00:00
Hugo Benichi
76dc14ec88 Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks"
am: ba666e0621

Change-Id: I6c25c2f5f95ac2ffefe263b34e95009b9823c254
2017-05-10 00:23:06 +00:00
Hugo Benichi
ec07fbc9ed NetworkStatsFactory: fix double accounting on IPv6 only networks
For 464xlat scenarios on IPv6 networks, the clatd interface setup
introduces double counting of apps ipv4 traffic. NetworkStatsFactory was
accounting for this on the tx path, but not on the rx path. Also it did
not accounted for the 20 bytes added by the IPv6 header.

This patch subtract correctly the rx and tx traffic from the root uid on
the underlying interface, and also adds correctly the 20 bytes cost per
packet on the stacked interface for 464xlat traffic.

Test: added several new unit tests, based on synthetic data and real
      data also.
Bug: 33681750
Change-Id: I4867fe181938d94b5594b3d88896a3c4e01d895c
Merged-In: I2675643b220acbc6110179fa937d4c313b6f5e32

(cherry picked from commit e1bb3a14d1ee1aba2f92e5bccf659774699eaffe)
2017-05-10 09:19:12 +09:00
Hugo Benichi
ba666e0621 Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" 2017-05-10 00:07:29 +00:00
Tomasz Wasilczyk
37d986d17d Implement tune, cancel and getProgramInformation calls of ITuner.
Test: instrumentation
Bug: b/36863239
Change-Id: I7c0faacec7beccddc29f3f207ba6a166cb53e60c
2017-05-09 10:43:13 -07:00
Hugo Benichi
e1bb3a14d1 NetworkStatsFactory: fix double accounting on IPv6 only networks
For 464xlat scenarios on IPv6 networks, the clatd interface setup
introduces double counting of apps ipv4 traffic. NetworkStatsFactory was
accounting for this on the tx path, but not on the rx path. Also it did
not accounted for the 20 bytes added by the IPv6 header.

This patch subtract correctly the rx and tx traffic from the root uid on
the underlying interface, and also adds correctly the 20 bytes cost per
packet on the stacked interface for 464xlat traffic.

Test: added several new unit tests, based on synthetic data and real
      data also.
Bug: 33681750
Change-Id: I2675643b220acbc6110179fa937d4c313b6f5e32
2017-05-09 22:46:14 +09:00
Erik Kline
f40574c24f Merge "Refactor and improve logging." am: c3d41d5093 am: 8af8235bca am: 9f76683c59
am: d1ea33a039

Change-Id: I744b048224e0b8bf6fe4da763833b755441c0911
2017-05-09 10:59:36 +00:00
Erik Kline
d1ea33a039 Merge "Refactor and improve logging." am: c3d41d5093 am: 8af8235bca
am: 9f76683c59

Change-Id: Ieb9a8e3f85f41d18056a7827997f12986ff13ca1
2017-05-09 10:53:36 +00:00
Erik Kline
8af8235bca Merge "Refactor and improve logging."
am: c3d41d5093

Change-Id: I8ef193a9ee0f5bf04ae18620c1a68228ed7ed929
2017-05-09 10:40:29 +00:00
Treehugger Robot
c3d41d5093 Merge "Refactor and improve logging." 2017-05-09 10:33:51 +00:00
Paul Duffin
edefe593e3 Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am: b2ac85e76d

Change-Id: I2c06dbace44b4578a6cd94cb62a3ae67e558aaaa
2017-05-09 10:29:59 +00:00
Paul Duffin
b2ac85e76d Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" 2017-05-09 10:23:17 +00:00
Erik Kline
1fdc2e23b5 Refactor and improve logging.
Test: as follows
    - build
    - flashed
    - booted
    - "runtest frameworks-net" passed
    - "dumpsys connectivity" shows new log output
Bug: 32163131
Bug: 36504926

Change-Id: I14d6da18660223f7cace156cb6594ee18928a7b0
2017-05-09 17:29:47 +09:00
Hugo Benichi
515a54c4b8 Merge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2 am: 717238a614
am: 44e9b81c54

Change-Id: I9c38d1254f82b50f4d1e953e72bf15a46562d3b8
2017-05-09 06:30:48 +00:00
Hugo Benichi
717238a614 Merge changes I4872f8ba,I92039f29,Iaad13e13
am: 767ac317e2

Change-Id: Ibf618a27b2e5cfb3e8a69528dfecd275b33f0336
2017-05-09 06:14:47 +00:00
Hugo Benichi
ab5bdbf84e NsdService: test coverage for client requests.
Adding coverage for:
  - NsdManager client disconnection
  - in-flight request GC

Test: new test passes
Bug: 37013369, 33298084
Change-Id: I92039f297cf99352bbf4196797933d89c0b819ff
2017-05-09 10:49:33 +09:00
TreeHugger Robot
46edacff6c Merge "Add getData() member to SoundTriggerDetector.EventPayload." 2017-05-09 00:41:32 +00:00
Paul Duffin
702d506d57 Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: Ice80a29b420061f5d0af6eb46426455abf890e5e
Merged-In: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749
2017-05-08 19:33:27 +01:00
Paul Duffin
00229bc6cf Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749
2017-05-08 13:27:51 +01:00
Lorenzo Colitti
c87ec500e3 Move some NetworkStats tests to tests/net.
This groups them together with the rest of the networking unit
tests. It also speeds up compile/test cycles ("runtest -x" of one
file goes from 1m15s to 30s).

Bug: 33681750
Test: runtest frameworks-net passes on internal tree
Merged-In: I53cb0c51355fe4b4b30e451fa09fbbf58da39efd
Change-Id: I5ae5dbf74c94feb0fe3759681e5e6d6fba62fa32

(cherry picked from commit c86013be936f36c61fa0cdfad95141f6de3c6ef7)
2017-05-08 08:38:08 +00:00
Tomasz Wasilczyk
1ae34f900b Merge "Implement step and scan calls of ITuner." 2017-05-06 03:32:59 +00:00
Tomasz Wasilczyk
2383793eae Implement step and scan calls of ITuner.
Test: instrumentation
Bug: b/36863239
Change-Id: I8c089321a3e45f8ede8d8231ffd0dc5734db0bb5
2017-05-05 13:55:27 -07:00
TreeHugger Robot
59ec610072 Merge "Rename to TestableTests.apk" 2017-05-05 15:21:44 +00:00
TreeHugger Robot
094f7ddfc0 Merge "Try to add some more documentation to testables" 2017-05-05 15:16:42 +00:00
Tomasz Wasilczyk
8a3e865cf0 Merge "Dummy implementation get/setMute calls of ITuner." 2017-05-05 14:35:21 +00:00
Geoffrey Pitsch
6ae24e067e Rename to TestableTests.apk
For consistency with the other apks

Test: N/A
Change-Id: Ie40fa94d30fefbd9273bf13c6ecd30df4cbd439c
2017-05-04 14:05:20 -04:00
Steven Moreland
f4c406aa67 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: Ieac73fb72f543c349f9d6bac7b7951a78fcaf244
(cherry picked from commit 7f71515bbe7f50c0beb1e0f0cac0d222bcb5082a)
2017-05-04 15:24:55 +00:00
Tomasz Wasilczyk
9fa0287c18 Dummy implementation get/setMute calls of ITuner.
This is also not implemented in the native service.

Test: instrumentation
Bug: b/36863239
Change-Id: I2e5ceaec7a98eec0af6101a2f91dabd1cde2e090
2017-05-04 08:13:05 -07:00
TreeHugger Robot
eb3b36c7ec Merge "Remove redundant dependencies" 2017-05-04 08:56:27 +00:00