Commit Graph

4854 Commits

Author SHA1 Message Date
Chris Wren
816f07bce0 am 93f3fc87: Merge "add metrics to assistant" into mnc-dev
* commit '93f3fc876639cd23ff176cba2e1f8f08df6f3fb5':
  add metrics to assistant
2015-08-06 19:25:28 +00:00
Chris Wren
a35c96eb90 add metrics to assistant
long press
  screenshot enabled
  context enabled

Bug: 22949579
Change-Id: Iac178207fa7149cda03c9a817a0d1450e46e1c59
2015-08-06 15:11:42 -04:00
Mitchell Wills
701a36d594 am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev
* commit 'bce3eb22afcd57b7f1bdde26030f8c44bb885a4b':
  Fix incorrect default wifi power draw values
2015-08-05 17:09:00 +00:00
Mitchell Wills
bce3eb22af Merge "Fix incorrect default wifi power draw values" into mnc-dev 2015-08-05 16:59:23 +00:00
Mitchell Wills
bb4fd9009e am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit '385dfd349ff773c499859ee44552995e9c25759c':
  Charge apps for wifi tx time while scanning
2015-08-04 22:01:35 +00:00
Mitchell Wills
385dfd349f Merge "Charge apps for wifi tx time while scanning" into mnc-dev 2015-08-04 21:55:46 +00:00
Mitchell Wills
f901649bd9 Charge apps for wifi tx time while scanning
Bug: 22955562
Change-Id: Ie2c6ab65e7b592272e1cad120ac606fcfd6ea677
2015-08-04 14:47:01 -07:00
Mitchell Wills
083e1d9e4b Fix incorrect default wifi power draw values
Bug: 22848679
Change-Id: Ief4e3e05b051b93efbe30fdc8903cce6765d2ed8
2015-08-04 10:28:16 -07:00
Adam Lesinski
e8585a23de am 59d72c86: Merge "BatteryStats: Add debug logging to find source of b/22716723" into mnc-dev
* commit '59d72c86269f4d0c914c233d16a9bf00f0440df8':
  BatteryStats: Add debug logging to find source of b/22716723
2015-08-04 03:10:51 +00:00
Adam Lesinski
fbabe7dd6a BatteryStats: Add debug logging to find source of b/22716723
Bug:22716723
Change-Id: I97b940b702666b393555622d034e1c694b1e346a
2015-08-03 15:45:13 -07:00
Alan Viverette
5be6cc6db9 am ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit 'ef3f58e59ba44b2679e98ccb46d588eba2c99cac':
  Make ResolverDrawerLayout look like a ScrollView to accessibility
2015-08-03 20:28:59 +00:00
Alan Viverette
7b77b284de am e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit 'e76bf46ab9d59592a06fbb3fcff826a50d548b9f':
  Add badge content description to TargetInfo, use in ResolverActivity
2015-08-03 20:28:51 +00:00
Alan Viverette
ef3f58e59b Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev 2015-08-03 20:17:57 +00:00
Alan Viverette
e76bf46ab9 Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev 2015-08-03 20:17:31 +00:00
Alan Viverette
1ff29f2d56 Make ResolverDrawerLayout look like a ScrollView to accessibility
Disable accessibility focus on the layout itself and expose the class
name as ScrollView so that we can get auto-scroll working until we have
first-class support for specifying automatic scrolling behavior.

Bug: 22667764
Change-Id: I9b97e40f16038046898e5b56b935a61db9073ac6
2015-08-03 10:01:23 -04:00
Svetoslav Ganov
52f805e4b1 am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev
* commit '8dbd48485044b1ab25fb8fb5e8e9b9772a3478c4':
  Add per UID control to app ops.
2015-08-01 02:37:32 +00:00
Svetoslav Ganov
8dbd484850 Merge "Add per UID control to app ops." into mnc-dev 2015-08-01 02:28:02 +00:00
Svet Ganov
2af5708ab0 Add per UID control to app ops.
The app ops mananger service maintains a mapping from UID to
a list of packages where each package is mapped to a list of
non-default app op states (default states are inferred and
not stored). Hence, specifying the app op state for a UID
requires setting the app op for each package in the shared
UID.

This is problematic when installing new packages if there
is a non-default app op policy set for another already
installed package in the same UID as the app op for the new
package has to be updated to be in sync. The package installer
cannot do this as it is in another process and the app op
update will not be atomic. Therefore, the app ops manager
service has to support specifying app op policy on a per
UID basis.

We now have a UID state object that contains the per package
non-default app op states as well as the per uid non-default
app op states. If there is a UID policy specified then it
takes precedence over the per package one. Even further,
changing the uid policy updates the package policies in this
UID if the state is non-default. Changing a package app op
state also updates the app op state for the whole UID if
the per UID policy for this op is non-default. Clearing the
app op state for a package, clears the policy for the UID
as well.

bug:22802981

Change-Id: I78044906d9fcc6066abf07e706c2c88f3397d293
2015-07-31 17:45:27 -07:00
Yusuke Sato
c2369c5301 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
2015-07-31 23:34:06 +00:00
Alan Viverette
ce5d92c313 Add badge content description to TargetInfo, use in ResolverActivity
Bug: 22667344
Change-Id: Iee241b9179c74a15b1c635cf90d2f96f6f7b31cd
2015-07-31 16:46:56 -04:00
Dianne Hackborn
f2269f0454 Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-31 17:19:03 +00:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Yusuke Sato
705ffd1efe Distinguish user-requested shutdown from power-related ones
With this patch, when the user requested shutdown,
PowerManagerService sets sys.powerctl is set to
"shutdown,userrequested", and init runs fsck on shutdown.

