Commit Graph

5130 Commits

Author SHA1 Message Date
Mitchell Wills
008cde4da5 am c1d02417: am d9b729c7: am 992ae880: am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit 'c1d02417bbd4df7b3b8273a1fdd4dc7aedfef441':
  Charge apps for wifi tx time while scanning
2015-08-04 22:40:07 +00:00
Mitchell Wills
c1d02417bb am d9b729c7: am 992ae880: am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit 'd9b729c7c5ab7f9f348edc61ddec41fb54ba5730':
  Charge apps for wifi tx time while scanning
2015-08-04 22:31:57 +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
Kevin Cernekee
1e0e22fdb6 Merge "Clean up javadoc in StateMachine" 2015-08-04 20:29:58 +00:00
Adam Lesinski
d3821f3fe5 am 70593fb0: am 347c8850: am 4eb6c10d: am 7608f541: am 59d72c86: Merge "BatteryStats: Add debug logging to find source of b/22716723" into mnc-dev
* commit '70593fb065ad66e7fda971d3e3b70c6e0019bd3a':
  BatteryStats: Add debug logging to find source of b/22716723
2015-08-04 07:05:26 +00:00
Adam Lesinski
70593fb065 am 347c8850: am 4eb6c10d: am 7608f541: am 59d72c86: Merge "BatteryStats: Add debug logging to find source of b/22716723" into mnc-dev
* commit '347c8850b01adbd4bf310441678908aaea025f27':
  BatteryStats: Add debug logging to find source of b/22716723
2015-08-04 02:04:37 +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
Kevin Cernekee
e318d8c7d1 Clean up javadoc in StateMachine
Fix markup to use <pre> instead of <code> for multiline examples.  Fix
a couple of miscellaneous typos and run-on sentences.

Tested by running `javadoc -d /tmp/jd StateMachine.java` and then viewing
the result in Chrome.

Change-Id: I3d0eee4be4c39a77fa9415f457d3c53bc17d66f1
2015-08-03 15:18:48 -07:00
Alan Viverette
2a1e42e7af am 9bd3c31c: am 1d5837c6: am 5c8a5d0f: am ce337493: am ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit '9bd3c31cce024c67641620d2e32f90982b8b0b6f':
  Make ResolverDrawerLayout look like a ScrollView to accessibility
2015-08-03 20:59:17 +00:00
Alan Viverette
858e0530f2 am 12e3c3c9: am 6851c613: am a2db7e68: am 42c9b35f: am e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit '12e3c3c9946179cabbea413762226dec5c245560':
  Add badge content description to TargetInfo, use in ResolverActivity
2015-08-03 20:59:09 +00:00
Alan Viverette
9bd3c31cce am 1d5837c6: am 5c8a5d0f: am ce337493: am ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit '1d5837c6b031d00202e4e0bba0278d9bb259c73d':
  Make ResolverDrawerLayout look like a ScrollView to accessibility
2015-08-03 20:50:54 +00:00
Alan Viverette
12e3c3c994 am 6851c613: am a2db7e68: am 42c9b35f: am e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit '6851c61317c394cc78f53aa2385fffdcac8a4722':
  Add badge content description to TargetInfo, use in ResolverActivity
2015-08-03 20:50:48 +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
Yusuke Sato
22350a8c2c am 82e78074: am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit '82e780743046e620b724c28023b580e0e624bb15':
  Distinguish user-requested shutdown from power-related ones
2015-08-03 18:14:37 +00:00
Yusuke Sato
82e7807430 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
2015-08-03 17:56:37 +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
5f2dc6f3e1 am 9a3d898a: am 4bdf81a0: am 4f3d5c75: am 1eb06eaa: am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev
* commit '9a3d898a5802b4d3eb398fe618a4c2f202f96753':
  Add per UID control to app ops.
2015-08-01 17:55:16 +00:00
Dianne Hackborn
f6f1a7ec99 am 628b4125: am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit '628b4125843b93dc7f3ed0c9bbea76ff470d2eed':
  Change MNC codename to just M.
