Commit Graph

5130 Commits

Author SHA1 Message Date
Andreas Gampe
b2aea203cf Merge "Camera: Fix map access" am: 8796d95475
am: f17dcdaea9

Change-Id: I72e9146ed8d21974af3cfe8b209571ebe8c93a3b
2018-03-06 20:06:06 +00:00
Remi NGUYEN VAN
d2832e320b Merge "Allow null subscriberId in NetworkStatsManager." am: 6bd13af46a
am: a6905db1d8

Change-Id: I1e4e283c6eaecf33d12488e41e0c524f6ff83954
2018-03-06 19:52:57 +00:00
Andreas Gampe
f17dcdaea9 Merge "Camera: Fix map access"
am: 8796d95475

Change-Id: Ife74759ff109b1b885420db408e6a6e0c3bb1388
2018-03-06 19:45:39 +00:00
Remi NGUYEN VAN
a6905db1d8 Merge "Allow null subscriberId in NetworkStatsManager."
am: 6bd13af46a

Change-Id: I900ac14224284fc3a1422e8791bc54d6a9ee77ba
2018-03-06 19:37:13 +00:00
TreeHugger Robot
67ccb4f5c4 Merge "Update UsbHandlerTests" into pi-dev 2018-03-06 18:50:01 +00:00
Treehugger Robot
8796d95475 Merge "Camera: Fix map access" 2018-03-06 16:04:24 +00:00
Andreas Gampe
b59365c3db Camera: Fix map access
Found by Errorprone.

Bug: 73288226
Test: m javac-check-SmartCamera RUN_ERROR_PRONE
Change-Id: I6f6105f5d4a6ed5d28262bcdcd83764e6e8d5544
2018-03-05 21:52:27 -08:00
Remi NGUYEN VAN
489e8b02f8 Allow null subscriberId in NetworkStatsManager.
Use a MATCH_MOBILE_WILDCARD template to avoid filtering by
subscriberId when querying statistics from NetworkStatsService.

