Commit Graph

5164 Commits

Author SHA1 Message Date
nharold
24b4e324cd Merge "Check mOwnedByTransform to avoid DELSA on SPI" am: 94d8fa0da6
am: ad1edf143f

Change-Id: Ie505e32e6f3bef3fe39198396a40a2b534e2bcda
2018-03-21 05:01:47 +00:00
nharold
ad1edf143f Merge "Check mOwnedByTransform to avoid DELSA on SPI"
am: 94d8fa0da6

Change-Id: Id194eb67947e9dae369b2a2d30b55e7e1cf2d7c8
2018-03-21 03:36:44 +00:00
Nathan Harold
22795302be Check mOwnedByTransform to avoid DELSA on SPI
The owned by transform flag prevents the removal
of an SPI from accidentally deleting an associated
SA in the kernel. That flag wasn't actually being
checked, so deleting an SPI would result in the
transform being removed.

The existing code already guarantees that the SA is
deleted when the transform is deleted

Bug: 73258845
Test: runtest frameworks-net
Change-Id: I4c26aea7af817a5d9e54da5db1cdf4f943bcae06
2018-03-20 11:26:29 -07:00
Benedict Wong
2e67bf5cac Merge "Added implementation for VTI add/remove address" am: 2543fbd8a2
am: 9dda91f806

Change-Id: Idaab45998f4765655bde6cf0274f2ba3c1b3ecf1
2018-03-20 00:09:15 +00:00
Benedict Wong
9dda91f806 Merge "Added implementation for VTI add/remove address"
am: 2543fbd8a2

Change-Id: Id49ef89d3076c9a6d5257b006965844ab77743ce
2018-03-19 23:45:10 +00:00
Benedict Wong
2543fbd8a2 Merge "Added implementation for VTI add/remove address" 2018-03-19 22:05:09 +00:00
Gopinath Elanchezhian
1bdcfa8f94 Merge "Add cycle-clean option in AppLaunch" into pi-dev
am: e588d6145d

Change-Id: Iae1ebd4f544992dbdfccb27b06bd5ff66c8b4be5
2018-03-17 01:07:58 +00:00
Gopinath Elanchezhian
e588d6145d Merge "Add cycle-clean option in AppLaunch" into pi-dev 2018-03-17 00:55:05 +00:00
Amith Yamasani
0071ccea48 Merge "App Time Limits API in UsageStats" into pi-dev
am: a8bb9d255f

Change-Id: I77b6656d38701b76444c64be1d75c7b86e70e3bb
2018-03-16 23:08:42 +00:00
TreeHugger Robot
a8bb9d255f Merge "App Time Limits API in UsageStats" into pi-dev 2018-03-16 22:40:46 +00:00
gopinath
63bf68d5c3 Add cycle-clean option in AppLaunch
If cycle-clean is enabled then all the apps will be
killed at the end of the cycle and cache will dropped.

Cycle time is also enabled to measure the sum of launch times
during each cycle.

Above two options will enable use to measure app launch time under
memeory pressue by not killing the app between the launches and
by killing all the apps and dropping the cache before each cycle
and measuring the cycle time.

Bug: b/73091210

Tested : Tested with nodropcache, no force stop between launches
and cycle clean option and the cycle time avg,min and max
is printed as expected.

Change-Id: I8fb22439a9fe191104ce024c8a85a2688068cd60
2018-03-16 19:08:09 +00:00
Benedict Wong
ecc9f7cc08 Added implementation for VTI add/remove address
This change adds implementation details for add/remove addresses onto a
VTI.

Bug: 73675031
Test: New tests added, passing on Walleye
Change-Id: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
2018-03-16 10:25:43 -07:00
Kevin Neas
c5a792ae68 Merge "Protecting against trying to launch apps that don't exist" into pi-dev
am: 9b8b54f9f6

Change-Id: I2dc8e043b9e6381085e3f066ac0705d106d54bac
2018-03-16 02:48:43 +00:00
Amith Yamasani
62ec27e97f App Time Limits API in UsageStats
Allow setting groups of apps to control usage time limits on.
Applies only to activity time in the foreground.

Updated UsageStatsTest app to be able to add an observer for
a 30 second timeout across multiple comma separated package
names.

Bug: 74335821
Test: atest FrameworksServicesTests:AppTimeLimitControllerTests
      Install and run frameworks/base/tests/UsageStatsTest

Change-Id: I677c30b4f211f7acf72c9766df3d8c1ac56a4b4e
2018-03-15 17:07:28 -07:00
Kevin Neas
e87923c2df Protecting against trying to launch apps that don't exist
BUG: 74083361

Change-Id: Ia0750bcca2534e794a81f094d5c214af4011c0ce
Test: Locally
(cherry picked from commit cb45b97a53)
2018-03-15 21:55:45 +00:00
Pavel Maltsev
7f0ce628dc Merge "Fixing comments in Network Capabilities" am: e58f15fded
am: 9b3c003c46

Change-Id: If3c0d76f9598d931d801271c4d0634e15f4b9ed4
2018-03-12 08:08:31 +00:00
Pavel Maltsev
9b3c003c46 Merge "Fixing comments in Network Capabilities"
am: e58f15fded

