Commit Graph

4342 Commits

Author SHA1 Message Date
Lucas Dupin
ca0c783167 Merge "Move palette constants to XML" into oc-dr1-dev am: 8d5b831095
am: 486ce65234

Change-Id: Ib2ff59f4ac52799d420ee3353cedb4762f7a02b1
2017-07-14 20:39:22 +00:00
Lucas Dupin
486ce65234 Merge "Move palette constants to XML" into oc-dr1-dev
am: 8d5b831095

Change-Id: I8ced4304e4e6f6f766c7160e25122974ec0c9548
2017-07-14 20:31:33 +00:00
TreeHugger Robot
8d5b831095 Merge "Move palette constants to XML" into oc-dr1-dev 2017-07-14 20:24:37 +00:00
Lucas Dupin
6e69c85ddc Move palette constants to XML
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Change-Id: I22a5ef9b89c113f75261e8884fa1affb07b2265f
Fixes: 62373429
2017-07-14 09:35:05 -07:00
Lorenzo Colitti
f7a008ff69 Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev am: 3756636ad6
am: 041111ff7e

Change-Id: I538f7faef85bbb13499dec2125e0f82b3175396f
2017-07-14 01:06:56 +00:00
Lorenzo Colitti
041111ff7e Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev
am: 3756636ad6

Change-Id: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
2017-07-14 01:01:29 +00:00
Lorenzo Colitti
3756636ad6 Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev
* changes:
  Add code to dump OffloadController state.
  Fetch tethering offload stats.
  Allow more than one source of tethering statistics.
2017-07-14 00:51:56 +00:00
Hugo Benichi
a30cb89dfa resolve merge conflicts of 4f2a0fe213 to stage-aosp-master am: a428392c1d
am: 164ff8a2ed

Change-Id: I08195e119f866acc9fe1795b892fe45cea3c7f47
2017-07-14 00:46:49 +00:00
Hugo Benichi
164ff8a2ed resolve merge conflicts of 4f2a0fe213 to stage-aosp-master
am: a428392c1d

Change-Id: Ide67520d074330ec050ded71118bff0bc88be784
2017-07-14 00:37:20 +00:00
Hugo Benichi
a428392c1d resolve merge conflicts of 4f2a0fe213 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031
2017-07-14 07:25:51 +09:00
Tomasz Wasilczyk
e83dbb90fa Merge "Publish new Broadcast Radio APIs." 2017-07-13 20:50:10 +00:00
Treehugger Robot
4f2a0fe213 Merge "IpManager: define InitialConfiguration" 2017-07-13 20:45:21 +00:00
TreeHugger Robot
6fea738beb Merge "Remove AppCompat from TouchLatency test" 2017-07-13 20:03:11 +00:00
Hugo Benichi
fd31b9d46e IpManager: define InitialConfiguration
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.

At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.

This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
  1) easy extensibility for new test case,
  2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.

Bug: 62988545
Test: added new test in FrameworksNetTests,
      $ runtest frameworks-net
      $ runtest frameworks-wifi
Merged-In: I060b02603af7d73a6407df89344bf0c000574af2

(cherry pick of commit 2757fcf3a1)

Change-Id: I48dbf89232d7758f1b07ed4d76ce93281e5c6b53
2017-07-14 04:26:42 +09:00
TreeHugger Robot
6ea667447d Merge "Added mediumTest annotation to execute on tradefed." 2017-07-13 18:43:13 +00:00
Lucas Dupin
c7a0402c6e Merge "In-app gradient color based on systemui theme." into oc-dr1-dev am: 717dd58c52
am: de3597c769

Change-Id: I929d33ba540d03cdd823f0cf9a1b22b365fd9f2f
2017-07-13 17:19:05 +00:00
Lucas Dupin
de3597c769 Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
am: 717dd58c52

Change-Id: I35c7baae2e373f4d8bea87d1afc175833de7f59e
2017-07-13 17:09:59 +00:00
Lucas Dupin
717dd58c52 Merge "In-app gradient color based on systemui theme." into oc-dr1-dev 2017-07-13 17:03:47 +00:00
TreeHugger Robot
b12dc4296d Merge "IpManager: define InitialConfiguration" 2017-07-13 15:36:34 +00:00
Lorenzo Colitti
5a7dea1a8e Fetch tethering offload stats.
Make tethering offload register an ITetheringStatsProvider and
fetch tethering stats from the hardware.

Currently we fetch stats in the following cases:

1. Just after changing upstreams, we fetch stats from the
   previous upstream.
2. When we are polled by NetworkStatsService.