Bug: 74038898
Change-Id: I4b39e7031416cb33b23d89aa36ff0f774eaa942f
Fixes: 74038898
Test: runtest frameworks-net, CTS tests pass
2018-03-06 13:28:19 +09:00
Erik Kline
ea1b8bd5a5 Fail if the interface is not available when starting
Addresses a long-standing TODO.  Now, when calling IpClient's
startProvisioning(), the interface has to be available (i.e.
InterfaceParams#getByName() must return non-null).

Also:
    - add a test
    - refactor for testability
    - delete some constructors no longer used
    - properly handle passed-in null IpClient.Callback
    - some more IpManager -> IpClient renaming
    - permit recording metrics before starting a provisioning
      attempt (logging immediate errors) without Log.wtf().

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
    - runtest frameworks-net passes
    - basic WiFi IpClient connections works fine
Bug: 62476366
Bug: 73487570
Merged-In: I68e5e24122dc31e730cdbe8d75e33847e6332da4
Merged-In: Ifd27f5d908947cd7b4e1b8d54f9fa87e43ebb11b
Merged-In: Ief3c8e1652f69af0276fe35946ae1bf6e6b1b57e
Change-Id: Ic83ad2a65637277dcb273feb27b2d1bb7a11eb2b
(cherry picked from commit b152cd0aa4)
2018-03-06 11:06:34 +09:00
Jerry Zhang
0d3aa08a2f Update UsbHandlerTests
Some tests weren't being run due to
missing annotations.

Bug: None
Test: atest UsbTests -- passes
Change-Id: Ifc99d8f0b1a825bacf7d1ed59c790c343722b37c
2018-03-05 22:52:11 +00:00
Erik Kline
a1f407d0f5 Merge "Fail if the interface is not available when starting"
am: b331b02da9

Change-Id: If9a8b1bc88b7358919d67f0ebaf01115bd1af69e
2018-03-05 15:05:08 +00:00
Erik Kline
b152cd0aa4 Fail if the interface is not available when starting
Addresses a long-standing TODO.  Now, when calling IpClient's
startProvisioning(), the interface has to be available (i.e.
InterfaceParams#getByName() must return non-null).

Also:
    - add a test
    - refactor for testability
    - delete some constructors no longer used
    - properly handle passed-in null IpClient.Callback
    - some more IpManager -> IpClient renaming
    - permit recording metrics before starting a provisioning
      attempt (logging immediate errors) without Log.wtf().

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
    - runtest frameworks-net passes
    - basic WiFi IpClient connections works fine
Bug: 62476366
Bug: 73487570
Change-Id: Ic83ad2a65637277dcb273feb27b2d1bb7a11eb2b
2018-03-05 19:29:26 +09:00
Pavel Maltsev
2d8067ed3d Merge "Extend network request to query networks w/o capabilites" am: d846adac83 am: a3be78b5e7
am: f5312f3538

Change-Id: I3bf776767be61577f1bca0d98d4aaf82a0e45336
2018-03-03 00:14:52 +00:00
Pavel Maltsev
f5312f3538 Merge "Extend network request to query networks w/o capabilites" am: d846adac83
am: a3be78b5e7

Change-Id: Ie0c4fa4648c235589fecd79a25d28f1e62025fb7
2018-03-03 00:03:37 +00:00
Pavel Maltsev
a3be78b5e7 Merge "Extend network request to query networks w/o capabilites"
am: d846adac83

Change-Id: Id1d86938fa2d5aff4dbf9cde87548d80c76674d9
2018-03-02 23:52:18 +00:00
Treehugger Robot
d846adac83 Merge "Extend network request to query networks w/o capabilites" 2018-03-02 19:04:31 +00:00
Chalard Jean
d1bf7733af Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478 am: e5e819f078
am: 1be320a494

Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc
2018-03-02 13:25:02 +00:00
Chalard Jean
1be320a494 Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478
am: e5e819f078

Change-Id: I7f08217c5abc86a8784b91145f1b02d6693b3919
2018-03-02 13:17:23 +00:00
Chalard Jean
e5e819f078 Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
am: 6001f72478

Change-Id: Iab9c8df6071e6dec35b5f492eb8344ba370e0036
2018-03-02 13:10:45 +00:00
Chalard Jean
9fae0a82af Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: 20013384dc am: 18e51821b1
am: 207b8e2b4e

Change-Id: Ifd77149ca2c45249b8776c878c6fac46ae81c2a4
2018-03-02 12:54:29 +00:00
Chalard Jean
207b8e2b4e Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: 20013384dc
am: 18e51821b1

Change-Id: I33c6fcc72753e00af601cf915aa78416174a3871
2018-03-02 12:46:46 +00:00
Chalard Jean
18e51821b1 Merge "Give VPNs the INTERNET capability when they route most of the IP space"
am: 20013384dc

Change-Id: Icd1466c79d2593fcab5bd2e31a1acb3a36a705da
2018-03-02 12:34:25 +00:00
Chalard Jean
6001f72478 Merge "Give apps with NETWORK_SETTINGS right to see any VPN." 2018-03-02 11:52:15 +00:00
Chalard Jean
b552c4655f Give apps with NETWORK_SETTINGS right to see any VPN.
...not only the ones that apply to them.

Bug: 73217368
Test: runtest frameworks-net and CTS
Change-Id: I436972a3e51e98bdd815771b451bcedadf684763
2018-03-02 17:10:11 +09:00
Chalard Jean
adbf1d029b Give VPNs the INTERNET capability when they route most of the IP space
Test: manual, plus wrote some new tests for this
Bug: 72765718
Change-Id: I9759da72b752fd8eeb1d0647db9ab341f04c0528
2018-03-02 16:20:22 +09:00
Pavel Maltsev
1cd48dae22 Extend network request to query networks w/o capabilites
Add another bit mask into NetworkCapabilities class that represents
unwanted capabilities and corresponding methods to add and remove them.

Bug: 72828388
Bug: 68762530

Test: runtest -x frameworks/base/tests/net/
Change-Id: Ie291167eb74fdb696c7ee145c8cc46ea8115d6ba
2018-03-01 17:52:02 -08:00
Anton Hansson
09ad1cbdc0 Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am: c164c83191
am: 9ee9e6b2b6

Change-Id: I984b5ee633078401769d3c649aa9b020715772df
2018-03-01 11:53:43 +00:00
Anton Hansson
9ee9e6b2b6 Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
am: c164c83191

Change-Id: Icd753634a498a9c1a2d2e27ad4e6cd788e7b9e1f
2018-03-01 11:46:29 +00:00
TreeHugger Robot
1ddda1cba3 Merge "Fix link-type check warning on com.android.media.remotedisplay" 2018-03-01 02:47:15 +00:00
Anton Hansson
a3e79fbb8c frameworks/base: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: Ibcffec873a693d1c792ca210fb597d2bf37e9068
Merged-In: I4233b9091d9066c4fa69f3d24aaf367ea500f760
2018-02-28 17:15:21 +00:00
Anton Hansson
ab6ec61251 frameworks/base: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: I4233b9091d9066c4fa69f3d24aaf367ea500f760
2018-02-28 15:13:23 +00:00
Alexandru-Andrei Rotaru
9f3bad7260 Notify the user and turn off tethering when the service is disallowed.
Added UserRestrinctionListener for turning the service off one the
DISALLOW_CONFIG_TETHERING is on into Tethering.  Added notification
about
tethering being turned off. Also added Unit Tests to test the
functionality
of the UserRestrictionListener added.

Bug: 27936525
Test: Turn the tehering service on (either wifi, usb or bluetooth).
Automatically the system should send a notification about the service
being active.Close settings from recents. From TestDPC User Restrictions
switch on DISALLOW_CONFIG_TETHERING. The tethering should be turned off
and a notification should appear informing that the service is inactive.

Merged-In: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
Change-Id: I4a57137a7ad592ca186d9508d5cc2fad3f1bc985
2018-02-28 17:52:38 +09:00
Pavel Maltsev
b1a83edb5c Merge "Add OEM_PAID network capability" am: 4c00edd361 am: 7b87c2050c
am: 3b7de55419

Change-Id: Id64d288764dc5a556b60f5e3b866b40792647ac0
2018-02-28 08:42:24 +00:00
Pavel Maltsev
3b7de55419 Merge "Add OEM_PAID network capability" am: 4c00edd361
am: 7b87c2050c

Change-Id: Ie0377fea66f784c910bd0a06f87543cc5cf82c84
2018-02-28 08:28:25 +00:00
Treehugger Robot
4c00edd361 Merge "Add OEM_PAID network capability" 2018-02-28 07:06:00 +00:00
Jiyong Park
bc697b6abf Fix link-type check warning on com.android.media.remotedisplay
The library has been built without SDK, and is used by an app
RemoteDisplayProviderTest that is built with SDK. Such this SDK ->
non-SDK dependency has been causing link-type check warnings, which will
turn into errors soon.

This change fixes the warning by making a stub library
com.android.media.remotedisplay.stubs from the runtime library and let the app
to link against the stub library. Since the stubs library does not use any
private APIs, it is built with SDK.

Bug: 69899800
Test: m -j RemoteDisplayProviderTest is successful and does not show any
link-type check warning.

Change-Id: I7ee297a9d1aa4f01136b9a026a4939df2d483b8c
2018-02-28 09:45:40 +09:00
TreeHugger Robot
23aee1bbb5 Merge changes from topic "terminal_type_fix"
* changes:
  Add test for UsbDescriptorParser.java
  USB Audio: broaden Terminal Type interpretation
2018-02-28 00:09:15 +00:00
Andreas Gampe
8fa73a4b87 Merge "Frameworks: Annotate JUnit4 test with @Test" am: 4d9bec6b4a am: 0e8e9472ba
am: 20f00dfe66

Change-Id: I0c611c22eedda2d849bd16ef2e2bb7e2e60e0a5a
2018-02-27 19:39:51 +00:00
Andreas Gampe
20f00dfe66 Merge "Frameworks: Annotate JUnit4 test with @Test" am: 4d9bec6b4a
am: 0e8e9472ba

Change-Id: I70e11136f6e261cccf4ce57f757f97999f74b402
2018-02-27 19:19:01 +00:00
Andrew Chant
7db57cbea2 Add test for UsbDescriptorParser.java
Tests with descriptors from USB-C to 3.5mm adapter in four cases:
 - line level load connected, no microphone
 - low impedance load with microphone
 - low impedance load without microphone
 - no load attached.

Test: Ran tests without fix for bug 73813676, failed.
Ran tests with fix, all passed.

Change-Id: I067a15a122996e80c70bf287c6982611b6deee01
2018-02-26 17:41:26 -08:00
Arthur Eubanks
886a7bdc3b Remove internal links from ActivityManagerPerfTests README
Test: None
Change-Id: I0dd9cfa210c5ce3a207708c80813fed032c6e196
2018-02-26 15:06:19 -08:00
TreeHugger Robot
5f50a4b827 Merge "Improve output of voice interaction test app." 2018-02-26 22:29:16 +00:00
Narayan Kamath
f157b9f983 Merge "CoreTests: Tidy up legacy tests." 2018-02-26 17:11:50 +00:00
Andreas Gampe
a7b26b59af Frameworks: Annotate JUnit4 test with @Test
Mollify Errorprone.

Bug: 72076216
Test: m javac-check RUN_ERROR_PRONE=true
Test: atest IpSecServiceParameterizedTest
Change-Id: Ia3a253c4c5994937efc0f498ac047c5fb4eee3e9
2018-02-26 08:09:26 -08:00
Dianne Hackborn
dec475649a Improve output of voice interaction test app.
Bug: 73830394
Test: built and ran
Change-Id: I9722b91021585e15ec52ffd36325f884e784f7da
2018-02-23 15:38:03 -08:00
Gopinath Elanchezhian
aa23db0fdc Merge "Add support for hot launch in App launch test." 2018-02-23 22:20:22 +00:00
Andreas Gampe
c5f5ad103f Merge "Frameworks: Remove bogus test method" am: c65d52ff78 am: 8120e8616b
am: dd531adbd2

Change-Id: I0317dedfe5c20c54551f72e6c691dea67dde83ca
2018-02-23 21:26:02 +00:00
Andreas Gampe
dd531adbd2 Merge "Frameworks: Remove bogus test method" am: c65d52ff78
am: 8120e8616b

Change-Id: I1dd4cb24ed7c5afdb9185bacabf7b0a3e8f3a7d8
2018-02-23 21:15:06 +00:00
gopinath
55ca1f4c47 Add support for hot launch in App launch test.
force-stop-app option is added to control hot launch and
cold launch.

Bug: b/73091210

Test:
am instrument -w -r   -e debug false -e launch_directory /sdcard
-e apps "Calculator^Calculator|Clock^Clock" -e trial_launch true
-e log false -e timeout_msec 300000 -e force-stop-app false
-e launch_order CYCLIC -e simpleperf_cmd "simpleperf stat -a"
-e launch_iterations 10 com.android.tests.applaunch/android.test.InstrumentationTestRunner

Change-Id: I4b0f7a61c46e8091e69cad9fa65b5b34f680252d
2018-02-23 19:42:15 +00:00
Jeff Sharkey
725024bb2a Merge "Name specific app for rapid data usage." 2018-02-23 16:28:58 +00:00