Commit Graph

7907 Commits

Author SHA1 Message Date
Sudheer Shanka
36310290a4 Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev am: 5df9c5570e
am: 3ae1662024

Change-Id: I1954ae85025dabfebf452228b199cab07e892be2
2017-05-12 18:18:24 +00:00
Sudheer Shanka
3ae1662024 Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev
am: 5df9c5570e

Change-Id: Ia15bc54c61a692a37ad9b84a28643afc798b52c7
2017-05-12 18:09:36 +00:00
TreeHugger Robot
4075fd9c16 Merge "Fix broken MenuItem coretests" 2017-05-12 18:08:36 +00:00
Sudheer Shanka
5df9c5570e Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev 2017-05-12 18:02:43 +00:00
Amin Shaikh
4657a8da6e Merge changes from topic 'onarevert' into oc-dev am: fa0b28220b
am: ef8d59b631

Change-Id: I6f3722c464609a49bed24824a35184080ae0b653
2017-05-12 08:56:58 +00:00
Adam Lesinski
6a59db8f6d Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev am: 120d7b219d
am: c041ea726c

Change-Id: I12dadc8e103e079daffa13773062382207e7fd84
2017-05-12 08:21:40 +00:00
Makoto Onuki
bf69e727e6 Merge "Make batterystats less chatty" into oc-dev am: 89d64cbbd9
am: 1186287a1e

Change-Id: I4d1b144837979bbcf212d3b647e3b8927c6c33bc
2017-05-12 08:10:07 +00:00
Amin Shaikh
ef8d59b631 Merge changes from topic 'onarevert' into oc-dev
am: fa0b28220b

Change-Id: I744b3dd5c4b58042e1460f161c2813f34784dc32
2017-05-12 06:46:27 +00:00
TreeHugger Robot
fa0b28220b Merge changes from topic 'onarevert' into oc-dev
* changes:
  Create a NotificationChannel for ONA.
  Revert "Delete old WifiNotificationController strings."
2017-05-12 04:40:26 +00:00
Adam Lesinski
c041ea726c Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev
am: 120d7b219d

Change-Id: Ib408bed1686392f6bd846071277ac29cc70d54e7
2017-05-12 04:01:26 +00:00
Sudheer Shanka
9b735c5c1a Add time spent by uid per cpu frequency to batterystats.
Currently we have total user and system cpu time spent by the uid
in the batterystats. This change will add times spent by the uid
at each different cpu frequency to the batterystats dump which will
help in better understanding the battery usage.

Bug: 34133340
Test: manual
Change-Id: I567dc75875eb58543c0e71572d0b440e87dbb4b9
2017-05-11 20:56:46 -07:00
Makoto Onuki
1186287a1e Merge "Make batterystats less chatty" into oc-dev
am: 89d64cbbd9

Change-Id: Icc72768848756547c08eac7958b8e34a410dd6ba
2017-05-12 03:54:58 +00:00
TreeHugger Robot
120d7b219d Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev 2017-05-12 00:20:47 +00:00
TreeHugger Robot
89d64cbbd9 Merge "Make batterystats less chatty" into oc-dev 2017-05-12 00:15:56 +00:00
Adam Lesinski
61d2d37233 BatteryStats: Stop reading kernel memory stats when unvailable
Bug: 37689111
Test: manual
Change-Id: Ib14e4db14870a47da4f4d72bee613486fb976b78
2017-05-11 13:05:46 -07:00
Makoto Onuki
3f8e29715c Make batterystats less chatty
Fix 36869686
Test: manual

Change-Id: Ia5092222acd508e5539cd64ffe015a18036c9d83
2017-05-11 10:52:37 -07:00
Peeyush Agarwal
d70d2e6efc Fix broken MenuItem coretests
- Fix MenuItemImpl setShortcut bug caused when method signature was
changed after API review
- Remove outdated MenuItem coretests and move others to CTS

Bug: 38114634
Test: Run `cts-tradefed run cts-dev -m CtsViewTestCases -t
android.view.cts.MenuTest`

Change-Id: Iebb7e314cbb3f812fcfeb3f95797f1cf1bcfbae2
2017-05-11 14:33:51 +01:00
Adam Powell
5c3ddbd3e2 Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev am: 33a030fa03
am: caf49bb507

