29596 Commits

Author SHA1 Message Date
Dianne Hackborn
43d9ac81f7 Fix a fun bug with multiple service bindings from an activity.
There was a flaw in the service management, when the same activity
is doing a bindService() for the same service IBinder.  In this case
the activity would correctly keep a list of all generated connections,
however some other data structures would assume there is only one
connection per IBinder, and thus only remember the last.

When that last connection was unbound, the service would be destroyed
since it thought there were no more connections.  Then when the
activity was finished, it would try to destroy the service again and
end up with an ANR because the service was already gone and would
not respond.

Change-Id: I59bde38bc24e78147b90b0a7cd525c2a1d20489f
2010-08-25 15:09:17 -07:00
Eric Laurent
c14f9ca6e5 Merge "Added preset reverb." into gingerbread 2010-08-25 15:09:10 -07:00
Andreas Huber
cec075cc42 am 23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread
Merge commit '235840228b0692b66d854ff499b5c4060f883e03' into gingerbread-plus-aosp

* commit '235840228b0692b66d854ff499b5c4060f883e03':
  Ensure that buffering updates eventually hit 100% after we download everything.
2010-08-25 15:01:45 -07:00
Andreas Huber
8735f8984a Fix support for per-frame unsynchronization in ID3V2.4 tags.
Change-Id: I6874b596f88817347756a375d9fb1c9bff418eca
related-to-bug: 2949149
2010-08-25 14:55:53 -07:00
Andreas Huber
235840228b Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread 2010-08-25 14:54:36 -07:00
Romain Guy
dc9e486e0a Merge "Only destroy the GL Canvas when necessary." 2010-08-25 14:46:24 -07:00
Romain Guy
4caa4ed120 Only destroy the GL Canvas when necessary.
Change-Id: I6caf4873b02dc4a6d7c8c91925d2447b3b0e0593
2010-08-25 14:46:24 -07:00
Jason Sams
1d45c47975 Add matrix component types.
Fix potental overflow in script -> java messages.

Change-Id: Ie6fd9dc376be4043fc938a1517106936937689c8
2010-08-25 14:41:20 -07:00
Sascha Brawer
df195b1ddb Merge "Generated Romansh messages from Unicode CLDR." 2010-08-25 14:40:45 -07:00
Mathias Agopian
43c87e44fc Improve Sensors documentation a bit
Change-Id: I6f4f9ebfaf1e7f461a795f717b9913e3a021e9d4
2010-08-25 14:35:54 -07:00
Cary Clark
7462fc738f Merge "simplify cursor ring draw state; fix null check" 2010-08-25 14:03:36 -07:00
Cary Clark
43413f4f06 am 1ef41605: (-s ours) am d64f4a98: DO NOT MERGE fix null check
Merge commit '1ef41605bbde97fb3979003a652fd365a0d034aa'

* commit '1ef41605bbde97fb3979003a652fd365a0d034aa':
  DO NOT MERGE fix null check
2010-08-25 13:59:01 -07:00
Cary Clark
1ef41605bb am d64f4a98: DO NOT MERGE fix null check
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp

* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
  DO NOT MERGE fix null check
2010-08-25 13:53:05 -07:00
Konstantin Lopyrev
43b9b48f79 Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
Change-Id: Iaff6bd501a2bb3faa7a394fff740479f6a95e899
2010-08-25 13:38:27 -07:00
Daniel Sandler
764b4da4a8 System bar improvements.
- Updated artwork for buttons and signal/battery meters.
- Layout change: meters on either side of clock
- RSSI for mobile data. The algorithm is more or less the
  same as the one used in the phone status bar. Note that
  mobile data is only shown if Wi-Fi is unavailable.

Bug: 2924643
Change-Id: Idaa0c52422db4a63616475bde96626d1953830b4
2010-08-25 16:36:30 -04:00
Adam Cohen
6587045a84 Merge "Cleanup and bug fixes in StackView -> pushed functionality from AdapterViewAnimator to StackView -> only modifying clipping flags as far up the view hierarchy as needed -> still need framework level solution for drawing outside bounds" 2010-08-25 13:24:37 -07:00
Cary Clark
d64f4a983d DO NOT MERGE fix null check
Check to see if the WebChromeClient is null.

Checked into master in change 63008

