108624 Commits

Author SHA1 Message Date
Robert Greenwalt
46bb6d6cb7 Fix power issues around wifi scans.
- Sending a broadcast indicating when scan requests could be serviced so that
apps don't request scans we won't do anything with.
- Fix our batt stats accounting so we only count it if we send the request to
the driver.

bug: 8868201
bug: 9496690
Change-Id: I64a4f1c294c848ac64c50d8854ed4a6a1a47f603
2013-06-28 14:36:40 -07:00
Ben Murdoch
d08ee870a0 Merge "Plumb View.getAccessibilityNodeProvider though WebViewProvider." 2013-06-28 21:18:03 +00:00
Georgi Nikolov
44c4ddfd47 Bugfix 9603757
master/flo tremendous Gallery battery drain on idle device (syncing pathology?)

Change-Id: I52797fe428a817ac0bdafcf2ab2b0b565839f84c
2013-06-28 14:12:09 -07:00
Elliott Hughes
1f3ad678be am 34ba52a0: am a9510297: am 505974eb: Merge "Track libcore API update."
* commit '34ba52a060b01b5d91a64d8e7026387749c2bbb6':
  Track libcore API update.
2013-06-28 13:11:57 -07:00
Elliott Hughes
34ba52a060 am a9510297: am 505974eb: Merge "Track libcore API update."
* commit 'a9510297a656c574d063b299f044bc9893af7724':
  Track libcore API update.
2013-06-28 13:09:58 -07:00
Elliott Hughes
a9510297a6 am 505974eb: Merge "Track libcore API update."
* commit '505974eb736218d40b1d648ea4af548167a381b1':
  Track libcore API update.
2013-06-28 13:07:21 -07:00
Elliott Hughes
505974eb73 Merge "Track libcore API update." 2013-06-28 20:04:29 +00:00
Craig Mautner
d9f254094e Merge "Do not reuse DisplayAdjustment in Display." 2013-06-28 20:00:56 +00:00
Craig Mautner
1abaa53dcc Do not reuse DisplayAdjustment in Display.
Because the DisplayAdjustment in Display can be modified it should not
use the reference of the DisplayAdjustment that is passed in to
construct the Display. Copy the members of the DisplayAdjustment
instead.

Fixes bug 9622994

Change-Id: I8201b02eba3ef35af3e01f10402cd5dafec1fb23
2013-06-28 12:03:32 -07:00
Romain Guy
c36fe2fc53 am 55e789db: am ed96349a: am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev
* commit '55e789dbc782be0dcaf1d4bae5f32e9e2f674152':
  Fix out of range glCopyTexImage2D Bug #9425270
2013-06-28 11:15:02 -07:00
Romain Guy
55e789dbc7 am ed96349a: am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev
* commit 'ed96349a43133625d76fe7ba52ee4893c741ec41':
  Fix out of range glCopyTexImage2D Bug #9425270
2013-06-28 11:10:59 -07:00
Romain Guy
ed96349a43 am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev
* commit '3d1b158e705f1ba83ac42dfe1aeaf25201638ef6':
  Fix out of range glCopyTexImage2D Bug #9425270
2013-06-28 11:08:21 -07:00
Romain Guy
3d1b158e70 Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev 2013-06-28 18:05:00 +00:00
Craig Mautner
1e09cfaa68 Merge "More debug for 9404689." 2013-06-28 18:01:33 +00:00
Elliott Hughes
5931afdc0f Track libcore API update.
Bug: 3484927
Change-Id: I22fc7e003c3483a20988e91d2b8824626ec022b1
2013-06-28 10:55:14 -07:00
Amith Yamasani
7f50ef7dda am 3f0decd7: am 16a2268f: am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev
* commit '3f0decd7dff8b4c12544c24b2d19a41d4eaacd03':
  When a new user AID is generated, dump it to dropbox
2013-06-28 10:48:54 -07:00
Craig Mautner
f1f5054f7a More debug for 9404689.
Changing focus to PhoneWindow.

Change-Id: I75c2ce6b1a20729daf8d2b7f83b2a871e1a7e642
2013-06-28 10:43:07 -07:00
Amith Yamasani
3f0decd7df am 16a2268f: am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev
* commit '16a2268f8091e1b27cb1b1343d992c7509a2506e':
  When a new user AID is generated, dump it to dropbox
