28130 Commits

Author SHA1 Message Date
Adam Powell
b361639566 am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread
Merge commit 'f15dfbec5df911f4cedd3e302864496d77ce295b' into gingerbread-plus-aosp

* commit 'f15dfbec5df911f4cedd3e302864496d77ce295b':
  Fix bug 3071869 - text anchors are now treated as application sub-panels.
2010-10-07 14:02:15 -07:00
Brad Fitzpatrick
6a15f0d7c7 am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread
Merge commit '6275dbbea8ad7bde984a362516654004e111dc67' into gingerbread-plus-aosp

* commit '6275dbbea8ad7bde984a362516654004e111dc67':
  Quiet unnecessary debug logging.
2010-10-07 14:02:10 -07:00
Andreas Huber
45bd1159fa am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp

* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
2010-10-07 14:02:01 -07:00
Kenny Root
c0c2076e9a am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread
Merge commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9' into gingerbread-plus-aosp

* commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9':
  Eliminate MCS_GIVE_UP state
2010-10-07 14:01:55 -07:00
Gilles Debunne
5e3329b5fa am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread
Merge commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4' into gingerbread-plus-aosp

* commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4':
  Removed unused and broken screen_progress
2010-10-07 14:01:48 -07:00
Brad Fitzpatrick
b8d40d263b am 30f5c8fe: More DropBoxManager javadoc love.
Merge commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc' into gingerbread-plus-aosp

* commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc':
  More DropBoxManager javadoc love.
2010-10-07 14:01:40 -07:00
Brad Fitzpatrick
992a9e507f am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
Merge commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2' into gingerbread-plus-aosp

* commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2':
  DropBox.Entry javadoc syntax fix
2010-10-07 14:01:30 -07:00
Kenny Root
c296f22e71 am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID"
Merge commit '0145e36cad1472acafb492b3f009ca6eba9593ea' into gingerbread-plus-aosp

* commit '0145e36cad1472acafb492b3f009ca6eba9593ea':
  Revert "Only allow 8 OBBs to be mounted by a UID"
2010-10-07 14:01:23 -07:00
John Wang
5df4b5a78b am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp

* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
  Add flag to skip restoring network seletion.
2010-10-07 14:00:53 -07:00
Gilles Debunne
4a962a06db Merge "Removing 'last' of red cross asset." into gingerbread 2010-10-07 13:53:16 -07:00
Jeff Brown
8da727a1aa Minor fix for InputReader support for non-touchscreen devices.
Change-Id: I2256e37dd1c6f3836f82786aae14ee5d0c98f4c6
2010-10-07 13:44:51 -07:00
Jeff Brown
d577cfd73a Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread 2010-10-07 13:29:56 -07:00
Jeff Brown
415d8c3819 Switch Looper back to using poll() instead of epoll().
Added a couple of micro-optimizations to avoid calling wake() unnecessarily
and reduce JNI overhead slightly.

Fixed a minor issue where we were not clearing the "next" field of Messages
returned by the MessageQueue so the Message would hold on to its successor
and potentially prevent the GC from collecting it if the message were leaked
somehow.

Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
2010-10-07 13:26:39 -07:00
Gilles Debunne
94f183b1b4 Removing 'last' of red cross asset.
Change-Id: Ie325195220f95074d8e12e64216d1b02e9b3e2af
2010-10-07 12:07:43 -07:00
Andreas Huber
949f7d9066 Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread 2010-10-07 11:59:53 -07:00
Justin Ho
b74941e32e Merge "Fixed popup assets (background)" into gingerbread 2010-10-07 11:56:18 -07:00
Andreas Huber
4c19bf9833 Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
Change-Id: I7150e5e7342e1117c524856b204aadcb763e06ed
related-to-bug: 2368598
2010-10-07 11:41:43 -07:00
Xia Wang
afeeaf351a Port mock ril controller and tests to GB. DO NOT MERGE
Change-Id: Ie58236ecb8648d026356610f429054cb46b8640b
2010-10-07 11:34:46 -07:00
Adam Powell
f15dfbec5d Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread 2010-10-07 11:32:49 -07:00
Brad Fitzpatrick
6275dbbea8 Merge "Quiet unnecessary debug logging." into gingerbread 2010-10-07 11:27:56 -07:00
Brad Fitzpatrick
90bc5ee02b Quiet unnecessary debug logging.
Change-Id: I46d8aff5790db371d60b2066acbbdd55cfad8074
2010-10-07 11:26:57 -07:00
Adam Powell
574b37ecc2 Fix bug 3071869 - text anchors are now treated as application sub-panels.
This places text anchors on a layer above normal application panels,
ensuring that they stay above things like the browser autocompletion
list.

Change-Id: I4ee0aea7416a2dafd7e48a7a39acf949af5db3e9
2010-10-07 11:17:12 -07:00
Andreas Huber
02654f01bc Merge "On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread 2010-10-07 10:57:32 -07:00
Gilles Debunne
3c88039187 Fixed popup assets (background)
Change-Id: I8a651915119fec6a06a5f43315408b0d06c4b7d6
2010-10-07 10:54:54 -07:00
Kenny Root
e0c5ae7b55 Merge "Eliminate MCS_GIVE_UP state" into gingerbread 2010-10-07 10:54:14 -07:00
Kenny Root
480afe70fa Eliminate MCS_GIVE_UP state
It's basically a duplicate of MCS_UNBIND state, so just get rid of it
which simplifies the state transitions.

