Sudheer Shanka
2bb4966dab
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
...
am: f34713066e
Change-Id: Ic001bfa12fecb00b24d7170c841af21531bab28a
2017-06-08 05:44:49 +00:00
Sudheer Shanka
6d8dcec872
Update KernelUidCpuFreqTimeReader to handle uid removals.
...
Bug: 34133340
Test: manual
Change-Id: Iaad2061671d83e1ff6d2797e166ae903f6faec13
2017-06-06 15:31:51 -07:00
Dan Sandler
0b5efb3b53
Updates to Dianne's Dungeon.
...
- new EKG icon
- set the notification timestamp to the oldest service
start time, so you have some idea how long things have been
this way
- minor text fixes
Bug: 36891897
Test: runtest -x cts/tests/app/src/android/app/cts/ServiceTest.java
Change-Id: I37c76ae86bcaee7c946863add041bbd1ca678cf9
2017-06-06 17:36:26 -04:00
Ahmed ElArabawy
dd3b200c19
Merge "Revert "Revert "power hal: Use power HAL API 1.1"""
2017-06-06 16:01:55 +00:00
Sudheer Shanka
1e52f216af
Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev am: 057bad9c9d
...
am: cefa28dc8a
Change-Id: I0dac209a9a5af6f5b83ea0d9706a29e5f6a97df4
2017-06-06 15:31:17 +00:00
TreeHugger Robot
2878977277
Merge "add skeleton CarServiceHelperService"
2017-06-05 23:20:28 +00:00
Sudheer Shanka
cefa28dc8a
Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev
...
am: 057bad9c9d
Change-Id: I536deea7b77c202b788f6d985574a9629d9bd1f1
2017-06-05 21:31:19 +00:00
Keun-young Park
067cf3e883
add skeleton CarServiceHelperService
...
- CarServiceHelperService is a companion service for car service which
is used only for car product.
- HelperService starts car service and provide necessary interface
for system server internal behavior control.
bug: 62342376
Test: test boot-up
Change-Id: I1728437434eab36bd2df6ba0a534731823bbcf35
2017-06-05 14:27:25 -07:00
Sudheer Shanka
057bad9c9d
Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev
2017-06-05 21:22:39 +00:00
Daniel Sandler
7574fbee46
Merge changes from topic 'dungeon' into oc-dev
...
am: 36a673a7d7
Change-Id: Idcad938ed14dac66e6b701cefd9dc79c499eb645
2017-06-05 19:15:12 +00:00
Sudheer Shanka
ea87a4bca0
Ignore entries for isolated uids if there's no mapping for them.
...
Bug: 25195548
Test: manual
Change-Id: If5aa7e194f4d43f2a7068899b9aa6584bfb2b7cc
2017-06-05 10:40:11 -07:00
Winson Chung
e0e3512045
Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev am: c3504d4f33
...
am: d288ca8d2d
Change-Id: I80aed8fd0d0a8573bd4b6cec7bf8c14878a0935c
2017-06-05 17:19:14 +00:00
Dan Sandler
2f36ab88d7
Updates to Dianne's Dungeon.
...
- new EKG icon
- set the notification timestamp to the oldest service
start time, so you have some idea how long things have been
this way
- minor text fixes
Bug: 36891897
Test: runtest -x cts/tests/app/src/android/app/cts/ServiceTest.java
Change-Id: I99db280cde8ca3ecd7205cd44fac159d8f652ca2
2017-06-05 11:18:59 -04:00
Winson Chung
d288ca8d2d
Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev
...
am: c3504d4f33
Change-Id: I07ff4ce93022c681b327b1dbb8a03893471b752e
2017-06-03 20:50:49 +00:00
TreeHugger Robot
c3504d4f33
Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev
2017-06-03 20:41:18 +00:00
Winson Chung
4d8681ff6a
Workaround to ensure that PIP activities have a visible shadow.
...
- When the window for the activity enters PIP, update the outline provider
to override the alpha of the shadow (to be opaque) to ensure that is is
visible. Only applies to the task root activity.
Bug: 36741700
Test: Launch YT, ensure that there is a shadow when after it enters PIP
Test: go/wm-smoke
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: If089dae84e4916d3d0e7bbeb316215b46e522e05
2017-06-02 16:02:50 -07:00
Andrew Zeng
6a682a58a8
Merge "Notify keyguard of when power button is pressed." into oc-dev am: dd273de09e
...
am: 3793a4ee3a
Change-Id: Ifea8a9b93f0d8c1945f3b6c7b15159b08019b9f1
2017-06-02 22:12:14 +00:00
Andrew Zeng
3793a4ee3a
Merge "Notify keyguard of when power button is pressed." into oc-dev
...
am: dd273de09e
Change-Id: I2e8061b695e1823ea9ab7b46c8fdb78111601ced
2017-06-02 22:03:30 +00:00
TreeHugger Robot
dd273de09e
Merge "Notify keyguard of when power button is pressed." into oc-dev
2017-06-02 21:54:15 +00:00
Sudheer Shanka
f3ddbb68e9
Merge "Avoid excessive logging when the necessary proc file is unavailable." into oc-dev am: ab17493ef3
...
am: 599bc3f19f
Change-Id: I3ad80361f65f6de1f06f9758219d02272b300c68
2017-06-02 21:28:19 +00:00
Sudheer Shanka
599bc3f19f
Merge "Avoid excessive logging when the necessary proc file is unavailable." into oc-dev
...
am: ab17493ef3
Change-Id: I649da92e3f5451886543f7edd8e107166b8c0125
2017-06-02 21:18:09 +00:00
Sudheer Shanka
ab17493ef3
Merge "Avoid excessive logging when the necessary proc file is unavailable." into oc-dev
2017-06-02 21:10:39 +00:00
Manu Cornet
79889119b6
Merge "Use a PopupWindow to show tooltips" into oc-dev am: 8493543ce3
...
am: 629c15297f
Change-Id: I5041b71149b3eaa58d85230dac26f7d22a547ae8
2017-06-02 20:22:11 +00:00
Manu Cornet
629c15297f
Merge "Use a PopupWindow to show tooltips" into oc-dev
...
am: 8493543ce3
Change-Id: I4b026c2f273ee34860f8100b017c56fe627a2d1f
2017-06-02 20:15:45 +00:00
Manu Cornet
8493543ce3
Merge "Use a PopupWindow to show tooltips" into oc-dev
2017-06-02 20:02:49 +00:00
Andrew Zeng
b4045d3791
Notify keyguard of when power button is pressed.
...
This is done on wear power button doesn't turn off the screen,
when the device wakes from keyguard UI isn't visible yet, so
it needs to react to power press in some way.
Bug: 35147955
Change-Id: I22619ea446770d09b53370e9244215646b60a9db
2017-06-02 12:51:13 -07:00
Sudheer Shanka
acd7f2c783
Avoid excessive logging when the necessary proc file is unavailable.
...
Bug: 34133340
Test: manual
Change-Id: Ic00e58a5b7bb7f92a0467df1cab8df5cab7dffda
2017-06-02 11:41:50 -07:00
Christine Franks
5e45ca09b8
Merge "Fix night display activation behavior after reboot" into oc-dev am: bd75ee0015
...
am: 16c9c94e49
Change-Id: I6806c3bde4a4739b2e8387840f706e753029d82b
2017-06-02 15:21:57 +00:00
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
Manu Cornet
77e539775b
Use a PopupWindow to show tooltips
...
This allows tooltips to work even in a context where they don't belong
in any activity (and therefore no window token to use). It also
simplifies a tiny bit the logic of how to get the view to show up.
Test: Checked tooltip behavior in and outside an app
Bug: 62065980
Change-Id: I6c02009c4fdd6d4bc4fa2cf8019955360506f0ee
2017-06-01 14:54:36 -07:00
Paul Crowley
ff4c265918
Merge "Revert "Revert "Make synthetic password enabled by default"""
2017-06-01 20:43:03 +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
Phil Weaver
9c5e077193
Merge "Initialize list of virtual views before using it."
2017-06-01 01:19:31 +00:00
Adam Lesinski
14c991cf97
Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev am: ceb24e88cb
...
am: 1b7ec9ad2c
Change-Id: Ic7f152784761283d413278313a968fd68dd3c76b
2017-05-31 22:48:10 +00: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
Paul Crowley
7a0cc0a7fb
Revert "Revert "Make synthetic password enabled by default""
...
This reverts commit 4519c0b1ef .
Change-Id: Ie39f1f5af085598fd9b919f25fd6548b0786524c
2017-05-31 22:12:57 +00:00
Joe Onorato
619f506c47
Merge "Track Partial wakelock time in background" into oc-dev am: 1dfd194f7d
...
am: b5ba4b1fd2
Change-Id: I72c27aeae5061102d725ba52fb72a0489117649d
2017-05-31 20:05:37 +00:00
Joe Onorato
f04efbdad6
Merge "Fix batterystat Counter misreporting when charging" into oc-dev am: 413b135244
...
am: 95d00a9a25
Change-Id: Ifaa4e1d37c4ad8d841e9224295bb66b000ee0cf2
2017-05-31 20:04:31 +00:00
Joe Onorato
6c74b2421b
Merge "Batterystats track background bad ble scan time" into oc-dev am: fe06de1fc2
...
am: 41e3f1479c
Change-Id: I3e9425e32d72b7415e776076cb977716073eb921
2017-05-31 20:01:34 +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
Ahmed ElArabawy
d8b441150e
Revert "Revert "power hal: Use power HAL API 1.1""
...
This reverts commit 48b908bd77 .
and brings back commit 0a4e11480b
This commit directs framework to use Power HAL 1.1
The commit has been tested not to cause application startup time
regression which was the reason of reverting the original commit
Bug: 62040325
Test: Performance Tests along with other tests
Change-Id: I84fdff3136c85e62223e2ae2f66b5bcad4e491b8
Signed-off-by: Ahmed ElArabawy <arabawy@google.com >
2017-05-31 09:51:12 -07:00
Adrian Roos
390ab841e2
Merge "Credential FRP: Add implementation"
2017-05-31 04:33:39 +00:00