2013-06-28 10:14:30 -07:00
Amith Yamasani
16a2268f80 am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev
* commit 'e6304a9c075ed927fc6bdffcc3191dc829f779fa':
  When a new user AID is generated, dump it to dropbox
2013-06-28 10:12:21 -07:00
Amith Yamasani
e6304a9c07 Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev 2013-06-28 17:08:38 +00:00
Amith Yamasani
5cdf7f5b2a When a new user AID is generated, dump it to dropbox
Bug: 9595851
Change-Id: I6fde757eed84d7914db180e80c9d68448b3e5780
2013-06-28 09:58:43 -07:00
Daniel Sandler
8751a9644d Merge "move scoring, sound, vibration, and lights into a handler" 2013-06-28 16:36:11 +00:00
Lorenzo Colitti
861c3fcaf2 464xlat: use a gatewayed route, not point-to-point
Various applications such as Skype and our legacy VPN code
do not understand routes pointed directly at point-to-point
interfaces and require a default gateway IPv4 address in
order to function.

Grudgingly accept that routes without default gateways Are Hard
and use gatewayed routes instead. This causes routing to go from:

default dev clat4  scope link

to:

default via 192.0.0.4 dev clat4  scope link
192.0.0.4 dev clat4  scope link

and those apps now work.

Bug: 9597256
Bug: 9597516
Change-Id: I7b7890873802d3cb99affd6eb70b8ab75e7a2cf6
2013-06-29 00:14:43 +09:00
Dianne Hackborn
2179a522d3 Merge "Start really collecting PSS data for process stats." 2013-06-28 01:59:24 +00:00
Dianne Hackborn
cfc837f7fa Start really collecting PSS data for process stats.
The activity manager now uses some heuristics to try to
sample PSS data from processes so that it can get enough
data to over reasonable time have something useful, without
doing it too aggressively.

The current policy is:

1. Whenever a significant global change happens (memory state,
   sceen on or off), we collect PSS from all processes; this will
   not happen more than every 10 minutes.
2. When all activities become idle, we will collect PSS from the
   current top process; this will not happen more than every 2
   minutes per process.
3. We will sample the top-most process's PSS every 5 minutes.
4. When an process's oom adj changes and it has been more than
   30 minutes since PSS has been collected from it, we will
   collect a new PSS sample.
5. If a process changes from service A to service B (meaning it
   has been running a service for a long time), we will collect
   a PSS sample from it.
6. If someone explicitly requests PSS data (for running services
   UI or dumpsys), record that.

Also:

- Finish moving the procstats output all to the new format.
- Record information about processes being killed due to excessive
  wake locks or CPU use in procstats.
- Rework how we structure common vs. per-package process stats to
  make it simpler to deal with.
- Optimize the Debug.getPss() implementation (we use it a lot now).
  Should probably optimize it further at some point.

Change-Id: I179f1f7ae5852c7e567de4127d8457b50d27e0f0
2013-06-27 18:56:00 -07:00
Romain Guy
b254c242d9 Fix out of range glCopyTexImage2D
Bug #9425270

A better solution would be to use glCopyTexImage2D whenever possible but
this change would be a little more dangerous.

Change-Id: Ib1aaceda39d838716285ef97f356721416822dbb
2013-06-27 17:15:24 -07:00
Jim Miller
afb292a23c Merge "Simplify wake management code in keyguard." 2013-06-27 23:05:19 +00:00
Jim Miller
e51cf7aeb6 Simplify wake management code in keyguard.
Removes onWakeKey/Motion handling from keyguard since it's no longer used.
The legacy code was originally intended to have keyguard filter wake events
which is now done in PhoneWindowManager. Ultimately it just needs to call
PowerManager.wakeUp() since keyguard no longer filters these keys.

Change-Id: I5b8ef9b422abf850a85b57f21944e5eb09fbedc2
2013-06-27 15:58:29 -07:00
Romain Guy
0cab330e07 Merge "Track the atlas' generation ID Bug #9589379" 2013-06-27 22:56:03 +00:00
Jason Sams
ec6221e555 Merge "Add 2,3 vectors to allowed intrinsic list." 2013-06-27 22:45:26 +00:00
Jason Sams
d93fdb77d8 Add 2,3 vectors to allowed intrinsic list.
Change-Id: Iafd90ef4337076ed9d1e335c16272a0517f846b3
2013-06-27 15:42:30 -07:00
Romain Guy
55b6f95ee4 Track the atlas' generation ID
Bug #9589379

