Commit Graph

19986 Commits

Author SHA1 Message Date
Robert Ly
09103e07f8 Merge "Doc change: updating ndk download and overview page" into gingerbread 2010-11-30 13:51:05 -08:00
Scott Main
44aa324f68 am 54d21dad: docs: updates to the backup dev guide add sample code for performing restore and fix typos bug: 3180881,3125550,3125563
* commit '54d21dadf1aee8f58df65728a00ad57dbfeefb22':
  docs: updates to the backup dev guide add sample code for performing restore and fix typos bug: 3180881,3125550,3125563
2010-11-30 13:30:33 -08:00
Andreas Huber
9912a639c1 am 567b2bd1: Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
* commit '567b2bd1469b1c37e6249637d313253b7d84971e':
  After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
2010-11-30 13:07:56 -08:00
Andreas Huber
03d305cfea Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread 2010-11-30 13:00:14 -08:00
Eric Laurent
aaf4046203 am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread
* commit '688f4c58d4a7590ad47c219af3a5b8479d3a084d':
  Update java doc for visualizer FFT capture.
2010-11-30 11:56:00 -08:00
Andreas Huber
fde5bc50f2 am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
* commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5':
  DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
2010-11-30 11:53:01 -08:00
Eric Laurent
528648d56f Merge "Update java doc for visualizer FFT capture." into gingerbread 2010-11-30 11:50:25 -08:00
Dirk Dougherty
915f0c59c7 am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
* commit '04d2cc05a2a59bf61bead85d58bc4c186392d91d':
  Do not merge: Doc change: API diff report for gingerbread.
2010-11-30 11:48:51 -08:00
Dirk Dougherty
e45fcf3c7a am 50f8445e: Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
* commit '50f8445edd14a21ad86080ff7b204eefdc2c62d5':
  Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
2010-11-30 11:48:46 -08:00
Eric Fischer
b192c271eb am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '3e6fb5d66eed34c91b9b056ad2d4c317186476fd':
  Import revised translations.  DO NOT MERGE
2010-11-30 11:48:00 -08:00
Wink Saville
46abef4b46 am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
  Fix GSM permanent failure handling, DO NOT MERGE.
2010-11-30 11:46:34 -08:00
Ben Murdoch
92a9946c6b am 27e728f2: Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
* commit '27e728f22d954caa7252be6c19a67a9277e1db3b':
  Hide plugin views when we start playing HTML5 video
2010-11-30 11:46:24 -08:00
Hung-ying Tyan
0c35b2752f am 349f3509: Merge "Correct SipService.isOpened() implementation." into gingerbread
* commit '349f3509f7335bbdef443a75afa36fb3c2d9552c':
  Correct SipService.isOpened() implementation.
2010-11-30 11:46:15 -08:00
Hung-ying Tyan
620d026389 am d9e12303: Merge "Notify SipSessions before closing SIP stack." into gingerbread
* commit 'd9e12303d279654afe16319f948f93490cd1b4d5':
  Notify SipSessions before closing SIP stack.
2010-11-30 11:46:08 -08:00
Hung-ying Tyan
003a6e8edc am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread
* commit '0bba9535413f9ceefe03f1cef9ddaddccd05cae5':
  Throw proper exceptions in SipManager
2010-11-30 11:46:01 -08:00
Chia-chi Yeh
425027d179 am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
* commit '683a7ff922409d2aa6c944bc4e08de32029e80e5':
  Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
2010-11-30 11:45:54 -08:00
Irfan Sheriff
dc848fc447 am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread
* commit 'ee93169ed1072d3be627601223dafbcc061e7568':
  DO NOT MERGE fix runstate race condition
2010-11-30 11:45:45 -08:00
Chia-chi Yeh
93c691619b am bd399b0b: Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread
* commit 'bd399b0bd205a1a3889bae1a619c6d4d4a0f4816':
  RTP: Pause echo suppressor when far-end volume is low.