Change-Id: If2ef1889ce3633c0b35c078a46bde84982dd1eb3
http://b/2945171
2010-08-25 16:22:15 -04:00
Andreas Huber
a1644109bb am 96dc4559: am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread
Merge commit '96dc45597e53742a2c8453f9ce03f7d501a75668'

* commit '96dc45597e53742a2c8453f9ce03f7d501a75668':
  Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
2010-08-25 13:17:44 -07:00
Adam Cohen
9b073948cf Cleanup and bug fixes in StackView
-> pushed functionality from AdapterViewAnimator to StackView
-> only modifying clipping flags as far up the view
   hierarchy as needed
-> still need framework level solution for drawing outside bounds

ViewGroup touch dispatch temp fix
-> Touch event was being modified and not reset in some
   code paths.

Change-Id: I8135b62e2d73f239b9df407b0fa93bc434796989
2010-08-25 13:16:14 -07:00
Andreas Huber
96dc45597e am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread
Merge commit 'b8814dce287552c1bdf13fa999296ebc7387776d' into gingerbread-plus-aosp

* commit 'b8814dce287552c1bdf13fa999296ebc7387776d':
  Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
2010-08-25 13:13:57 -07:00
Brad Fitzpatrick
edf32d0131 Start of SharedPreferences$Editor.startCommit()
No implementation yet, just the interface.

Change-Id: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
2010-08-25 13:13:36 -07:00
Cary Clark
e60cb7f914 simplify cursor ring draw state; fix null check
Rename jni call to note that, when pressing the dpad, the
cursor ring is to shown for a short time. The old name suggested
that this was tracking whether the link was followed.

Fix an unrelated change (from gingerbread, automated
merge unlikely to succeed) to check for a null
WebChromeClient.

Requires a companion change in external/webkit

http://b/2135321 (rename jni call)
http://b/2945171 (null check)

Change-Id: I9d4a92dbba1f92da8dc8cde755a2066de59514f9
2010-08-25 16:12:03 -04:00
Andreas Huber
b8814dce28 Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread 2010-08-25 13:10:04 -07:00
Andreas Huber
efdd088a71 Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
Change-Id: Icb77ae3ee95a69c7da25b4d3b8696c0a2d33028a
related-to-bug: 2948754
2010-08-25 13:08:38 -07:00
Sascha Brawer
064cac4354 Generated Romansh messages from Unicode CLDR.
Change-Id: Ie21e4785af7001e982ae35fce5e2abf7a319a3a0
2010-08-25 22:00:58 +02:00
Irfan Sheriff
a2d5fbf569 fix connectNetwork corner cases
1. if we try to use the api for an already connected network
we could end up in disabling other networks since we dont
get events back in that scenario. fix to ignore connect.

2. force transition to mDisconnectingState since we expect
a disconnection when we connect to a network. If we
are in the other child states in ConnectModeState and dont
transition, we could ignore the connection/disconnection
which would cause other networks to get disabled.

Change-Id: I603d504af21c5ba09411d5e2515b8031b9f8a97a
2010-08-25 12:58:11 -07:00
Andreas Huber
c23296ef2d Ensure that buffering updates eventually hit 100% after we download everything.
Change-Id: I43bb85b1128fa9c1bc8632970d7101006393bcc8
related-to-bug: 2844095
2010-08-25 12:31:48 -07:00
Mathias Agopian
cb3be1b4d9 am 46820412: am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread
Merge commit '468204124e95bbf74ae8cc000318ade29e311be6'

* commit '468204124e95bbf74ae8cc000318ade29e311be6':
  don't try to lock a buffer that wasn't allocated with SW usage bits
2010-08-25 12:24:02 -07:00
Mathias Agopian
468204124e am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread
Merge commit '8eb16af29303cda190133a1d220b9ecd9341e261' into gingerbread-plus-aosp

* commit '8eb16af29303cda190133a1d220b9ecd9341e261':
  don't try to lock a buffer that wasn't allocated with SW usage bits
2010-08-25 12:17:19 -07:00
Mathias Agopian
8eb16af293 Merge "don't try to lock a buffer that wasn't allocated with SW usage bits" into gingerbread 2010-08-25 12:15:38 -07:00
Mathias Agopian
c817b22055 don't try to lock a buffer that wasn't allocated with SW usage bits
Change-Id: Iabbcec1bfa30dc47d45ece699dd178653f1b675b
2010-08-25 12:14:27 -07:00
Brian Carlstrom
16376afb8d am 90b3135d: am 4d672988: Merge "Remove "StringTest.java"." into gingerbread
Merge commit '90b3135d8b2471990412d79dce4ee6390118d8d3'

