53903 Commits

Author SHA1 Message Date
Jeff Brown
e9e860762b Merge "Improve input event consistency invariants." 2011-06-28 20:17:59 -07:00
Jeff Brown
8134681b25 Improve input event consistency invariants.
Fixed some issues where inconsistent streams of events could
be generated by the dispatcher, particularly when switching from
hovering with one device to hovering with another.

Fixed a bug where the touch pad would fail to generate a new
HOVER_MOVE following a tap event.  As a result, the hover event
stream would not resume until the user touched the touch pad
again.

Change-Id: I444dce84641fb12e56a0af84c931520771d6c493
2011-06-28 20:10:40 -07:00
Xavier Ducrohet
cf93ed0d0a am e1918353: am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
* commit 'e1918353e795d4f4fb67760ad593458517976072':
  Bring in more layout lib changes from hc-mr1.
2011-06-28 19:15:32 -07:00
Xavier Ducrohet
e1918353e7 am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
* commit '842725fc642b7ba2c087cc81796973b838c23c76':
  Bring in more layout lib changes from hc-mr1.
2011-06-28 19:14:05 -07:00
Hung-ying Tyan
b8e52574ea Merge "Record external IP and port from SIP responses" 2011-06-28 19:04:30 -07:00
Xavier Ducrohet
5732308e39 am 66044737: (-s ours) am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
* commit '660447379d07f2e7480a30784f04cdd476877d73':
  CherryPick 06942bc4 from hc-mr1. do not merge.
2011-06-28 19:00:25 -07:00
Xavier Ducrohet
d0bc3ad8ae am d7542263: (-s ours) am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
* commit 'd7542263c6dfa2522e8844c7c714fbf2ad112385':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
2011-06-28 18:58:23 -07:00
Xavier Ducrohet
e28fbd61d8 am adf5914b: (-s ours) am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
* commit 'adf5914b390061e48a86c9f55e68899cfa526841':
  DO NOT MERGE. may fix build on some version of gcc
2011-06-28 18:58:20 -07:00
Xavier Ducrohet
660447379d am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
* commit '9bce27a9ce916bdf363667ee67fc0ce50c533aa3':
  CherryPick 06942bc4 from hc-mr1. do not merge.
2011-06-28 18:58:09 -07:00
Xavier Ducrohet
d7542263c6 am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
* commit '155cf6c1e191bb03fe24db8663715862d8e6a43d':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
2011-06-28 18:56:17 -07:00
Xavier Ducrohet
adf5914b39 am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
* commit 'e0947693c9984727dfa775a747dd32aaaeb90284':
  DO NOT MERGE. may fix build on some version of gcc
2011-06-28 18:56:14 -07:00
Xavier Ducrohet
842725fc64 am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
* commit '4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89':
  Bring in more layout lib changes from hc-mr1.
2011-06-28 18:55:46 -07:00
Xavier Ducrohet
9bce27a9ce am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82':
  CherryPick 06942bc4 from hc-mr1. do not merge.
2011-06-28 18:55:42 -07:00
Xavier Ducrohet
155cf6c1e1 am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
* commit '9918ffb07f47430e22f6e53576d59b599f5a3534':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
2011-06-28 18:53:54 -07:00
Xavier Ducrohet
e0947693c9 am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
* commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a':
  DO NOT MERGE. may fix build on some version of gcc
2011-06-28 18:53:51 -07:00
Xavier Ducrohet
4d825e1f3b Merge "Bring in more layout lib changes from hc-mr1." into gingerbread 2011-06-28 18:53:15 -07:00
Xavier Ducrohet
4753498d5c Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 2011-06-28 18:53:06 -07:00
Xavier Ducrohet
9918ffb07f Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 2011-06-28 18:52:59 -07:00
Xavier Ducrohet
54146a634e Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread 2011-06-28 18:52:43 -07:00
Jeff Sharkey
8994730fe3 Merge "Better network stats parsing, integer tags, async." 2011-06-28 18:02:12 -07:00
Jeff Sharkey
4414cea139 Better network stats parsing, integer tags, async.
Change NMS parsing to handle extended /proc/ stats formats by pairing
values with header keys.  Move TrafficStats to integer tags to match
kernel internals, and offer well-known tags for system services.

Async policy event dispatch from NPMS, and update tests to block for
event dispatch.  Narrow app policy to exclude apps signed with system
key, which are usually critical.

Bug: 4948913, 4903489, 4585280

Change-Id: Idb357227ccaa617906411f309371cea18d7bc519
2011-06-28 17:59:00 -07:00
mike wakerly
eb8283d4b3 am 430cee09: am af08ddbc: am 2f9ad8b4: Add intent actions for new firmware events.
* commit '430cee0961936746c272aaf5c5f52b1240f6a9b4':
  Add intent actions for new firmware events.
2011-06-28 17:57:50 -07:00
Jason Simmons
aa11965bd5 Add a linear transform library to libutils
Change-Id: Icdec5a6bebd9d8f24b3f335f8ec8b09a5810a774
2011-06-28 17:43:30 -07:00
Justin Ho
1619a65b58 Merge "Removing unused drawables" 2011-06-28 17:32:52 -07:00
Isaac Levy
3541ce04dd Ping through default dns & ping settings changes
Changed DnsPinger to use the system default DNS if linkprops doesn't
have a dns.  This mirrors the behavior of the system overall.

Minor changes to wifiWatchdogService settings.

Change-Id: I8de73cf5bd24bc69343c7d9dc999d198195ec0ec
2011-06-28 17:27:07 -07:00
Christopher Tate
dcce07d207 Merge "Fix settings restore even harder" 2011-06-28 17:23:44 -07:00
mike wakerly
430cee0961 am af08ddbc: am 2f9ad8b4: Add intent actions for new firmware events.
* commit 'af08ddbc42fb51de76958d859cf0e87d0b9e475e':
  Add intent actions for new firmware events.
