Adam Lesinski
6548f9b876
am 3209e18c: am 60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev
...
* commit '3209e18ce09b3f7a441943cb7c9700744d058005':
BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf
2015-07-28 01:33:08 +00:00
Lorenzo Colitti
08ef66bbbc
am 62ca62b3: am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
...
* commit '62ca62b32aae083c0f2d8b0bbec1fbd7d698f4ad':
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
2015-07-28 01:33:03 +00:00
Filip Gruszczynski
1bf3d22237
Merge "Don't animate burn-in return when it wasn't applied." into cw-e-dev
2015-07-28 01:22:56 +00:00
Filip Gruszczynski
41e6346b4c
Don't animate burn-in return when it wasn't applied.
...
The burn-in protection return animation is performed based on the last
offset that was used, but it doesn't mean that such offset is currently
applied. Right after entering ambient mode no offset is applied, so if
we start a return animation using the last applied offset, it will cause
a shake. The animation will first shift from 0, 0 offset to the last
offset and then return again to 0, 0. This CL makes it not apply the
animation in that case.
Bug: 22519478
Change-Id: I5cb750b56e9715c6d9389136071a5e0fbafb047b
2015-07-27 18:22:13 -07:00
Adam Lesinski
3209e18ce0
am 60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev
...
* commit '602611375b11805f74ae52f5d62a944c74f967d6':
BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf
2015-07-28 01:20:21 +00:00
Lorenzo Colitti
62ca62b32a
am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
...
* commit 'e288b3af14421731d8f477b97e8d77588f20498b':
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
2015-07-28 01:20:16 +00:00
Adam Lesinski
602611375b
Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev
2015-07-28 01:06:14 +00:00
Lorenzo Colitti
e288b3af14
Merge changes I5c994de5,I6cb0dd84 into mnc-dev
...
* changes:
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
2015-07-28 01:03:44 +00:00
Adam Lesinski
4c9ace51db
BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf
...
In practice I've seen the reported time spent in all WiFi energy states ~20 milliseconds larger
than the time between samples, which seems reasonable.
This will reduce false positives in APR.
Bug:22774068
Change-Id: Ibf33c9826586c8a1b70449b9a609cb51bdfc08b8
2015-07-27 17:19:23 -07:00
Fyodor Kupolov
9b02cff8f4
am 0bc60661: am 67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev
...
* commit '0bc606614ab4c7ec20b6696e0a6bba4f46568925':
Added missing check for MANAGE_USERS
2015-07-28 00:08:18 +00:00
Fyodor Kupolov
0bc606614a
am 67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev
...
* commit '67a32c499177d41e48c3ac5a803f883fd97acf37':
Added missing check for MANAGE_USERS
2015-07-27 23:56:29 +00:00
Fyodor Kupolov
67a32c4991
Merge "Added missing check for MANAGE_USERS" into mnc-dev
2015-07-27 23:43:32 +00:00
Jeff Sharkey
3f5c710959
am a6b44102: am 2e606d7b: Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
...
* commit 'a6b441029d0c4324efddb45489dd91e9daeef4b3':
Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
2015-07-27 22:13:07 +00:00
Jeff Sharkey
a6b441029d
am 2e606d7b: Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
...
* commit '2e606d7be5275f2bff4c5755351bc3191ecb1bf1':
Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
2015-07-27 21:56:38 +00:00
Fyodor Kupolov
d4b2604109
Added missing check for MANAGE_USERS
...
setUserRestriction should do the same permission check as setUserRestrictions
method.
Bug: 22767990
Change-Id: I01f0508ebb23deafaa32ad5dd7063b98a78641be
2015-07-27 14:32:54 -07:00
Jeff Sharkey
2e606d7be5
Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
...
Bug: 22697024
Change-Id: Ib7277e8850a49909e5d8d5ad5502cd9315cddf0b
2015-07-27 14:25:11 -07:00
Adam Lesinski
d7f4a07879
am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
...
* commit '48a90091b1f50043f000929e35d9aae5e8c457e3':
BatteryStats: Prevent BatteryService from blocking
2015-07-27 20:33:37 +00:00
Adam Lesinski
48a90091b1
am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
...
* commit 'fc28d6fc9dec30e4cd98cc894d596f7df986f5b9':
BatteryStats: Prevent BatteryService from blocking
2015-07-27 20:21:20 +00:00
Julia Reynolds
13ad04e76b
am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
...
* commit '3df17a6d01507de4690601f948ec776f48ccba87':
Allow Settings to set background data restrict on secondary users.
2015-07-27 20:20:41 +00:00
Julia Reynolds
3df17a6d01
am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
...
* commit 'f68e0236a67a8d6f8ec167df0daf332221149b51':
Allow Settings to set background data restrict on secondary users.
2015-07-27 20:03:28 +00:00
Adam Lesinski
fc28d6fc9d
Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
2015-07-27 20:01:34 +00:00
Julia Reynolds
f68e0236a6
Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
2015-07-27 19:51:24 +00:00
Julia Reynolds
72f83d6a05
Allow Settings to set background data restrict on secondary users.
...
Bug: 22721091
Change-Id: Iadfbd25f75f233f2c3c080e0de05b0244572b6cd
2015-07-27 15:10:42 -04:00
Adam Lesinski
d7616ef73c
BatteryStats: Prevent BatteryService from blocking
...
BatteryService is a low level service, and we shouldn't have it
block in BatteryStatsService while collecting external data from
components like WiFi. Deadlocks can occur this way.
Bug:22559655
Change-Id: I64026453d191695eb583a47163ab6f48f882b085
2015-07-27 11:43:05 -07:00
Fyodor Kupolov
d815c04b12
am d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
...
* commit 'd7d1ea45984efdb6a514e97312045ac5b67ccb22':
Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
2015-07-27 18:19:02 +00:00
Fyodor Kupolov
d7d1ea4598
am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
...
* commit 'b83b5fa641847ee1d533253ba5e1a3e13913b9d9':
Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
2015-07-27 18:05:57 +00:00
Fyodor Kupolov
b83b5fa641
Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
2015-07-27 17:27:02 +00:00
Lorenzo Colitti
f28e62bdf6
Add a test for public bugs 2111 and 2136.
...
Bug: 22602137
Bug: 22104401
Change-Id: I5c994de53b5906416767a8a1abe38fe59afb7cc0
2015-07-27 17:22:21 +09:00
Lorenzo Colitti
87cfc70b73
Always check off-link connectivity in NetworkDiagnostics.
...
Currently, NetworkDiagnostics only checks off-link connectivity if
one of the DNS servers is off-link. Make it check off-link
connectivity in all cases by sending probes to Google Public DNS
if off-link DNS servers are not specified.
Bug: 22569331
Bug: 22641669
Bug: 22748900
Change-Id: I6cb0dd8491bc0c1a488631deca56722b9c1d2b3f
2015-07-27 16:41:44 +09:00
Erik Kline
f0927733a3
am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
...
* commit '8c54a8e8c7f40037ac871d27e0a800e9c271fae9':
Change to connectivitycheck.gstatic.com
2015-07-27 05:23:23 +00:00
Erik Kline
8c54a8e8c7
am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
...
* commit 'a7bdace2627cb4cd55ac7c182d9e093b3a1ffb7b':
Change to connectivitycheck.gstatic.com
2015-07-27 04:32:19 +00:00
Erik Kline
a7bdace262
Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
2015-07-27 02:35:09 +00:00
Jorim Jaggi
5b65bb1bc7
am b6c6e45a: am f3255489: Fix ambient display
...
* commit 'b6c6e45a04a52a7ece08dd63636b1f71e7322653':
Fix ambient display
2015-07-25 15:54:50 +00:00
Adam Lesinski
d92a39574e
am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
...
* commit 'eee604ff8bd76bc2a4f00b6612e92047bfe95d80':
BatteryStats: Decode wakeup reasons in Java
2015-07-25 15:54:43 +00:00
John Reck
aad38f60f8
am 50aded0c: am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
...
* commit '50aded0c8668b60953237813560b1cca8ccf6b66':
Use process state to filter >= UI_HIDDEN
2015-07-25 15:53:39 +00:00
Jorim Jaggi
b6c6e45a04
am f3255489: Fix ambient display
...
* commit 'f325548992d449a2da564216191edb5ad2773bfd':
Fix ambient display
2015-07-25 01:54:21 +00:00
Jorim Jaggi
f325548992
Fix ambient display
...
Due to a refactoring for touch, wake and unlock for fingerprint
devices PhoneWindowManager now waits for Keyguard to draw its first
frame in all cases, including when screen turns on for pulsing.
However, since in this case the device is not awake, we need to check
for screen on instead of awakeness when proceeding with the wake-up
sequence. Without this change, screen on was blocked forever in the
pulsing case.
Bug: 22605235
Change-Id: Ib6089fd14b673e62347f2c9108d9a6783caa26b7
2015-07-25 01:42:29 +00:00
Adam Lesinski
eee604ff8b
am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
...
* commit '2a493532e6ce44fd6dec07a22c3a016de80ccc46':
BatteryStats: Decode wakeup reasons in Java
2015-07-25 01:26:44 +00:00
Adam Lesinski
2a493532e6
Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
2015-07-25 01:14:07 +00:00
John Reck
50aded0c86
am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
...
* commit '68fbd6a4968eb6e5f3d74f471387c5e62981fba2':
Use process state to filter >= UI_HIDDEN
2015-07-25 00:53:01 +00:00
Fyodor Kupolov
ce09a024f8
Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
...
Call to checkPermission(ACCESS_COARSE_LOCATION) should return
PERMISSION_GRANTED, when package only has ACCESS_FINE_LOCATION permission
Bug: 21852542
Change-Id: I53fe2945784213693f59e7bfccc524276ea8c189
2015-07-24 16:54:15 -07:00
Adam Lesinski
515702c29e
BatteryStats: Decode wakeup reasons in Java
...
Wakeup reasons come from drivers and sometimes are malformed UTF-8.
Decode them in Java so we can easily replace malformed characters
and still have user visible strings.
Bug:22368519
Change-Id: Ifade1a7fcdf6545e7e344d74390200c329430e14
2015-07-24 12:56:37 -07:00
John Reck
9ba771bbcb
am c2db381e: am 6b66a4a8: use findProcess instead of getProcess
...
* commit 'c2db381ecc4b54e9f52f9d675336db86cad96b14':
use findProcess instead of getProcess
2015-07-24 03:12:45 +00:00
Svetoslav Ganov
7bda4b9672
am 79355545: am 28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev
...
* commit '793555452ad44c006657b6c511c5c6068c0317ba':
Keep default permission grants uninstalling a sys package upgrade
2015-07-24 03:12:04 +00:00
Yohei Yukawa
646f9da9e2
am 4ff108f0: am 0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev
...
* commit '4ff108f0828f9c830aa93a3269c071522dae40ad':
Don't rely on broadcast intent for waking up input method.
2015-07-24 03:11:42 +00:00
Svetoslav Ganov
3fce45b661
am 54f1db79: am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
...
* commit '54f1db793264192017c588b618c7d4cb311482c0':
Reset permissions and app links when clearing app preferences - framework
2015-07-24 03:10:58 +00:00
Svetoslav Ganov
dd12420e27
am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
...
* commit 'f9044dcc2752be620b8f6b0a6ead0e7fef9b2c10':
Shut down UiAutomationConnection without a lock held
2015-07-24 03:10:52 +00:00
Tim Kilbourn
1c78d46788
am 115189fd: am cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev
...
* commit '115189fd6bd3e2e357623e19e8f755bd6a3d5a68':
Properly synchronize interactivity state.
2015-07-24 03:10:31 +00:00
Wenchao Tong
1770cb419e
am 25975f1b: am bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev
...
* commit '25975f1b223e63e31b70431c069cf1e8e296b0c4':
Ignore the active network scorer when checking for idleness
2015-07-24 03:08:43 +00:00
Amith Yamasani
448af8855e
am 5a18b4bf: am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev
...
* commit '5a18b4bfe2cf30df2e18047c155fecc6433ed52c':
Avoid a deadlock between PMS and AppOpsService
2015-07-24 03:08:30 +00:00