When shutdown is triggered due to a low power state etc.,
the service sets the property to "shutdown,", and init
immediately shuts down the system without running the
command.

This is a follow-up CL for http://r.android.com/158525.

Bug: 21853106
Change-Id: Iae72990130fe9aa479c802f77301438190dbbfb3
2015-07-30 23:47:13 -07:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
Adrian Roos
7840685465 am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit 'e2cd84196e1266200f906b5d721640217fc2e6f9':
  Fix pattern lock for accessibility
2015-07-29 21:37:08 +00:00
Adrian Roos
e2cd84196e Merge "Fix pattern lock for accessibility" into mnc-dev 2015-07-29 21:23:25 +00:00
Adrian Roos
d2def94639 Fix pattern lock for accessibility
- remove the content description in Keyguard
- only show virtual views when pattern is in progress
- add a content description when the pattern is not in progress

Bug: 22646748
Change-Id: Id32a37c4c74c82b547cee8861b2856fa0a08c41c
2015-07-29 14:13:53 -07:00
Chris Wren
2eeb47c6a1 am 1bd310e1: Merge "import more metrics enums" into mnc-dev
* commit '1bd310e18c50d4fd81207a3e2fe61cc694ee7607':
  import more metrics enums
2015-07-29 15:18:33 +00:00
Chris Wren
1bd310e18c Merge "import more metrics enums" into mnc-dev 2015-07-29 14:57:15 +00:00
Adam Lesinski
9466fa27b1 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
2015-07-29 00:44:05 +00:00
Adam Lesinski
c96e6f1993 Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 2015-07-29 00:34:38 +00:00
Adam Lesinski
c691d3ccf4 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
2015-07-28 17:11:29 -07:00
Jorim Jaggi
66c3fc3854 am 0d210f63: Animation for touch, wake and unlock
* commit '0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
  Animation for touch, wake and unlock
2015-07-28 23:22:59 +00:00
Jorim Jaggi
0d210f6395 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
2015-07-28 23:02:54 +00:00
Dianne Hackborn
8b679bfa36 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
2015-07-28 19:58:52 +00:00
Dianne Hackborn
57dd737443 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
2015-07-28 12:52:11 -07:00
Chris Wren
de061b8175 import more metrics enums
sysui tuners
  inactive apps

Bug: 21114836
Change-Id: I43c4b97c6998374b39d7346bae1e1eca3d761543
2015-07-28 16:55:19 +00:00
Jorim Jaggi
d315926aec am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
* commit '9e49b5d679672ea4a64382f9a36663c73603961b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
2015-07-27 19:22:02 +00:00
Jorim Jaggi
9e49b5d679 Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 2015-07-27 18:55:29 +00:00
Phil Burk
a37a1b006e am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
* commit 'fef1b28917df9a23b28ec5e5e7f83097b8574550':
  MIDI: fix running status parser
2015-07-27 17:57:01 +00:00
Phil Burk
fef1b28917 Merge "MIDI: fix running status parser" into mnc-dev 2015-07-27 17:15:04 +00:00
Phil Burk
98e94aead7 MIDI: fix running status parser
Running status was being parsed incorrectly.
This could cause stuck notes or exceptions when sending running
status messages to a Bluetooth MIDI device.

Bug: 22689606
Change-Id: I9f7abce9758927be587eead9614617d5b0076353
Signed-off-by: Phil Burk <philburk@google.com>
2015-07-24 14:11:01 -07:00
Dianne Hackborn
da56bea428 am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev
* commit '4a368659baf8f86b522a6b2679bb2b2a9fd0a997':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
2015-07-23 18:59:08 +00:00
Adam Lesinski
cac798a918 am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
* commit '6625047a3ba26ecc52bb2757eb7576027949e435':
  BatteryStats: Use English locale for dump and checkin data
2015-07-23 18:57:52 +00:00
Jason Monk
5669e4035d am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
* commit '4fc1b707442451f4a826929fc7e72967d443c73f':
  Add metrics to tuner
  Move tuner enable point to QS
2015-07-23 18:56:53 +00:00
Dianne Hackborn
4a368659ba Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 2015-07-23 00:56:19 +00:00
Dianne Hackborn
d48954fb6b Fix issue #22414729: Checkin start clock time is different from hsitory reset time
There was a mistake in the code that was supposed to recover from the
initial time on a new device being bad until the real time ultimately
gets set, which was causing us to update the start clock time every time
there was a time change (instead of just when the original start time
appears bad).

Rework all of this, so we now count the start time as bad if it is more
than one year before the current time, only modifying it in that case.
Also when modifying it, adjust the time we set it to take in to account
how much realtime has actually elapsed so far in the battery stats.

Change-Id: If74bd711d9b7618c8f6148a9935c452aaaa7e257
2015-07-22 17:26:32 -07:00
Jorim Jaggi
613f55fbbb Move PIN/Pattern appear animation to RenderThread (1/2)
Bug: 22205322
Change-Id: I253f20a397ab89cb78254338a0254619232d7300
2015-07-22 15:23:52 -07:00
Adam Lesinski
6625047a3b Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 2015-07-22 21:28:37 +00:00
Adam Lesinski
8a83c61497 BatteryStats: Use English locale for dump and checkin data
Dump and checkin data is read by tools that expect a consistent
locale.

Bug:22357316
Change-Id: I0d7e6e771c3512278efca7579fe9c4b79b560e28
2015-07-22 13:50:23 -07:00