Commit Graph

7928 Commits

Author SHA1 Message Date
Christine Franks
16c9c94e49 Merge "Fix night display activation behavior after reboot" into oc-dev
am: bd75ee0015

Change-Id: I6c8002fc4ac63f27343a27148c6a18e349a6b883
2017-06-02 15:15:56 +00:00
Christine Franks
bd75ee0015 Merge "Fix night display activation behavior after reboot" into oc-dev 2017-06-02 15:07:25 +00:00
Christine Franks
1454eae75d Fix night display activation behavior after reboot
Bug: 38469190
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services

Change-Id: Ida17ba9c9389781b892bbe37f0a9eeec030baf1e
2017-05-31 18:34:40 -07:00
Adam Lesinski
1b7ec9ad2c Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev
am: ceb24e88cb

Change-Id: I7e42ea6c56007f6f52fa237eb58adcdb1f5a6800
2017-05-31 22:42:08 +00:00
Adam Lesinski
ceb24e88cb Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev 2017-05-31 22:37:09 +00:00
Joe Onorato
b5ba4b1fd2 Merge "Track Partial wakelock time in background" into oc-dev
am: 1dfd194f7d

Change-Id: I06af34e0cf444fd7f26add4e6b54bcb0d7f4d617
2017-05-31 19:49:49 +00:00
Joe Onorato
95d00a9a25 Merge "Fix batterystat Counter misreporting when charging" into oc-dev
am: 413b135244

Change-Id: I022ebf39e2dc8ac77466ffe23306f9f38914659d
2017-05-31 19:47:16 +00:00
Joe Onorato
41e3f1479c Merge "Batterystats track background bad ble scan time" into oc-dev
am: fe06de1fc2

Change-Id: Ibca369ace041435ce1f9a9997658b86fd4b5f087
2017-05-31 19:46:11 +00:00
Joe Onorato
1dfd194f7d Merge "Track Partial wakelock time in background" into oc-dev 2017-05-31 19:26:59 +00:00
Joe Onorato
413b135244 Merge "Fix batterystat Counter misreporting when charging" into oc-dev 2017-05-31 19:26:59 +00:00
Joe Onorato
fe06de1fc2 Merge "Batterystats track background bad ble scan time" into oc-dev 2017-05-31 19:26:59 +00:00
Adam Lesinski
14ae39acbc BatteryStats: Acquire network stats without BatteryStatsImpl lock
Moves the network stats collection under a different lock to
prevent the main BatteryStatsImpl lock from being held while doing I/O.

Bug: 37645919
Bug: 38296815
Test: manual
Change-Id: I0d6b4a7b12b234939cb6eb3a32658b28f61dff4f
2017-05-31 11:55:52 -07:00
Joe Onorato
541f9cf576 Merge "Turn off logspam" into oc-dev
am: 6fb15ea9d4

Change-Id: I975c93d9f110a8a1488e366180da727ad9ec6408
2017-05-31 01:25:55 +00:00
Joe Onorato
82ba91ddb4 Turn off logspam
For more information, see https://source.android.com/source/code-style#log-sparingly

Bug: 37252687
Test: development/tools/logblame/app_switch_test
Test: development/tools/logblame/power_toggle_test
Test: development/tools/logblame/medium_idle_test
Change-Id: Ie2f6ef33df7b6c1ea976a8180945651ac9482976
2017-05-30 16:01:02 -07:00
Bookatz
b1f04f372c Batterystats track background bad ble scan time
Allows tracking ble scan time (total and background) for unoptimized
scans. Whether the scan is unoptimized is provided by the bluetooth
code when calling batterystats.

Bug: 38461344
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Test: run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testUnoptimizedBleScans
Test: cts-tradefed run cts-dev -m CtsDumpsysHostTestCases -t android.dumpsys.cts.BatteryStatsDumpsysTest

Change-Id: I814482ff663424170eac4b413464d24c14a5cf91
2017-05-26 15:41:03 -07:00
Amith Yamasani
85e6dd985b Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
am: 22c2be0fbc

Change-Id: Ic92b2b189a02dec2929b972733a26d8caae1822d
2017-05-26 21:10:40 +00:00
TreeHugger Robot
22c2be0fbc Merge "Use uptime instead of elapsed for measuring duration" into oc-dev 2017-05-26 20:56:12 +00:00
Bookatz
5b5ec326ad Track Partial wakelock time in background
Changed partial wakelock time to be a DualTimer so that it can also
track the time spent while app was in background.