If the atlas is terminated/reinitialized and a view does not invalidate
in between it might end up using a stale AssetAtlas::Entry. This change
is similar to how 9patch meshes are cached in DrawPatchOp: we simply
track the generation ID of the cache to make sure we always use the
latest data.

Change-Id: Ib5abb3769d2ce0eabe9adc04e320ca27c422019e
2013-06-27 15:40:46 -07:00
Christopher Tate
a3664247c7 New API: apps can request a wipe of their own data
Bug 9588299

Change-Id: I817a90e272ba279d7171f6dbe88dbafd7e42b050
2013-06-27 15:32:37 -07:00
Jeff Sharkey
a3416020a8 Merge "Avoid legacy VPN bringing down system server." 2013-06-27 21:58:20 +00:00
Kenny Root
b3933b979d am 67f7d8fb: am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory"
* commit '67f7d8fbd5ad84681fbdfea184ce538c6834896a':
  Add ALPN support to SSL socket factory
2013-06-27 14:57:46 -07:00
Yorke Lee
a2c8cbdd95 am 11b249f6: am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
* commit '11b249f641163eefbe7ec8582107c4ed5726baea':
  Rename Google Talk to Hangouts in framework
2013-06-27 14:57:43 -07:00
Romain Guy
db4ae2b10e am dbfb2ab4: am 93d46952: am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270
* commit 'dbfb2ab4a760f0da910758467a7b9fccf09e97f5':
  Recreate TextureView's display list on attach Bug #9425270
2013-06-27 14:57:40 -07:00
Kenny Root
67f7d8fbd5 am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory"
* commit '6c042b6d678edea0f936da994f85ba62f9a1950e':
  Add ALPN support to SSL socket factory
2013-06-27 14:55:41 -07:00
Yorke Lee
11b249f641 am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
* commit 'f6ec3048546cf8f2821f8a67645df3bab243e591':
  Rename Google Talk to Hangouts in framework
2013-06-27 14:52:37 -07:00
Romain Guy
dbfb2ab4a7 am 93d46952: am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270
* commit '93d46952db60090ae22bc8197659a06ae23cb58b':
  Recreate TextureView's display list on attach Bug #9425270
2013-06-27 14:52:33 -07:00
Kenny Root
6c042b6d67 am a5a2de55: Merge "Add ALPN support to SSL socket factory"
* commit 'a5a2de55082b1f2a9ec0b99962a88063ac6d1bbf':
  Add ALPN support to SSL socket factory
2013-06-27 14:52:17 -07:00
Jeff Sharkey
421fab8a7b Avoid legacy VPN bringing down system server.
Bug: 9564691
Change-Id: I5b5f78c9ae20505f6274b91bc8fdbaaf57443277
2013-06-27 14:51:52 -07:00
Yorke Lee
f6ec304854 am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
* commit 'e6cb43a1ea50681d2da30ce5e8cb5ac97e80e88a':
  Rename Google Talk to Hangouts in framework
2013-06-27 14:50:11 -07:00
Romain Guy
93d46952db am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270
* commit '67603c6e1b88fa20db58f69354e3925ffba037d1':
  Recreate TextureView's display list on attach Bug #9425270
2013-06-27 14:50:08 -07:00
Yorke Lee
e6cb43a1ea Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev 2013-06-27 21:46:19 +00:00
Alan Viverette
673e64dd62 Merge "Optimize width measurement and cache result in MenuPopupHelper" 2013-06-27 21:38:52 +00:00
Alan Viverette
62339911ba Merge "Update ListMenuItemView to use a single RelativeLayout" 2013-06-27 21:38:31 +00:00
Kenny Root
a5a2de5508 Merge "Add ALPN support to SSL socket factory" 2013-06-27 21:25:24 +00:00
Craig Mautner
5729b81ab5 Merge "Add API to convert translucent Activity to opaque." 2013-06-27 21:00:44 +00:00
Scott Greenwald
9b05c61a87 move scoring, sound, vibration, and lights into a handler
As a prelude to introducing fancier scoring functions, this CL
moves scoring and everything that depends on it into a handler.
This allows the NotificationManagerService to report back to the
calling process right away about whether or not the notification
is valid; not blocking while score is computed, and non-statusbar
notification modalities are activated.

Change-Id: Iaf77bc89544bb7bcb7adeda60885d74c3170541c
2013-06-27 16:57:22 -04:00