Bug: 29337859
Bug: 32163131
Test: builds, boots
Test: stats appear in tethering logs
Change-Id: If744f2e06cb6a3095a40199936b9afb76eff7b56
2017-07-13 23:54:51 +09:00
Tomasz Wasilczyk
05392d6360 Publish new Broadcast Radio APIs.
Also, rename FEATURE_RADIO to FEATURE_BROADCASTRADIO.

Bug: b/34348946
Bug: b/63405337
Test: instrumentalization
Change-Id: Ibf5851a10b94f9e82db85f740fde6f28efe48666
2017-07-13 07:46:25 -07:00
Hugo Benichi
2757fcf3a1 IpManager: define InitialConfiguration
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.

At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.

This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
  1) easy extensibility for new test case,
  2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.

Bug: 62988545
Test: added new test in FrameworksNetTests,
      $ runtest frameworks-net
      $ runtest frameworks-wifi

Change-Id: I060b02603af7d73a6407df89344bf0c000574af2
2017-07-13 22:42:50 +09:00
Erik Kline
17a62281e4 Merge "Program offload-exempt local prefixes into the HAL" am: de837a97aa
am: ae21b89414

Change-Id: If96a33f26fed64a84219868d28765b7581ad453d
2017-07-13 09:07:01 +00:00
Erik Kline
ae21b89414 Merge "Program offload-exempt local prefixes into the HAL"
am: de837a97aa

Change-Id: I741b6e31fb3adc922f47df824188786ff35e3aa9
2017-07-13 09:00:56 +00:00
Erik Kline
5acb4e3b62 Program offload-exempt local prefixes into the HAL
Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - observed calls to the HAL setLocalPrefixes in tethering log
Bug: 29337859
Bug: 32163131
Merged-In: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
Merged-In: Iaf80e584df458010741401fc1a19e7f6e21923c1
Merged-In: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
(cherry picked from commit 32179ff815)

Change-Id: I65ea833ac6fe7a75ebe546cfa358c4cffdf2de05
2017-07-13 16:43:34 +09:00
Erik Kline
12973a4ec0 Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev am: aa7b8b5322
am: b3d2aaaf2f

Change-Id: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
2017-07-13 07:41:52 +00:00
Erik Kline
b3d2aaaf2f Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev
am: aa7b8b5322

Change-Id: Iaf80e584df458010741401fc1a19e7f6e21923c1
2017-07-13 07:36:50 +00:00
Erik Kline
32179ff815 Program offload-exempt local prefixes into the HAL
Additionally:
    - move mOffloadController into MasterTetherSM

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - observed calls to the HAL setLocalPrefixes in tethering log
Bug: 29337859
Bug: 32163131
Change-Id: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
2017-07-13 13:45:49 +09:00
smaraaosp
6390f888de Added mediumTest annotation to execute on tradefed.
Test: Executed test locally.

Change-Id: Ib5dcdff1a689f0728fe8d005fa9683ee9120ae13
2017-07-12 16:14:29 -07:00
Lucas Dupin
c77b71d7f0 In-app gradient color based on systemui theme.
When viewing your scrim on top of an app (wallpaper not visible),
the gradient color should be dark if your wallpaper is dark and
light if your wallpaper is light.

Change-Id: I5f3aea5bf9ec066b7caecd7cadfd2814e3758bd1
Fixes: 63121129
Bug: 63365056
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
2017-07-12 10:40:23 -07:00
Erik Kline
d21ad47d43 Merge "Restructure use of absent tether_offload_disabled setting" am: 5bb30496cf
am: c8b4ef85dc

Change-Id: I2210e9d25a4e7c497b9383324e574c9f8aca0d6f
2017-07-12 06:25:04 +00:00
Erik Kline
c8b4ef85dc Merge "Restructure use of absent tether_offload_disabled setting"
am: 5bb30496cf

Change-Id: I9d1ec7d1c060278018c80c9374d724ee0ddba3a4
2017-07-12 06:18:11 +00:00
Treehugger Robot
5bb30496cf Merge "Restructure use of absent tether_offload_disabled setting" 2017-07-12 06:06:07 +00:00
Erik Kline
5eaa7ed03b Restructure use of absent tether_offload_disabled setting
This restructures the fetching of the default disposition such
that we disable (and enable) the feature with only a single
character change.

Additionally: fix unittests with proper use of FakeSettingsProvider.

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passed with developer enabled and disabled
Bug: 29337859
Bug: 32163131
Bug: 63250751
(cherry picked from commit c87cd41184)
Merged-In: Ib32489d07778465134bca52c589baddbd78ab129
Merged-In: I03d68b0da192fbd6172639343d4ab88c20127ad7
Merged-In: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3