Bug: 62134255
Test: cts-tradefed run cts-dev -m CtsDumpsysHostTestCases -t android.dumpsys.cts.BatteryStatsDumpsysTest
Change-Id: I85cca468ac126ee83a3600800bcfa75c9fc3012f
2017-05-26 11:25:06 -07:00
Amith Yamasani
d0ddeba47b Use uptime instead of elapsed for measuring duration
in time taken to read cpu stats.

This should avoid super long durations > 10 secs that are occasionally
seen in system logs.

Bug: 62104524
Test: manual
Change-Id: I9ed985a61125a207b6d4f6297091bd11b4c78616
2017-05-26 09:46:58 -07:00
Ian Lake
82624f130b Merge "Relayout when base inner insets change" into oc-dev
am: 7f874db5aa

Change-Id: I91bc90559f462d622133a018b1217eae10b6e11b
2017-05-26 01:31:10 +00:00
Adam Powell
f7a9adec31 Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev
am: 05d64e8b72

Change-Id: I3cbf8fbdc9a54f1d47c1ab4c86eaf3f1850f468f
2017-05-26 01:28:41 +00:00
TreeHugger Robot
7f874db5aa Merge "Relayout when base inner insets change" into oc-dev 2017-05-25 23:25:49 +00:00
TreeHugger Robot
05d64e8b72 Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev 2017-05-25 23:19:56 +00:00
Adam Powell
ad4624b1cc Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev
Port the previous change that was merged DO NOT MERGE for an upstream
branch that filters non-exported activities from ResolverActivity.

Bug: 34147053
Test: by previous CL
Change-Id: I2d0a018afd5e9c876f82fc5f551f1edc4b2305c8
2017-05-24 12:38:17 -07:00
Bookatz
8c6f3c507f Fix batterystat Counter misreporting when charging
The BatteryStatsImpl.Counter would previously increment the count even
when the timeBase was off. Then, when the timeBase was turned back on,
the count would be decreased back to the correct value. Thus, when the
timeBase was on, the reported count would be correct, but when the
timeBase was off, the reported count would be wrong (too high). Here, we
fix this.
We also make some other minor improvements.

Bug: 36728346
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I2fa566a8a4cad4cdff0e6caef37b1eef36a3f5c4
2017-05-24 12:00:17 -07:00
Andreas Gampe
d5a44707db Zygote: Allow arbitrary-length wrap property names
The restriction on system property key length has been lifted.
Update the invoke-with code to first check the full-length property.
Then fall back to the truncated version for backwards-compatibility.

Bug: 37276041

Test: m
Test: manual with long package name (Maps)
(cherry picked from commit 4c88a8c684)

Change-Id: Ic27a26a676f7ac5a998a9bea14259725e89b7e37
2017-05-24 11:26:18 -07:00
Ian Lake
67c0b1b51e Relayout when base inner insets change
When using SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN and
fitsSystemWindows="true", there are cases when the
inner insets will change but the content insets will
remain the same.

One case where this happens is when using
windowSoftInputMode="adjustResize|stateHidden",
bringing the keyboard up, hitting the Recents button,
then going back into the app.

By issuing a requestLayout when the base inner insets
change, we ensure that the inner layout is properly
updated, avoiding an empty space where they keyboard
used to be.

Test: Run app from b/37743589#comment6

BUG: 37743589
Change-Id: I7615c51b8f4eee3971b9b95e638011c1d885b3a6
2017-05-24 10:23:17 -07:00
Abodunrinwa Toki
656d33f323 Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev
am: 7c4998e614

Change-Id: Id7e6c2485fa3a0519b77dd64498808d255f10fbc
2017-05-23 16:10:59 +00:00
Abodunrinwa Toki
29a03ce74e Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev
am: 76ec0575bc

Change-Id: If1353fcbfc97a752bec758763caf1188b8c0daa3
2017-05-23 16:05:15 +00:00
TreeHugger Robot
7c4998e614 Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev 2017-05-23 16:01:37 +00:00
TreeHugger Robot
76ec0575bc Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev 2017-05-23 15:57:49 +00:00
Wale Ogunwale
2c0dfb74a6 Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev
am: 540cb28c5a

Change-Id: I188f1e181ff7feab8d1da92f6ef72ac43d47719c
2017-05-23 03:38:03 +00:00
TreeHugger Robot
540cb28c5a Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev 2017-05-23 03:32:43 +00:00
Wale Ogunwale
af38fd7b0f Revert "Changed alert window notifications to use single channel"
This reverts commit 8f7bebca36.

We now want multiple channels so the user can disable which ever ones they like.

Change-Id: I6015cd5f1e3f37a8a01e1db42b57a94087780304
Fixes: 38428796
Bug: 37422870
2017-05-23 01:43:59 +00:00
Sudheer Shanka
7c1598d5e8 Merge "Read cpu freq data only when needed." into oc-dev
am: fdeb6b8ed3

