OSDN Git Service
Geoff Mendal [Wed, 29 Jul 2015 14:04:52 +0000 (14:04 +0000)]
am
f5016cd7: (-s ours) Import translations. DO NOT MERGE
* commit '
f5016cd7f5dae5242edfe2b91156c8f22ae4330d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 13:43:43 +0000 (06:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief1b2813d780945621684d6d58403feac34fa498
Auto-generated-cl: translation import
Narayan Kamath [Wed, 29 Jul 2015 10:31:43 +0000 (10:31 +0000)]
am
ff01fcec: am
7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev
* commit '
ff01fcecf5843104ba5ce835d70aae2ae8483616':
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
Narayan Kamath [Wed, 29 Jul 2015 10:08:04 +0000 (10:08 +0000)]
am
7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev
* commit '
7157c2ca81cb2c942a1e94cf1a0344babf6a8bd6':
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
Martijn Coenen [Wed, 29 Jul 2015 10:06:14 +0000 (10:06 +0000)]
am
c16fd06a: am
50184147: Merge "Resource for setting default NFC payment component." into mnc-dev
* commit '
c16fd06ae462f79d3f13eb5e29db3227c0e64985':
Resource for setting default NFC payment component.
Narayan Kamath [Wed, 29 Jul 2015 09:41:22 +0000 (09:41 +0000)]
Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev
Narayan Kamath [Wed, 29 Jul 2015 09:35:46 +0000 (09:35 +0000)]
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
This reverts commit
5967ddbf05f146bdb6744207e3daed1aa76fc637.
Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56
Martijn Coenen [Wed, 29 Jul 2015 08:10:18 +0000 (08:10 +0000)]
am
50184147: Merge "Resource for setting default NFC payment component." into mnc-dev
* commit '
50184147fc35d5d441ae24661531819cc6cc025f':
Resource for setting default NFC payment component.
Martijn Coenen [Wed, 29 Jul 2015 07:54:29 +0000 (07:54 +0000)]
Merge "Resource for setting default NFC payment component." into mnc-dev
Shawn Willden [Wed, 29 Jul 2015 04:39:54 +0000 (04:39 +0000)]
am
48b13a58: am
a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev
* commit '
48b13a58bba59c548d835a2d646e1da6fad6473d':
Keymaster digest/padding NONE no longer means ANY.
Shawn Willden [Wed, 29 Jul 2015 04:17:51 +0000 (04:17 +0000)]
am
a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev
* commit '
a7b4d6dc1017bcb2e6144fa5eb9d2ed07093ffa8':
Keymaster digest/padding NONE no longer means ANY.
Shawn Willden [Wed, 29 Jul 2015 03:58:39 +0000 (03:58 +0000)]
Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev
Jeff Sharkey [Wed, 29 Jul 2015 02:01:13 +0000 (02:01 +0000)]
am
acfaa947: am
b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev
* commit '
acfaa947f45ce1ea8140c2dc52d5f750dbc0a94d':
Give secondary users read-only physical cards.
Jeff Sharkey [Wed, 29 Jul 2015 01:34:42 +0000 (01:34 +0000)]
am
b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev
* commit '
b8040265dd0d5a2a96e0850623647dad2f528db1':
Give secondary users read-only physical cards.
Ronghua Wu [Wed, 29 Jul 2015 01:27:09 +0000 (01:27 +0000)]
am
9090d3c3: am
02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit '
9090d3c3d46f7c52fe744ddcd104578b6a5cc742':
media: fix estimateFrameRatesFor to use correct ratio
Dianne Hackborn [Wed, 29 Jul 2015 01:27:05 +0000 (01:27 +0000)]
am
b7eb3901: am
b310c894: Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
* commit '
b7eb3901563f44b0a5997a6586a222c662e22220':
Fix issue #
22802691: APR: NPE in ActivityRecord
Dianne Hackborn [Wed, 29 Jul 2015 01:27:00 +0000 (01:27 +0000)]
am
779ccbe3: am
5b009d52: Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
* commit '
779ccbe3cb556ab00ad04f2f2317e8ad4bfc8f2c':
Fix issue #
22802617: APR: spurious wtf when restarting a persistent process
Dianne Hackborn [Wed, 29 Jul 2015 01:26:55 +0000 (01:26 +0000)]
am
1b391d64: am
b492ced8: Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
* commit '
1b391d6499c161ded570ef45ad3083458529723d':
Fix issue #
22802782: APR: NPE in package manager with bad intent data
Jeff Sharkey [Wed, 29 Jul 2015 01:19:43 +0000 (01:19 +0000)]
Merge "Give secondary users read-only physical cards." into mnc-dev
Adam Lesinski [Wed, 29 Jul 2015 01:02:09 +0000 (01:02 +0000)]
am
9aae8d9c: am
c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '
9aae8d9c1b2219f9d98ac07b1fe04ef62c4cacb9':
BatteryStats: Use proper power calculator when energy data is received
Jason Monk [Wed, 29 Jul 2015 01:02:04 +0000 (01:02 +0000)]
am
ea0ad979: am
fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev
* commit '
ea0ad97949706d63e9fc0088e1e851d2dc91a2c1':
Add sizes to SysUI tests
Aravind Akella [Wed, 29 Jul 2015 01:01:59 +0000 (01:01 +0000)]
am
822456eb: am
15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
* commit '
822456ebe33ae366f5488794bdef68337d22974d':
Call getInstanceForPackage instead of creating a new SensorManager instance.
Ronghua Wu [Wed, 29 Jul 2015 01:00:50 +0000 (01:00 +0000)]
am
02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit '
02022b70bef7d6964bc8043385531d1aa97fb15b':
media: fix estimateFrameRatesFor to use correct ratio
Dianne Hackborn [Wed, 29 Jul 2015 01:00:45 +0000 (01:00 +0000)]
am
b310c894: Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
* commit '
b310c8945330a0a94abae34451e0bdc227f52035':
Fix issue #
22802691: APR: NPE in ActivityRecord
Dianne Hackborn [Wed, 29 Jul 2015 01:00:41 +0000 (01:00 +0000)]
am
5b009d52: Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
* commit '
5b009d523c6ad89f946e4a19f3fdba3c63bcf1f5':
Fix issue #
22802617: APR: spurious wtf when restarting a persistent process
Dianne Hackborn [Wed, 29 Jul 2015 01:00:37 +0000 (01:00 +0000)]
am
b492ced8: Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
* commit '
b492ced89eaf38b2b9962dbfae2435dd242abf19':
Fix issue #
22802782: APR: NPE in package manager with bad intent data
Ronghua Wu [Wed, 29 Jul 2015 00:53:12 +0000 (00:53 +0000)]
Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:47:33 +0000 (00:47 +0000)]
Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:46:20 +0000 (00:46 +0000)]
Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:45:18 +0000 (00:45 +0000)]
Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
Adam Lesinski [Wed, 29 Jul 2015 00:41:03 +0000 (00:41 +0000)]
am
c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '
c96e6f19937ac36c8147a52863a43b35895aeb0b':
BatteryStats: Use proper power calculator when energy data is received
Jason Monk [Wed, 29 Jul 2015 00:40:58 +0000 (00:40 +0000)]
am
fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev
* commit '
fbcbad138d1b4c55e86ff671821b4feb7fc48f50':
Add sizes to SysUI tests
Aravind Akella [Wed, 29 Jul 2015 00:40:53 +0000 (00:40 +0000)]
am
15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
* commit '
15938235d25a879ebb000cb3671fd75cb092e981':
Call getInstanceForPackage instead of creating a new SensorManager instance.
Dianne Hackborn [Wed, 29 Jul 2015 00:40:06 +0000 (17:40 -0700)]
Fix issue #
22802691: APR: NPE in ActivityRecord
Change-Id: I8d6265589c97edc7a1d6c63f98c7252a439e62da
Adam Lesinski [Wed, 29 Jul 2015 00:34:38 +0000 (00:34 +0000)]
Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
Jason Monk [Wed, 29 Jul 2015 00:31:16 +0000 (00:31 +0000)]
Merge "Add sizes to SysUI tests" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:30:59 +0000 (17:30 -0700)]
Fix issue #
22802782: APR: NPE in package manager with bad intent data
If they pass in a null data for the intent matching, don't throw up
on it, just consider it to not match.
Change-Id: I30b6af49989eb8b5c2e585ce5d96416f0daff3a8
Dianne Hackborn [Wed, 29 Jul 2015 00:22:46 +0000 (17:22 -0700)]
Fix issue #
22802617: APR: spurious wtf when restarting a persistent process
Just don't do a wtf here, it isn't really wrong (though it isn't really
right, but at this point in a release it is right enough!).
Change-Id: Ic38a2e27556224cf8868f1fa18b4810929d67fcc
Aravind Akella [Wed, 29 Jul 2015 00:21:18 +0000 (00:21 +0000)]
Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
Adam Lesinski [Wed, 29 Jul 2015 00:11:29 +0000 (17:11 -0700)]
BatteryStats: Use proper power calculator when energy data is received
We check for the presence of energy data when determining whether to use
the WiFiPowerCalculator or WiFiPowerEstimator. Since we can receive this data
later, we need to switch to the WiFiPowerCalculator if we weren't using it before.
We can't ask the hardware if it supports energy data because that would involve a call into
WiFiManagerService, which can cause a deadlock if we are holding the BatteryStatsService lock
while using this class.
Bug:
22776010
Change-Id: Id685d487c56595eab1d382f49da9417a423bb517
Jorim Jaggi [Tue, 28 Jul 2015 23:43:46 +0000 (23:43 +0000)]
am
353fe1c6: am
0d210f63: Animation for touch, wake and unlock
* commit '
353fe1c665e0065d4c8eecdf41c22f1a1a607f2c':
Animation for touch, wake and unlock
Chris Tate [Tue, 28 Jul 2015 23:43:42 +0000 (23:43 +0000)]
am
403e22b9: am
751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev
* commit '
403e22b97dc3763e55bf2fb9ab0d681e7ee6c828':
Don't redundantly call transport.finishRestore()
Zach Johnson [Tue, 28 Jul 2015 23:23:38 +0000 (23:23 +0000)]
am
bd388372: am
5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
* commit '
bd388372a81472aa3a5f40e57f9f541f85931495':
Add filter for personal apps that are not disabled until first use
Jorim Jaggi [Tue, 28 Jul 2015 23:19:39 +0000 (23:19 +0000)]
am
0d210f63: Animation for touch, wake and unlock
* commit '
0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
Animation for touch, wake and unlock
Chris Tate [Tue, 28 Jul 2015 23:19:34 +0000 (23:19 +0000)]
am
751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev
* commit '
751a96a040ada09199ca3356d9a515ec090d1237':
Don't redundantly call transport.finishRestore()
Jorim Jaggi [Fri, 10 Jul 2015 21:24:44 +0000 (14:24 -0700)]
Animation for touch, wake and unlock
- Add callback to inform SysUI when the screen has been unblocked
and turned on.
- Cleanup inconsistent messaging about device interactive/screen on
and off.
- Add callbacks to inform SysUI about screen states
- Implement a quick fade for the scrim after touch, wake, and unlock.
First, start with a black scrim on top of everything, and then fade
it out.
- Make sure we play the normal unlock animation when device is pulsing
- Override navigation bar animations for touch, wake and unlock: Fade
in the same manner as the scrim.
Bug:
22571198
Bug:
21855614
Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c
Zach Johnson [Tue, 28 Jul 2015 22:58:11 +0000 (22:58 +0000)]
am
5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
* commit '
5faa033615dcb4297fcb6a81828099285364942d':
Add filter for personal apps that are not disabled until first use
Todd Kennedy [Tue, 28 Jul 2015 22:58:03 +0000 (22:58 +0000)]
am
673fed99: am
f2c616ed: Merge "Partially revert package freezing" into mnc-dev
* commit '
673fed99b931ce0efc17b0e549e7842e4775154c':
Partially revert package freezing
Chris Tate [Tue, 28 Jul 2015 22:56:41 +0000 (22:56 +0000)]
Merge "Don't redundantly call transport.finishRestore()" into mnc-dev
Todd Kennedy [Tue, 28 Jul 2015 22:37:28 +0000 (22:37 +0000)]
am
f2c616ed: Merge "Partially revert package freezing" into mnc-dev
* commit '
f2c616ed02aee3b9a9025caf288aadbf22cfd046':
Partially revert package freezing
Zach Johnson [Tue, 28 Jul 2015 22:36:30 +0000 (22:36 +0000)]
Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
Todd Kennedy [Tue, 28 Jul 2015 22:15:43 +0000 (22:15 +0000)]
Merge "Partially revert package freezing" into mnc-dev
Ronghua Wu [Tue, 28 Jul 2015 22:05:51 +0000 (15:05 -0700)]
media: fix estimateFrameRatesFor to use correct ratio
Bug:
22504214
Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
Jeff Sharkey [Tue, 28 Jul 2015 17:49:47 +0000 (10:49 -0700)]
Give secondary users read-only physical cards.
Long ago, we mounted secondary physical cards as readable by all
users on the device, which enabled the use-case of loading media on
a card and viewing it from all users.
More recently, we started giving write access to these secondary
physical cards, but this created a one-directional channel for
communication across user boundaries; something that CDD disallows.
This change is designed to give us the best of both worlds: the
package-specific directories are writable for the user that mounted
the card, but access to those "Android" directories are blocked for
all other users. Other users remain able to read content elsewhere
on the card.
Bug:
22787184
Change-Id: Ied8c98995fec1b7b50ff7d930550feabb4398582
Christopher Tate [Tue, 28 Jul 2015 20:59:35 +0000 (13:59 -0700)]
Don't redundantly call transport.finishRestore()
The RestoreSession is no longer responsible for calling finishRestore();
that happens as part of tidying up after running the restore itself,
even in failure cases.
Bug
22640096
Change-Id: I0be52af2ae8c2c1ac685e9904ccb8120f7fcf522
Tyler Gunn [Tue, 28 Jul 2015 20:53:16 +0000 (20:53 +0000)]
am
3d83e744: am
bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev
* commit '
3d83e74449acdf8195e0a4f7f82ad79fb3f891dd':
Add "Call subject" capability to phone accounts.
Todd Kennedy [Tue, 28 Jul 2015 20:52:49 +0000 (13:52 -0700)]
Partially revert package freezing
On the Nexus Player, upgrading the launcher would cause multiple, simultaneous
processes to be running. In order to prevent this regression, revert the portion
of ag/682591 dealing with package upgrades.
Bug:
21123444
Change-Id: I7a4cf98c7e28fc9893b1c0358d3a98702d94c039
Tyler Gunn [Tue, 28 Jul 2015 20:31:05 +0000 (20:31 +0000)]
am
bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev
* commit '
bdbec480e8598bd959a2fc047cfad8b72c8a645b':
Add "Call subject" capability to phone accounts.
Dianne Hackborn [Tue, 28 Jul 2015 20:22:50 +0000 (20:22 +0000)]
am
108f5493: am
3551a59b: Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '
108f5493edb50201d3dd2ba32a19db93edad8800':
Work on issue #
21516866: Implement voice interaction in ResolverActivity
Jorim Jaggi [Tue, 28 Jul 2015 20:22:46 +0000 (20:22 +0000)]
am
359f1e91: am
850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev
* commit '
359f1e91e5715644b0da4f01e58c994a9e4598aa':
Don't use screenshot if structure is disabled (1/2)
Robert Greenwalt [Tue, 28 Jul 2015 20:22:41 +0000 (20:22 +0000)]
am
d6162cf2: am
b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit '
d6162cf244eab3a3c77a011ffe75dd04a787b951':
Un-remove legacy ConnectivityManager API.
Tyler Gunn [Tue, 28 Jul 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Add "Call subject" capability to phone accounts." into mnc-dev
Dianne Hackborn [Tue, 28 Jul 2015 19:57:40 +0000 (19:57 +0000)]
am
3551a59b: Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '
3551a59b277fd4dc924f48116c153a50fb0913eb':
Work on issue #
21516866: Implement voice interaction in ResolverActivity
Jorim Jaggi [Tue, 28 Jul 2015 19:57:35 +0000 (19:57 +0000)]
am
850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev
* commit '
850dd6907f87782474d4bc128c8c0137a9cc85fc':
Don't use screenshot if structure is disabled (1/2)
Robert Greenwalt [Tue, 28 Jul 2015 19:57:31 +0000 (19:57 +0000)]
am
b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit '
b3c93c5f4256a1da1a8020abe5812a841b67667a':
Un-remove legacy ConnectivityManager API.
Dianne Hackborn [Tue, 28 Jul 2015 19:52:53 +0000 (19:52 +0000)]
Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
Dianne Hackborn [Tue, 28 Jul 2015 01:11:14 +0000 (18:11 -0700)]
Work on issue #
21516866: Implement voice interaction in ResolverActivity
The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.
This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.
Also added some debug help, having activity print the state of the
voice interactor.
Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5
Jorim Jaggi [Tue, 28 Jul 2015 19:49:44 +0000 (19:49 +0000)]
Merge "Don't use screenshot if structure is disabled (1/2)" into mnc-dev
Robert Greenwalt [Tue, 28 Jul 2015 19:39:48 +0000 (19:39 +0000)]
Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
Alex Klyubin [Tue, 21 Jul 2015 20:38:48 +0000 (13:38 -0700)]
Keymaster digest/padding NONE no longer means ANY.
This adjusts the public API documentation to no longer say that
digest/padding NONE means any digest/padding. This also changes the
implementation of legacy key generation and import to explicitly
list which digests/paddings the generated/imported key is authorized
for. Previously, such keys were simply authorized for digest NONE and
padding NONE.
Bug:
22556114
Change-Id: Id02d9450a07de16ccb795b76b6de0006dd49dcca
Jason Monk [Tue, 28 Jul 2015 18:41:51 +0000 (18:41 +0000)]
am
52fbf583: am
35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev
* commit '
52fbf5833992195c790114ad1ef9ab5883d1b2b2':
Fix network name not showing in QS sometimes
Robert Greenwalt [Tue, 28 Jul 2015 18:41:31 +0000 (11:41 -0700)]
Un-remove legacy ConnectivityManager API.
These were @removed too soon. We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.
bug:
22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
Jason Monk [Tue, 28 Jul 2015 18:22:30 +0000 (18:22 +0000)]
am
35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev
* commit '
350662197542d406df58aa65afddc9e23f9309d3':
Fix network name not showing in QS sometimes
Jason Monk [Tue, 28 Jul 2015 18:05:49 +0000 (18:05 +0000)]
Merge "Fix network name not showing in QS sometimes" into mnc-dev
Tyler Gunn [Tue, 28 Jul 2015 15:24:05 +0000 (15:24 +0000)]
am
c5c7987f: Merge "Add child_address call extra." into mnc-dr-dev
* commit '
c5c7987feaec7cf85b62e0c6f4048396482a729e':
Add child_address call extra.
Tyler Gunn [Tue, 28 Jul 2015 15:07:03 +0000 (15:07 +0000)]
Merge "Add child_address call extra." into mnc-dr-dev
Jason Monk [Tue, 28 Jul 2015 13:18:08 +0000 (09:18 -0400)]
Add sizes to SysUI tests
Change-Id: I27e4a60e2658d3a5db32cdeb73bd0a031865ce86
Adam Lesinski [Tue, 28 Jul 2015 01:33:08 +0000 (01:33 +0000)]
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
Lorenzo Colitti [Tue, 28 Jul 2015 01:33:03 +0000 (01:33 +0000)]
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.
Filip Gruszczynski [Tue, 28 Jul 2015 01:22:56 +0000 (01:22 +0000)]
Merge "Don't animate burn-in return when it wasn't applied." into cw-e-dev
Filip Gruszczynski [Mon, 27 Jul 2015 22:28:29 +0000 (15:28 -0700)]
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
Adam Lesinski [Tue, 28 Jul 2015 01:20:21 +0000 (01:20 +0000)]
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
Lorenzo Colitti [Tue, 28 Jul 2015 01:20:16 +0000 (01:20 +0000)]
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.
Jorim Jaggi [Tue, 28 Jul 2015 01:06:28 +0000 (01:06 +0000)]
am
7d07aff8: am
965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev
* commit '
7d07aff85e41a95ce4743d3b371935c9f21813ab':
Allow assist gesture when notification shade is expanded
Adam Lesinski [Tue, 28 Jul 2015 01:06:14 +0000 (01:06 +0000)]
Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev
Lorenzo Colitti [Tue, 28 Jul 2015 01:03:44 +0000 (01:03 +0000)]
Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* changes:
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
Jorim Jaggi [Tue, 28 Jul 2015 00:50:49 +0000 (00:50 +0000)]
am
965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev
* commit '
965bab2bae4198deaa929c8f36e44c561fb2c72c':
Allow assist gesture when notification shade is expanded
Jorim Jaggi [Tue, 28 Jul 2015 00:48:42 +0000 (17:48 -0700)]
Don't use screenshot if structure is disabled (1/2)
Bug:
22674955
Change-Id: I694bb8dbb578da9d729414c7f2947ba4c15651e3
Jorim Jaggi [Tue, 28 Jul 2015 00:36:14 +0000 (00:36 +0000)]
Merge "Allow assist gesture when notification shade is expanded" into mnc-dev
Mady Mellor [Tue, 28 Jul 2015 00:31:14 +0000 (00:31 +0000)]
am
9659297d: am
beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev
* commit '
9659297d9c26a8a2fdfa3c0e23b92e0fb72398ca':
Allow text selection handles to scroll horizontally
Ruben Brunk [Tue, 28 Jul 2015 00:31:09 +0000 (00:31 +0000)]
am
2384e2a4: am
ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev
* commit '
2384e2a4b96eb64f1d205a0f0f46c7f3aa1ca79f':
Update DngCreator to correctly handle array sizes.
Adam Lesinski [Tue, 28 Jul 2015 00:31:04 +0000 (00:31 +0000)]
am
e1e94c7d: am
fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev
* commit '
e1e94c7d58a176c3250438d4fdd35ef552cfe92a':
AAPT: Fix printing of resource configurations
Filip Gruszczynski [Tue, 28 Jul 2015 00:30:59 +0000 (00:30 +0000)]
am
3bb0bb3a: am
f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev
* commit '
3bb0bb3afc46f88e4372f6912bd4c18547de5a78':
Remove unnecessary relayout call from traversals.
Mady Mellor [Tue, 28 Jul 2015 00:22:32 +0000 (00:22 +0000)]
am
beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev
* commit '
beb6e66817e084c8a1ac92ecaeb6f0c73d11cc49':
Allow text selection handles to scroll horizontally
Ruben Brunk [Tue, 28 Jul 2015 00:22:28 +0000 (00:22 +0000)]
am
ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev
* commit '
ee2a16b551a2203deda6250836d8e75a9a046b7e':
Update DngCreator to correctly handle array sizes.
Adam Lesinski [Tue, 28 Jul 2015 00:19:23 +0000 (17:19 -0700)]
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
Mady Mellor [Tue, 28 Jul 2015 00:16:49 +0000 (00:16 +0000)]
Merge "Allow text selection handles to scroll horizontally" into mnc-dev
Adam Lesinski [Tue, 28 Jul 2015 00:16:38 +0000 (00:16 +0000)]
am
fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev
* commit '
fd44b56d599bc6c6e7397dcdfaa6d613805a88cb':
AAPT: Fix printing of resource configurations
Filip Gruszczynski [Tue, 28 Jul 2015 00:16:34 +0000 (00:16 +0000)]
am
f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev
* commit '
f63800ddcc68944532f7842b6ebf80898147ed4d':
Remove unnecessary relayout call from traversals.
Ruben Brunk [Tue, 28 Jul 2015 00:11:36 +0000 (00:11 +0000)]
Merge "Update DngCreator to correctly handle array sizes." into mnc-dev