* commit '90b3135d8b2471990412d79dce4ee6390118d8d3':
  Remove "StringTest.java".
2010-08-25 11:46:15 -07:00
Brian Carlstrom
78448edcdd resolved conflicts for merge of 50d35946 to master
Change-Id: Ia8c3312d626952c378fc4e7fec1d46119e2ccf42
2010-08-25 11:32:17 -07:00
Brian Carlstrom
90b3135d8b am 4d672988: Merge "Remove "StringTest.java"." into gingerbread
Merge commit '4d672988fed7fbdd887fe78603fa2eaf713031ad' into gingerbread-plus-aosp

* commit '4d672988fed7fbdd887fe78603fa2eaf713031ad':
  Remove "StringTest.java".
2010-08-25 11:04:26 -07:00
Brian Carlstrom
4d672988fe Merge "Remove "StringTest.java"." into gingerbread 2010-08-25 11:02:22 -07:00
Brian Carlstrom
50d35946bd am 24bf70ca: Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread
Merge commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a' into gingerbread-plus-aosp

* commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a':
  Update AndroidRuntime with dalvik-dev changes
2010-08-25 10:55:47 -07:00
Sascha Brawer
3c1fbf7ad2 Merge "Added Romansh-language versions of error messages "loaderror.html" and "nodomain.html"." 2010-08-25 10:53:13 -07:00
Brian Carlstrom
24bf70cac0 Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread 2010-08-25 10:53:10 -07:00
Eric Laurent
0ae6d2e826 am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64'

* commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64':
  Fix the simulator build.
2010-08-25 10:41:55 -07:00
Eric Laurent
74ede9e4fd am 67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp

* commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9':
  Fix the simulator build.
2010-08-25 10:39:21 -07:00
Eric Laurent
67b506065e Merge "Fix the simulator build." into gingerbread 2010-08-25 10:37:27 -07:00
Gilles Debunne
aed922ffff Merge "Fix in fundamentals web page." 2010-08-25 10:32:58 -07:00
Gilles Debunne
aea2d763a2 Fix in fundamentals web page.
Change-Id: I330ea9c925315bc817bf544992401cd1957c1c2a
2010-08-25 10:31:57 -07:00
Steve Block
976190d21a Merge "In ActionBarImpl, only use mActionView after we've checked that it's non-null" 2010-08-25 10:30:20 -07:00
Gilles Debunne
7e2fb17391 Merge "Fixed typo in View id documentation" 2010-08-25 10:28:50 -07:00
Jean-Baptiste Queru
9650f128b2 am 44b31fdd: am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant
Merge commit '44b31fdd86053945e1eeb3b91783577aebd95b55'

* commit '44b31fdd86053945e1eeb3b91783577aebd95b55':
  Make the default backup configuration "disabled; local transport selected"
2010-08-25 10:20:08 -07:00
Jean-Baptiste Queru
44b31fdd86 am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant
Merge commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758' into gingerbread-plus-aosp

* commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758':
  Make the default backup configuration "disabled; local transport selected"
2010-08-25 10:18:14 -07:00
Jean-Baptiste Queru
7e2f87fafa am d5e601c2: reconcile open-source froyo into google variant
Merge commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread

* commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9':
  Make the default backup configuration "disabled; local transport selected"
2010-08-25 10:15:38 -07:00
Brian Carlstrom
4200058044 am 7517ffd1: am 59073b15: Merge "Fix linux 64 build" into gingerbread
Merge commit '7517ffd134d03bd5392e8292a18551bfce08ddce'

* commit '7517ffd134d03bd5392e8292a18551bfce08ddce':
  Fix linux 64 build
2010-08-25 10:10:31 -07:00
Brian Carlstrom
7517ffd134 am 59073b15: Merge "Fix linux 64 build" into gingerbread
Merge commit '59073b155ab0d8a5706c90200e6af614510aba0e' into gingerbread-plus-aosp

* commit '59073b155ab0d8a5706c90200e6af614510aba0e':
  Fix linux 64 build
2010-08-25 10:07:18 -07:00