Change-Id: Ie16a022be8dacd76b0402bcb777680c36163a084
2017-07-12 13:29:22 +09:00
Hugo Benichi
4cbefd0aca Merge "Add first OWNERS files for core networking" am: 4066930a36 am: 531cae76fd am: 59de81533d
am: 5185c1ce92

Change-Id: I3d0b7bcc72c21485671602d1e6f185fbc7702fe2
2017-07-12 04:13:53 +00:00
Hugo Benichi
5185c1ce92 Merge "Add first OWNERS files for core networking" am: 4066930a36 am: 531cae76fd
am: 59de81533d

Change-Id: Id149a16336fd5adfe8b247bb4b116db1ee357653
2017-07-12 04:07:18 +00:00
Hugo Benichi
59de81533d Merge "Add first OWNERS files for core networking" am: 4066930a36
am: 531cae76fd

Change-Id: I099ee71d8b9ed767af2f4556e4798a1263dab9c0
2017-07-12 04:01:15 +00:00
Hugo Benichi
531cae76fd Merge "Add first OWNERS files for core networking"
am: 4066930a36

Change-Id: Ib8e1b85be03ad5e75a89a7951a59b9bc2a04d112
2017-07-12 03:54:57 +00:00
Erik Kline
f042abe8f4 Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev am: d8fdb26ebf
am: 9d9b5c22f1

Change-Id: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3
2017-07-12 03:19:48 +00:00
Erik Kline
9d9b5c22f1 Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev
am: d8fdb26ebf

Change-Id: I03d68b0da192fbd6172639343d4ab88c20127ad7
2017-07-12 03:11:15 +00:00
Hugo Benichi
357b58cdab Add first OWNERS files for core networking
Covering
  core/java/android/net/
  core/java/com/android/server/net/
  packages/CaptivePortalLogin/
  services/core/java/com/android/server/
    ConnectivityService.java
    NsdServic.java
    NetworkManagementService.java
  services/core/java/com/android/server/connectivity/
  services/net/
  tests/net/

Android core networking files not covered:
  services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
  services/core/proto/ipconnectivity.proto (path unique to aosp)

Bug: 63408147
Test: builds
Change-Id: Ifbb923d5ffdcada83864b5e0eb07911682d66efa
2017-07-12 09:25:15 +09:00
Erik Kline
c87cd41184 Restructure use of absent tether_offload_disabled setting
This restructures the fetching of the default disposition such
that we disable (and enable) the feature with only a single
character change.

Additionally: fix unittests with proper use of FakeSettingsProvider.

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passed with developer enabled and disabled
Bug: 29337859
Bug: 32163131
Bug: 63250751

Change-Id: Ib32489d07778465134bca52c589baddbd78ab129
2017-07-11 23:46:58 +09:00
Ian Lake
ccf86f20cd Delete MusicBrowserDemo+MusicServiceDemo
These have been supplanted by the
MediaBrowserService sample in
platforms/developers/samples/android/media

Test: ls, make sure they are gone
BUG: 28983951
Change-Id: Ib7388ed92695bf1de29182860b28b4da3752b39c
2017-07-10 17:04:37 -07:00
Ian Lake
c694d04682 Remove AppCompat from TouchLatency test
Ensure the TouchLatency test accurately reflects the latest
framework and removes the need to update TouchLatency test
as Support Library evolves.

Test: ./gradlew assembleDebug works
BUG: 28983951
Change-Id: Icce773f47674f94cad5f9057cce4913b7efce834
2017-07-10 18:12:46 +00:00
Julia Reynolds
ed7b5c64e0 Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev am: c65071d625
am: 8d4cd22ffb

Change-Id: I60ddda50a6d5a6a3028361435a340d6191f6c729
2017-07-10 17:14:57 +00:00
Lucas Dupin
0407c1259c Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev am: 8b94ef697e
am: a9682937b6

Change-Id: Id3a0cd1c34166f156d0c94b412ca7d9397e38672
2017-07-10 17:06:33 +00:00
Julia Reynolds
8d4cd22ffb Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
am: c65071d625

Change-Id: I85e7117a88be1a629a953f1c721faba508d6d424
2017-07-10 17:06:23 +00:00
Lucas Dupin
a9682937b6 Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev
am: 8b94ef697e

Change-Id: Ic63c9dc9963846afd2ab854630d56512059609d9
2017-07-10 16:58:46 +00:00
Julia Reynolds
c65071d625 Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev 2017-07-10 16:55:01 +00:00
Lucas Dupin
8b94ef697e Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev 2017-07-10 16:49:33 +00:00