Change-Id: Iacbcac2e740099ea6b6a6f7a646f046370fd16f5
2018-03-12 07:57:07 +00:00
Jiyong Park
2530078d58 Merge "Allow apps in /odm/app and /odm/priv-app" into pi-dev
am: f85de9616f

Change-Id: I3fbe33f74307dc7d06802263a56b539fef43e006
2018-03-12 05:22:47 +00:00
TreeHugger Robot
f85de9616f Merge "Allow apps in /odm/app and /odm/priv-app" into pi-dev 2018-03-12 05:07:32 +00:00
Jiyong Park
090c6b1c94 Allow apps in /odm/app and /odm/priv-app
/odm is a vendor partition other than /vendor. Both partitions are for
HW-specific modules such as HALs. The difference is that /odm is owned
by ODM (usually device manufacturer which designs the board), whereas
/vendor is owned by SoC manufacturer. In other words, /odm partition is
for board-specific customization to the /vendor partition.

Since apps can exist in /vendor/app and /vendor/priv-app, the same has
to be supported for /odm partition.

Bug: 71366495
Test: m -j
Teet: cd frameworks/base/tests/OdmApps; atest .
Change-Id: I1ec8b22b080efdefd67a45ce9c7aeaa2aef350e0
2018-03-12 10:40:33 +09:00
Pavel Maltsev
e18ef26a59 Fixing comments in Network Capabilities
Clean up after aosp/606338

Test: m -j (only comments has been changed)
Change-Id: I2627654450244024c2be92f9067534dfc2a80891
2018-03-09 10:42:32 -08:00
Mathieu Chartier
786fa35ae2 Merge "Add sleep for profile saving in AppLaunch" into pi-dev
am: a8cb58721c

Change-Id: Ib7ef89ab7c9c84f49c25869319e94f7b401b0457
2018-03-09 18:31:28 +00:00
Mathieu Chartier
505511c829 Add sleep for profile saving in AppLaunch
Aim to prevent cases where the profile won't be saved when we compile.

Bug: 70734839
Test: m
Change-Id: Ib6f8740c70729914fc559f249b19adea1e7777f0
2018-03-08 18:30:06 -08:00
Pavel Maltsev
8a956a5141 Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d
am: b1e2bfe4df

Change-Id: Ie6839576f61563f2a82fec53afc42208f5a37f3c
2018-03-07 23:09:04 +00:00
Pavel Maltsev
b1e2bfe4df Merge "Minor clean-up in NetworkCapabilities"
am: 539f85a18d

Change-Id: Ic70f545a4886461f38f1af934600f4e1afe0179f
2018-03-07 23:00:53 +00:00
Treehugger Robot
539f85a18d Merge "Minor clean-up in NetworkCapabilities" 2018-03-07 21:06:59 +00:00
Anton Hansson
250e9629f3 Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
am: 13310fef6e

Change-Id: Idbd6c7575b15c68a34c75ae6e5a5dd5418cfab82
2018-03-07 18:37:54 +00:00
Anton Hansson
be72e62c63 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
Exempt-From-Owner-Approval: Global cleanup
Change-Id: I66b515d98d03264dbb893b7c55ba7bdddfb447a1
Merged-In: I26458e41ecb84de91ac9a356a5d4bafb44f463c1
Merged-In: I938efe7a2359302cbf4d5d6f786f963044e1bbbd
Merged-In: I72ce7f1c6242ddf9a5b36075761f3f1f1138cea1
2018-03-07 15:10:39 +00:00
Anton Hansson
ed972116bb Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." into pi-dev
am: d740e43bf7

Change-Id: I938efe7a2359302cbf4d5d6f786f963044e1bbbd
2018-03-07 14:04:51 +00:00
Anton Hansson
d137c872cd 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
Exempt-From-Owner-Approval: Global cleanup
Change-Id: I26458e41ecb84de91ac9a356a5d4bafb44f463c1
2018-03-07 11:42:04 +00:00
Dianne Hackborn
e1d41bd8fa Merge "Fix issue #72116995: Add permission guarding Service#startForeground" into pi-dev
am: 16268a69d6

Change-Id: I6ef5335e391eb9259ae0dfbf4f88032ad1d2bad4
2018-03-07 00:14:27 +00:00
Dianne Hackborn
16268a69d6 Merge "Fix issue #72116995: Add permission guarding Service#startForeground" into pi-dev 2018-03-06 23:04:16 +00:00
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
Dianne Hackborn
dd027b3ab2 Fix issue #72116995: Add permission guarding Service#startForeground
Now requires permission if targeting P.

Note that this is a separate permission from the existing one
that is required for instant apps to use foreground services.  The
reason for this is that their semantics are different (the instant
apps permission is associated with an app op for control over what
the app is allowed, while the regular app permission is just a
normal permission that is always granted and only there for
auditing of apps), and there are probably going to be cases where
a developer will want to use a foreground service in the full
version of their app but not as an instant app.

Bug: 72116995
Test: atest CtsAppTestCases
Change-Id: I883c9515c307ed8e39f0bf888c4045944c8183ac
2018-03-05 16:59:21 -08: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