2015-08-01 17:53:09 +00:00
Svetoslav Ganov
9a3d898a58 am 4bdf81a0: am 4f3d5c75: am 1eb06eaa: am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev
* commit '4bdf81a07f3279c0477a4d0c565857ab10674974':
  Add per UID control to app ops.
2015-08-01 17:06:14 +00:00
Dianne Hackborn
628b412584 am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit 'bc2a88431e3dc51e2245cc28e327f11d0c78bd56':
  Change MNC codename to just M.
2015-08-01 17:04:28 +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
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
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
Adrian Roos
0d7c7c5f85 am 38ea7978: am bb8326d0: am f03ad443: am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit '38ea797860960477bce5d3e73b7d351f436d7090':
  Fix pattern lock for accessibility
2015-07-29 22:33:57 +00:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
Adrian Roos
38ea797860 am bb8326d0: am f03ad443: am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit 'bb8326d0cc1a15d7f78978d28646708eac107a2d':
  Fix pattern lock for accessibility
2015-07-29 22:16:26 +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
014964d8d4 am 0d46bed3: am 525cfc01: am baafac4a: am ce10d7a5: am 1bd310e1: Merge "import more metrics enums" into mnc-dev
* commit '0d46bed330fcf99ec68b0ecf99d95c9aae4a930c':
  import more metrics enums
2015-07-29 18:42:33 +00:00
Chris Wren
0d46bed330 am 525cfc01: am baafac4a: am ce10d7a5: am 1bd310e1: Merge "import more metrics enums" into mnc-dev
* commit '525cfc010593763e6ec88f62e4b7dd005865ecdf':
  import more metrics enums
2015-07-29 18:20:44 +00:00
Chris Wren
1bd310e18c Merge "import more metrics enums" into mnc-dev 2015-07-29 14:57:15 +00:00
Adam Lesinski
7ca82d915e am 2a098fe9: am 2529d39d: am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '2a098fe90ab0e60c2326e9aedbfdd85529de782f':
  BatteryStats: Use proper power calculator when energy data is received
2015-07-29 02:10:51 +00:00
Adam Lesinski
2a098fe90a am 2529d39d: am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '2529d39d3184ab66207f3fde9f2106276a2c1c16':
  BatteryStats: Use proper power calculator when energy data is received
2015-07-29 01:47:06 +00:00
Jorim Jaggi
e1d440be81 am 7580672f: am ce58fa95: am fed9b281: am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock
* commit '7580672fa8455dccc78806dcd878a5e191a62a45':
  Animation for touch, wake and unlock
2015-07-29 00:49:19 +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
Jorim Jaggi
7580672fa8 am ce58fa95: am fed9b281: am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock
* commit 'ce58fa9593ae9b0d5e29485019876bde5c54848b':
  Animation for touch, wake and unlock
2015-07-29 00:28:13 +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
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
6105a30d9d am 0091e2c0: am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '0091e2c03d1f2d212c94a3096e86407c78df6820':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
2015-07-28 21:26:50 +00:00
Dianne Hackborn
0091e2c03d am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '639fd0e9d8ecb59f8d15b3f1e5ec7a6ae6cc3161':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
2015-07-28 21:03:15 +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
16478a8d5c am 7eec4216: am 04f61ee8: am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
* commit '7eec421639a6d71f1f5cf1ee066766731d94955b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
2015-07-27 20:21:02 +00:00
Jorim Jaggi
7eec421639 am 04f61ee8: am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
* commit '04f61ee85da93f2d15034f290faec7512c176d59':
  Move PIN/Pattern appear animation to RenderThread (1/2)
2015-07-27 20:04:14 +00:00
Phil Burk
f244b3aa97 am 4a30f4d8: am 95e51b84: am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
* commit '4a30f4d864fb208890ce7f65ebebcec287c10d2f':
  MIDI: fix running status parser
2015-07-27 19:01:07 +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