Bug: 3067076
Change-Id: I34111be88dd727af8ad59c9f49debd54ede827ea
2010-10-07 10:53:01 -07:00
Gilles Debunne
e86a6b2a4d Merge "Removed unused and broken screen_progress" into gingerbread 2010-10-07 10:52:11 -07:00
Brad Fitzpatrick
30f5c8fede More DropBoxManager javadoc love.
Change-Id: I9b14f6905533e0af66bd64fc76352ed8fc365058
2010-10-07 10:48:20 -07:00
Brad Fitzpatrick
fd124570ce Merge "DropBox.Entry javadoc syntax fix" into gingerbread 2010-10-07 10:20:32 -07:00
Kenny Root
0145e36cad Revert "Only allow 8 OBBs to be mounted by a UID"
This reverts commit 27358a69b33eaa268ee75ef778ec824c8085adcc.

Conflicts:

	services/java/com/android/server/MountService.java

Change-Id: Ia14be97b4f22e95daba0d191cfc62adf3d1469cd
2010-10-07 10:14:09 -07:00
Brad Fitzpatrick
95173b14d6 DropBox.Entry javadoc syntax fix
Change-Id: I32d055b39ca89ec9f6a7bf189263844424533b60
2010-10-07 10:07:34 -07:00
John Wang
08fb5851bb Merge "Add flag to skip restoring network seletion." into gingerbread 2010-10-07 09:47:01 -07:00
John Wang
35c4c211e0 Add flag to skip restoring network seletion.
For bug 3045366.

Change-Id: I7ad9ff89b0a77df473b638ad917b363c42de5405
2010-10-07 09:44:19 -07:00
Eric Rowe
82aacddef9 am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread
Merge commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6' into gingerbread-plus-aosp

* commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests
2010-10-07 09:19:37 -07:00
Andreas Huber
1e19416383 On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
Change-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c
related-to-bug: 3070094
2010-10-07 09:19:25 -07:00
Wink Saville
2e99245e0e am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread
Merge commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc' into gingerbread-plus-aosp

* commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc':
  Changed handling of onQueryCompelete to not use mimeType.
2010-10-07 09:16:54 -07:00
Eric Rowe
f8d2acdc57 Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread 2010-10-07 09:06:30 -07:00
Eric Rowe
8bcc744e1b DO NOT MERGE Initialize bluetooth profiles in BT stress tests
Change-Id: I0a8b75c8686d9d6969db51d618c1ddeacb2aba87
2010-10-07 18:01:23 +02:00
Wink Saville
bbc80d3436 Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread 2010-10-07 08:34:01 -07:00
Wink Saville
2e27a0be78 Changed handling of onQueryCompelete to not use mimeType.
Using mimeType causes an IPC request to contacts which can
be slow. This can cause an ANR of the Phone app. This change
parses the URL and to decide which column to use for the person_id
and thus should not cause an ANR.

bug: 3060704
Change-Id: I750c72746c7269e162f0338c0a3e00230a600519
2010-10-07 08:28:34 -07:00
Wu-cheng Li
9df1408513 am 29332971: Merge "Add javadoc for display orientation." into gingerbread
Merge commit '29332971ddbace4ae3d645a67f28f717df8b1dbd' into gingerbread-plus-aosp

* commit '29332971ddbace4ae3d645a67f28f717df8b1dbd':
  Add javadoc for display orientation.
2010-10-07 07:18:39 -07:00
Hung-ying Tyan
841d6ff9e0 am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread
Merge commit '62ec9834a09c9037d195c306fd838b4c0425e7e2' into gingerbread-plus-aosp

* commit '62ec9834a09c9037d195c306fd838b4c0425e7e2':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
2010-10-07 07:18:27 -07:00
Adam Powell
86b500289b am fbb3b476: Fix bug 3066313 - integrate new text anchor assets.
Merge commit 'fbb3b4768e858f004fe9a87e83b066244c829d87' into gingerbread-plus-aosp

* commit 'fbb3b4768e858f004fe9a87e83b066244c829d87':
  Fix bug 3066313 - integrate new text anchor assets.
2010-10-07 07:18:21 -07:00
Dianne Hackborn
18e225b42b am bfba7cab: Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
Merge commit 'bfba7cab94cd9cf28e561159dbbe934dc83a6f0a' into gingerbread-plus-aosp

* commit 'bfba7cab94cd9cf28e561159dbbe934dc83a6f0a':
  Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
2010-10-07 07:18:08 -07:00
Eric Fischer
7778173a32 am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c' into gingerbread-plus-aosp

* commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c':
  Import revised translations.  DO NOT MERGE
2010-10-07 07:16:56 -07:00
Xavier Ducrohet
556866a2ea am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread
Merge commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a' into gingerbread-plus-aosp

* commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a':
  Parser is optional in obtainStyledAttributes.
2010-10-07 07:16:51 -07:00
Hung-ying Tyan
909a974f8e am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread
Merge commit '16c29bd7f2ce147fd2f39f1f36df88d1b04a5387' into gingerbread-plus-aosp

* commit '16c29bd7f2ce147fd2f39f1f36df88d1b04a5387':
  SIP: Fix busy authentication loop.
2010-10-07 07:16:45 -07:00
Dianne Hackborn
55f1b0b82f am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread
Merge commit '9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp

* commit '9d6824cd53960b4562ea3c55876b40ca21710050':
  Make Activity.removeDialog() less strict.
2010-10-07 07:16:34 -07:00
Kenny Root
6ed0cfd3e7 am 5919ac6b: OBB: track binder death observers
Merge commit '5919ac6b4188285324646772501ef4b97b353cf4' into gingerbread-plus-aosp

* commit '5919ac6b4188285324646772501ef4b97b353cf4':
  OBB: track binder death observers
2010-10-07 07:16:18 -07:00
Kenny Root
36455d0325 am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread
Merge commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp

* commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed':
  Add MountService tests and fix a bug it found
2010-10-07 07:16:08 -07:00