2011-06-28 17:22:53 -07:00
mike wakerly
af08ddbc42 am 2f9ad8b4: Add intent actions for new firmware events.
* commit '2f9ad8b499cb150d5cdfe84a9795992c5dd42cff':
  Add intent actions for new firmware events.
2011-06-28 17:19:05 -07:00
Huahui Wu
b90a83c246 Merge "2nd try: Gets the URL that has a cert error and carrys it in SslError." 2011-06-28 16:26:32 -07:00
Christopher Tate
f12fbcd608 Fix settings restore even harder
Change-Id: If6920743ae92dcf811a87a1eefd357f849c03a23
2011-06-28 16:16:42 -07:00
Andreas Huber
eb91630715 Support for "streaming" non-transport streams by first converting them to ts packets.
Change-Id: Ia753a1ab99039f54ce3678a38e997902372b5fa5
2011-06-28 16:08:24 -07:00
Justin Ho
981aa899a6 Removing unused drawables
Change-Id: I5d7306ee91a47b82dddf42214999edc06903f939
2011-06-28 15:59:37 -07:00
Dianne Hackborn
292f8bc9d1 Plumb information from the framework about asec container size.
Change-Id: Ie0ec3cb6d463aefa341a8cbea80be790451ba5e3
2011-06-28 15:02:44 -07:00
Andreas Huber
cde7324510 Merge "Support for writing output data to a provided callback function instead of a file" 2011-06-28 14:49:35 -07:00
Andreas Huber
068dbbf7ee Support for writing output data to a provided callback function instead of a file
in MPEG2TSWriter

Change-Id: Ie54a5677c7b789a973aa50b7f197c6db238425bc
2011-06-28 14:44:57 -07:00
Dianne Hackborn
61b9fae046 Merge "Fix battery history management." 2011-06-28 14:34:51 -07:00
Jamie Gennis
2a319a03b5 Merge "SurfaceTexture: add a CPU -> GL sync test." 2011-06-28 14:27:17 -07:00
Romain Guy
8229b467fc Merge "Fix parameter order evaluation issue." 2011-06-28 14:03:20 -07:00
Romain Guy
9ff3cb57ee Fix parameter order evaluation issue.
This problem was affecting Android builds with gcc/x86.

Change-Id: Ibb7978413c89bd1ac09f0d1ea78f5cb4fe61f6ed
2011-06-28 14:02:11 -07:00
Daisuke Miyakawa
64c044f30e Merge "Use new usage feedback API in phone app / strequent" 2011-06-28 14:02:01 -07:00
Jeff Brown
3ec7fb4bcf Merge "Hover and stylus API cleanup." 2011-06-28 13:58:44 -07:00
Jamie Gennis
1b62309831 SurfaceTexture: add a CPU -> GL sync test.
This change adds a test to verify that proper synchronization is done
when using SurfaceTexture to use CPU generated images as OpenGL ES
textures in 'synchronous mode'.  Synchronous mode is particularly tricky
because SurfaceTexture will allow the buffer that's currently bound to
the GL texture to be dequeued.  We rely on Gralloc's lock function to
block until this buffer is no longer being used by the OpenGL ES.

Change-Id: I1c4e37f3e9d60ab9a0905a90a1f5060fda8e485c
2011-06-28 13:18:07 -07:00
Jim Miller
94e23cbb2d Merge "Fix 4691563: Fix memory leak caused by Tweeners hanging onto references." 2011-06-28 13:17:04 -07:00
Jim Miller
5b0eb1778a Merge "Fix 4691563: Don't show lock before unlock screen" 2011-06-28 12:57:25 -07:00
Jim Miller
bf591ff682 Fix 4691563: Fix memory leak caused by Tweeners hanging onto references.
This fixes a bug where the animations in MultiWaveView were keeping references
to bitmaps and preventing them from being reclaimed during GC.  The solution
is two-fold:
1. When any given animation completes, it is now removed from the list of running
animators objects.
2. When the client explicitly calls reset(), we release all references to
animators and objects.

Change-Id: Ice434ed1720fe4c253b9607ef61699d41f87f777
2011-06-28 12:55:38 -07:00
Jamie Gennis
3cf7cf5751 Merge changes I9fb59763,I8b2c6e00
* changes:
  SurfaceTexture: consume buffers after err checks
  SurfaceTexture: change onFrameAvailable behavior
2011-06-28 12:55:03 -07:00
Andreas Huber
d11eccf3a8 Merge "Multiple changes to ACodec/codec tools:" 2011-06-28 12:48:01 -07:00
Dianne Hackborn
ae3844527a Fix battery history management.
When rebooting the history time offset was not being handled
correctly, causing garbage data.

Change-Id: Ieca5a72c4c7c374bfe7f8673eed87354af148ef0
2011-06-28 12:34:40 -07:00
Huahui Wu
5bb9b19c5a 2nd try: Gets the URL that has a cert error and carrys it in SslError.
Identical to https://android-git.corp.google.com/g/#change,117828
which was reverted since its collaborative CL broke the build.

Change-Id: I5fa7d3e9b6026639bf72530ff5b449e36f802914
2011-06-28 12:32:56 -07:00
Adam Powell
a1d9ae69ff Fix bug 4961844 - Allow split style action bar to have 2 different colors
Add the actionBarSplitStyle theme attribute. It defaults to the value
of actionBarStyle.

Change-Id: I5e929114d9cc163df0dd429aa0714b88a1f6a7a9
2011-06-28 11:36:24 -07:00