Change-Id: I36e94e6f18a377e4fb92dd1d9f578e5685c29058
2017-05-11 07:11:14 +00:00
Adam Powell
caf49bb507 Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev
am: 33a030fa03

Change-Id: Ica063156bc487bd10d2c8af1a7520b71c1c31a88
2017-05-11 02:52:20 +00:00
TreeHugger Robot
33a030fa03 Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev 2017-05-11 01:48:55 +00:00
Michael Wright
8036799d2e Enable Always On mode by default.
Also, add a config value for always on display availability.

Test: runtest -x tests/src/com/android/systemui/doze
Change-Id: Id5e0136a5bed0eac78ad48147b0bef8311b06986
2017-05-10 21:47:47 +01:00
Ahmed ElArabawy
2c01ffd14b Merge "power hal: Use power HAL API 1.1" 2017-05-10 20:37:48 +00:00
Adam Powell
08adbfed3a Lock out ResolverDrawerLayout dismissals during animations
Due to views being offset during the ChooserActivity animating in
direct share targets, it was possible to touch down on the sheet
attempting to tap, but have it be interpreted as a fling downward as
the relative touch position within the parent was moving. Lock the
dismiss gesture during animations to prevent this.

Bug: 36032762
Test: manual
Change-Id: I18b6f03148cbf402efc23e873262927e412ea7b7
2017-05-10 07:48:30 -07:00
Hugo Benichi
4d147ff918 Merge "NetworkStatsFactory: no double looping on stats + stacked interfaces" am: 1683224416 am: cd6537edb5 am: b323e61584
am: 7b96660a43

Change-Id: I175ffaae545d88b7bc39ab01ab3a811af7e03d60
2017-05-10 09:30:01 +00:00
Hugo Benichi
7b96660a43 Merge "NetworkStatsFactory: no double looping on stats + stacked interfaces" am: 1683224416 am: cd6537edb5
am: b323e61584

Change-Id: I0312882bb8885aaa65f99a445fd0554d6ac054b3
2017-05-10 09:20:04 +00:00
Hugo Benichi
f37b271894 Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" into oc-dev 2017-05-10 08:19:57 +00: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
Android Build Merger (Role)
a4f91a277b Merge "Merge "AOD: Disable not-yet-ready always-on feature" into oc-dev am: 62643dddc7" into oc-dev-plus-aosp 2017-05-10 00:47:20 +00:00
Adrian Roos
2e3ef5bdfd Merge "AOD: Disable not-yet-ready always-on feature" into oc-dev
am: 62643dddc7

Change-Id: I7d7ae07607181559576d4dbd53ff7ef441c6ded3
2017-05-10 00:45:37 +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
TreeHugger Robot
62643dddc7 Merge "AOD: Disable not-yet-ready always-on feature" into oc-dev 2017-05-10 00:32:38 +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 e1bb3a14d1)
2017-05-10 09:19:12 +09:00
Hugo Benichi
00a16e077a NetworkStatsFactory: no double looping on stats + stacked interfaces
This patch uses the associative structure of the stacked/base interface
collection to avoid the two nested for loops over stacked/base
interfaces and all stats entries when correcting 464xlat traffic stats.

Consequently the list of stats entries is iterated only once.

Test: runtest -x frameworks/base/../NetworkStatsFactoryTest.java
Bug: 33681750
Change-Id: I84ae997fb693b909f431764697627b9957131732
2017-05-10 09:14:14 +09:00
Ahmed ElArabawy
0a4e11480b power hal: Use power HAL API 1.1
Switch framework to use Power HAL 1.1

Many subsystems (e.g.wifi) could be living on an
independent power island (sourced from VBatt directly)
and might even have their own dedicated XTAL to source
their clocks. Since these SOCs are capable of
autonomously operating (while the platform is in one
of the sleep states), they are still drawing power
from the VBatt. Hence it is critical to understand
the  (SOC) level low power statistics as well when
the battery level changes and be able to find any
correlation in event of unexpected battery drain.

This commit directs framework to use Power HAL 1.1