2010-11-30 11:45:31 -08:00
Andreas Huber
7b3e445b94 Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread 2010-11-30 11:42:22 -08:00
Dirk Dougherty
c17743c07e Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread 2010-11-30 11:27:15 -08:00
Eric Fischer
8168a694dc Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-11-30 10:12:46 -08:00
Wink Saville
89912d32b2 Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread 2010-11-30 08:15:41 -08:00
Ben Murdoch
4a49235a04 Merge "Hide plugin views when we start playing HTML5 video" into gingerbread 2010-11-30 02:43:29 -08:00
Hung-ying Tyan
570bed6841 Merge "Correct SipService.isOpened() implementation." into gingerbread 2010-11-30 00:56:57 -08:00
Hung-ying Tyan
b251e0f609 Merge "Notify SipSessions before closing SIP stack." into gingerbread 2010-11-30 00:54:51 -08:00
Hung-ying Tyan
bf08df28f3 Merge "Throw proper exceptions in SipManager" into gingerbread 2010-11-30 00:51:22 -08:00
Chia-chi Yeh
65b9c530a6 Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread 2010-11-29 22:56:56 -08:00
Irfan Sheriff
017a1e7e83 Merge "DO NOT MERGE fix runstate race condition" into gingerbread 2010-11-29 22:26:52 -08:00
Chia-chi Yeh
fa7be2cf06 Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread 2010-11-29 22:19:57 -08:00
Dirk Dougherty
21b511dbd2 am 47ccfcb0: Doc change: add AccelerometerPlay to the generated samples.
* commit '47ccfcb015c06f12eb91ccbb1113c15a368960d8':
  Doc change: add AccelerometerPlay to the generated samples.
2010-11-29 18:16:50 -08:00
Dirk Dougherty
77aebc3e47 am b1150edc: Remove HeavyWeight sample from generated html samples.
* commit 'b1150edc22d97b36c626a460717803f22b9fa5f2':
  Remove HeavyWeight sample from generated html samples.
2010-11-29 17:12:40 -08:00
Trevor Johns
88d3f106bf am 210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
* commit '210e9c4a8b1fdbe9c409f9ce426907587430858a':
  Revert "Disabling AccessibilityService sample from build system."
2010-11-24 16:23:47 -08:00
Trevor Johns
ccacf00df2 Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread 2010-11-24 16:21:16 -08:00
Xia Wang
eb536090ef am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
* commit 'c1c04ad047d7ca2f13aa5c9883da7219df5bee57':
  Add Wi-Fi tests for static IP. DO NOT MERGE
2010-11-24 13:29:56 -08:00
Xia Wang
5cfbd426a4 Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread 2010-11-24 13:27:53 -08:00
Scott Main
57087147ef am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820
* commit '93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
  docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:43:08 -08:00
Scott Main
03ffe08783 am 3577f51d: docs: clarify <include> layout properties bug: 3227820
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
  docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:39:42 -08:00
Jean-Baptiste Queru
ec756056ab am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"
* commit 'f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
  frameworks/base: Destroy the overlay even if there is an error
2010-11-23 11:14:57 -08:00
Jean-Baptiste Queru
4e8fa27b4e Merge "frameworks/base: Destroy the overlay even if there is an error" 2010-11-23 11:02:09 -08:00
Gloria Wang
8cec955963 am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
  Notify the playback status to DRM agents before the playback starts
2010-11-22 21:26:13 -08:00
Gloria Wang
81ee631fd5 am d9334934: Merge "Update of DRM Framework."
* commit 'd93349342a89a25c7a884e8543c6adc048c5f86d':
  Update of DRM Framework.
2010-11-22 21:25:56 -08:00
Gloria Wang
6772c2d92d Merge "Notify the playback status to DRM agents before the playback starts" 2010-11-22 21:15:07 -08:00
Gloria Wang
80b7966f1f Merge "Update of DRM Framework." 2010-11-22 21:14:09 -08:00
Jean-Baptiste Queru
37e7e9e052 resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
2010-11-22 16:32:34 -08:00
Jean-Baptiste Queru
dba567c4ae Merge "Enabling cell broadcast (SMS-CB) support in the platform." 2010-11-22 15:59:04 -08:00
Xia Wang
07db9276c0 am 5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
* commit '5df8c155872833647ac56951ab90bd26a9af9480':
  Add Wifi Tethering stress test
2010-11-22 14:46:33 -08:00
Xia Wang
14073fb621 Merge "Add Wifi Tethering stress test" into gingerbread 2010-11-22 14:44:49 -08:00
Naomi Luis
29a73ba845 frameworks/base: Destroy the overlay even if there is an error
Allow the overlay object to be destroyed whenever the destroy is
invoked. Currently the destroy call returns if there is an error
encountered, which results in open data and control channels.

Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
2010-11-22 14:03:18 -08:00
Scott Main
30a731e6c5 am 8fac7c2e: change sdk version variable to 2.3 (for docs)
* commit '8fac7c2edc433b6c7d153caac238fef595133663':
  change sdk version variable to 2.3 (for docs)
2010-11-22 13:55:55 -08:00
Jean-Baptiste Queru
a96d0edeef am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
* commit 'b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
  SearchDialog: Fix for NullpointerException while using Suggestions in Browser
2010-11-22 13:44:56 -08:00