Change-Id: I241535a379b8e3cf547d73c05fe0dc7298ccc958
2017-05-23 00:20:34 +00:00
Sudheer Shanka
fdeb6b8ed3 Merge "Read cpu freq data only when needed." into oc-dev 2017-05-22 23:52:02 +00:00
Abodunrinwa Toki
46850fcaea Fix FloatingToolbar refresh on menu changes.
Also includes some minor code clean ups.

Fixes: 38465735
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit CtsWidgetTestCases:android.widget.cts.TextViewTest

Change-Id: Ie87cc256b77b3ec5732f49c000ce4845130fc91c
2017-05-22 23:56:03 +01:00
Abodunrinwa Toki
17293cc8a2 Ensure FloatingActionMode has a non-null FloatingToolbar.
Test: none
Bug: 38472422
Change-Id: I8b1844e0cbbff6dedeb0a89536a4bc27535b56df
2017-05-22 14:16:04 +01:00
Sudheer Shanka
671985f483 Read cpu freq data only when needed.
Bug: 34133340
Test: cts-tradefed run singleCommand cts-dev -m ctsIncidentHostTestCases -t \
      com.android.server.cts.BatteryStatsValidationTest

Change-Id: Ib235e166820b95b5cd0a496b6146ea353abdf844
2017-05-19 17:09:48 -07:00
Adam Bookatz
95cf947fba Merge "Cumulative wakelock time per uid" into oc-dev
am: 1effe000b8

Change-Id: I475ced78c13cadd48ba3be70d680a4a3fa83e500
2017-05-19 18:32:20 +00:00
Adam Bookatz
1effe000b8 Merge "Cumulative wakelock time per uid" into oc-dev 2017-05-19 18:24:44 +00:00
Jorim Jaggi
c907b736a9 Merge "Fix underdraw during resizing" into oc-dev
am: 906fe92759

Change-Id: I25fe2b06324f238d2d5d6092837919d1f5659bf3
2017-05-19 15:53:18 +00:00
Jorim Jaggi
906fe92759 Merge "Fix underdraw during resizing" into oc-dev 2017-05-19 15:42:51 +00:00
Jorim Jaggi
853d17d838 Fix underdraw during resizing
Since we hide the navigation bar background during resizing, we
need to fill it with the fallback background.

This was always an issue but somehow in OC we are displaying
garbage instead of black.

Test: Open Contacts/Dialer, resize, make sure no underdraw is
happening. Also test a couple of other apps.
Fixes: 36206155

Change-Id: I6b02060ef4acf36c2529d49063a61034f9261696
2017-05-19 14:53:55 +02:00
Sudheer Shanka
1768a0054d Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev
am: aff7c3c71e

Change-Id: Ie7691a19ef61668afd9200c9a3c77fa9fc5368f1
2017-05-18 17:53:28 +00:00
Sudheer Shanka
aff7c3c71e Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev 2017-05-18 17:42:17 +00:00
Selim Cinek
29260fd33b Merge changes I858017b8,Ife32b600 into oc-dev
am: 63e8bfe1c5

Change-Id: Ib280d1e343d5765ea93edcfbc5aae21417e6c590
2017-05-17 16:09:50 +00:00
Selim Cinek
63e8bfe1c5 Merge changes I858017b8,Ife32b600 into oc-dev
* changes:
  Improved the media color extraction algorithm
  Fixed broken coretests
2017-05-17 15:59:07 +00:00
Andreas Gampe
52fe51d8b0 Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3 am: c942ae61e9
am: 85c5e1c123

Change-Id: Id599b6c108b656932343209eb29abb3837b15624
2017-05-16 21:19:16 +00:00
Bookatz
c8c44960c0 Cumulative wakelock time per uid
Currently, the time for each partial wakelock was tracked. If one
wants the total time that a uid held partial wakelocks (over all of its
wakelocks), they could sum over all the uid's partial wakelock
totalTimes, but this would underestimate the value because totalTimes
are pooled amongst all uids. Alternatively, they could sum over all the
uid's partial wakelock totalDurations, but this would overestimate the
value because totalDurations are not pooled within the uid (so there
will be double-counting if two wakelocks are held simultaneously). This
cl adds a new timer that specifically tracks the actual total time that
the uid spent holding wakelocks, and also provides the ability to see
how much time the uid was in the background when doing so.

Bug: 38198272
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java

Change-Id: I20ea3546338c44ffdf06859bc840d9059fb18321
2017-05-16 14:01:28 -07:00