Bug: 29339696
Test: Manual
Change-Id: I0d779365536e84de5ec50b97d50f0162738383da
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
2017-05-09 14:35:22 -07:00
Amin Shaikh
11176569e1 Create a NotificationChannel for ONA.
- Construct the NETWORK_AVAILABLE NotificationChannel in
SystemNotificationChannels

Bug: 37794067
Test: make
Change-Id: I27aa69f8d038af238343eabc706147a02cad7330
2017-05-09 14:15:14 -07:00
Adrian Roos
763256163a AOD: Disable not-yet-ready always-on feature
Fixes: 37982136
Test: Verify Ambient Display options are gone from SysuiTuner on userdebug builds
Merged-In: I0b20ba7c352bac7c278f659f0e29496cc342d381
Change-Id: Id61e5fa8f3c42ea17e6e878ec1c8a2555fe93320
2017-05-09 12:31:26 -07:00
Bookatz
8b46904e73 Merge "Add BLE results counter to batterystats" into oc-dev am: 7080fa5282
am: eb5a068cbc

Change-Id: I2e3bb04a7283d9aa64181e221462cff7b40839af
2017-05-09 17:48:49 +00:00
Bookatz
eb5a068cbc Merge "Add BLE results counter to batterystats" into oc-dev
am: 7080fa5282

Change-Id: I8e485d5a97d46f6787b5b32c17ab5b85463f2653
2017-05-09 17:08:03 +00:00
TreeHugger Robot
7080fa5282 Merge "Add BLE results counter to batterystats" into oc-dev 2017-05-09 16:03:27 +00:00
TreeHugger Robot
5c4f60a06b Merge "Fix cannot share text from twitter to managed profile" 2017-05-09 15:23:21 +00: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
Philip P. Moltmann
7e6ef30452 Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev am: f512575c68
am: 169989822e

Change-Id: I330cd6e1601584e3903a26b27047aae2e7b7c711
2017-05-09 02:18:52 +00:00
Philip P. Moltmann
169989822e Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev
am: f512575c68

Change-Id: I590a658c92ad271c7b4f18f5768c1a4e581ffe94
2017-05-09 02:05:24 +00:00
TreeHugger Robot
f512575c68 Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev
* changes:
  No need to deal with windowTokens
  Persistable accessibility ID from ContextWrappers
  Check callbacks when operting on UI
2017-05-09 01:49:58 +00:00
Selim Cinek
afc4f9313c Merge changes from topic 'background_inflation' into oc-dev am: 03fbdbe6ff
am: cc360f9b69

Change-Id: I456f81ff6300792e8639733d0115d878683d1694
2017-05-08 22:30:48 +00:00
Selim Cinek
cc360f9b69 Merge changes from topic 'background_inflation' into oc-dev
am: 03fbdbe6ff

Change-Id: I1848e1f5a1ec5f9785872690b4d653afd590399f
2017-05-08 21:37:31 +00:00
Selim Cinek
03fbdbe6ff Merge changes from topic 'background_inflation' into oc-dev
* changes:
  Fixed the contrast for low-priority notifications
  Moving Row inflation to the background too
  Moving the inflation to the background
2017-05-08 21:11:37 +00:00
Philip P. Moltmann
134cee27b8 No need to deal with windowTokens
we have a link to the client which is enough to find the views.

Also there was some cases where the windowToken was not updated
properly. This is moot now.

Also: Read a array of views from the client to speed up the
client<->AutofillManager communication.

Fixes: 38070352
Test: CtsAutoFillServiceTestCases
      1 Started autofill, saw fill UI
      2 Home button
      3 Kill activity in background
      4 Recents -> back to activity
      5 Saw fill UI restored
Change-Id: I7c2c9411204fa5d65867efae9b7296399121c3a2
2017-05-08 14:02:58 -07:00
Jeff Sharkey
547a7ec9db Merge "Defeat @Nullable String[] with empty list." into oc-dev am: 5a421ad0ef
am: 22343c42d2

Change-Id: Id56528c56ec4520591c00b53faf6b4de7380b891
2017-05-07 17:56:40 +00:00
Jeff Sharkey
22343c42d2 Merge "Defeat @Nullable String[] with empty list." into oc-dev
am: 5a421ad0ef

Change-Id: Iad313a998a159049cfc55fff978b47be93f5e834
2017-05-07 17:49:39 +00:00