OSDN Git Service

android-x86/frameworks-native.git
13 years agoMerge "Replace a custom AndroidRuntime::findClass with a more targeted fix."
Elliott Hughes [Fri, 15 Apr 2011 00:00:52 +0000 (17:00 -0700)]
Merge "Replace a custom AndroidRuntime::findClass with a more targeted fix."

13 years agoam 07a630d2: am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes...
Dianne Hackborn [Thu, 14 Apr 2011 22:43:03 +0000 (15:43 -0700)]
am 07a630d2: am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

* commit '07a630d23ef326f820e6339b5f691df0aafd3574':
  Fix issue #4291805: Tap Fish crashes on launch

13 years agoam 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch"...
Dianne Hackborn [Thu, 14 Apr 2011 22:40:00 +0000 (15:40 -0700)]
am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

* commit '9a03a73a44c69706fe2b97a28632928f58b434b1':
  Fix issue #4291805: Tap Fish crashes on launch

13 years agoam f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1
Dianne Hackborn [Thu, 14 Apr 2011 22:27:32 +0000 (15:27 -0700)]
am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

* commit 'f6f87c985989603139b31df663f9f9a90543cacc':
  Fix issue #4291805: Tap Fish crashes on launch

13 years agoMerge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1
Dianne Hackborn [Thu, 14 Apr 2011 22:10:31 +0000 (15:10 -0700)]
Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

13 years agoam 1bfb2db9: (-s ours) am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import...
Eric Fischer [Thu, 14 Apr 2011 22:04:41 +0000 (15:04 -0700)]
am 1bfb2db9: (-s ours) am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '1bfb2db93514f8ed70d0a02c12d7ce4791d6b336':
  Import revised translations.  DO NOT MERGE

13 years agoam cc0cfcf2: am a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA...
Scott Main [Thu, 14 Apr 2011 22:04:17 +0000 (15:04 -0700)]
am cc0cfcf2: am a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs

* commit 'cc0cfcf2ece4610126b7b213af2673da45772270':
  docs: bring back the SDK EULA wall for downloading archived SDKs

13 years agoam b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations...
Eric Fischer [Thu, 14 Apr 2011 21:29:19 +0000 (14:29 -0700)]
am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit 'b590ca85afba6b886cc995e9a6092457174ea016':
  Import revised translations.  DO NOT MERGE

13 years agoam 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE...
Eric Fischer [Thu, 14 Apr 2011 21:26:46 +0000 (14:26 -0700)]
am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '4e3d6aa0688f023dfe5feb2eb197207cc8267463':
  Import revised translations.  DO NOT MERGE

13 years agoam a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloa...
Scott Main [Thu, 14 Apr 2011 21:23:23 +0000 (14:23 -0700)]
am a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs

* commit 'a4f4a8431caaef4e1381acc41a84e44e99a13e37':
  docs: bring back the SDK EULA wall for downloading archived SDKs

13 years agoam d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Thu, 14 Apr 2011 21:21:57 +0000 (14:21 -0700)]
am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit 'd284a8676e002a72b66d321402ec7f4ed61c7915':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Thu, 14 Apr 2011 21:14:46 +0000 (14:14 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb

13 years agoam 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived...
Scott Main [Thu, 14 Apr 2011 21:08:51 +0000 (14:08 -0700)]
am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs

* commit '2a08e7bf6778fe7494be45c7231e2df3edce5ab4':
  docs: bring back the SDK EULA wall for downloading archived SDKs

13 years agoam d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
Scott Main [Thu, 14 Apr 2011 20:55:16 +0000 (13:55 -0700)]
am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs

* commit 'd08debcb211ec2e369c8c88ce15e4aaadd54a8d4':
  docs: bring back the SDK EULA wall for downloading archived SDKs

13 years agoMerge "Address comments for dalvik/docs/jni-tips.html documentation."
Elliott Hughes [Thu, 14 Apr 2011 19:54:27 +0000 (12:54 -0700)]
Merge "Address comments for dalvik/docs/jni-tips.html documentation."

13 years agoMerge "First bits of WebDriver containing blocking function to load a page and fetchi...
Steve Block [Thu, 14 Apr 2011 18:07:04 +0000 (11:07 -0700)]
Merge "First bits of WebDriver containing blocking function to load a page and fetching the page source."

13 years agoMerge "Rewrite battery history storage."
Dianne Hackborn [Thu, 14 Apr 2011 17:58:28 +0000 (10:58 -0700)]
Merge "Rewrite battery history storage."

13 years agoRewrite battery history storage.
Dianne Hackborn [Thu, 14 Apr 2011 01:15:56 +0000 (18:15 -0700)]
Rewrite battery history storage.

We now write battery history directly into a buffer, instead of
creating objects.  This allows for more efficient storage; later
it can be even better because we can only write deltas.

The old code is still there temporarily for validation.

Change-Id: I9707d4d8ff30855be8ebdc93bc078911040d8e0b

13 years agoMerge "Add the old dalvik/docs/jni-tips.html documentation."
Elliott Hughes [Thu, 14 Apr 2011 17:43:40 +0000 (10:43 -0700)]
Merge "Add the old dalvik/docs/jni-tips.html documentation."

13 years agoMerge "Fix around suggestionSpan."
Gilles Debunne [Thu, 14 Apr 2011 17:38:05 +0000 (10:38 -0700)]
Merge "Fix around suggestionSpan."

13 years agoReplace a custom AndroidRuntime::findClass with a more targeted fix.
Elliott Hughes [Wed, 13 Apr 2011 22:39:37 +0000 (15:39 -0700)]
Replace a custom AndroidRuntime::findClass with a more targeted fix.

This seems simpler and more contained, and I think the comment explaining
why hoop-jumping is necessary is a bit clearer now.

Change-Id: Ief4afd7cbb42188ed835fce23e497520bdb753a8

13 years agoam a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static...
Xia Wang [Wed, 13 Apr 2011 23:05:07 +0000 (16:05 -0700)]
am a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1

* commit 'a4b76ff4911538f01e92af2f3fa3f4016ad0e290':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi

13 years agoam d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property...
Xia Wang [Wed, 13 Apr 2011 22:52:39 +0000 (15:52 -0700)]
am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1

* commit 'd69ec89f5d31064174d79e2e77504814629cffa6':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi

13 years agoMerge "- Add another parameter in notify() to be able to send timed text sample throu...
Gloria Wang [Wed, 13 Apr 2011 22:36:14 +0000 (15:36 -0700)]
Merge "- Add another parameter in notify() to be able to send timed text sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939."

13 years agoam 46b59ef0: Merge "Fix access point parsing: reset static link property after parsin...
Xia Wang [Wed, 13 Apr 2011 22:34:29 +0000 (15:34 -0700)]
am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1

* commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi

13 years agoMerge "Fix access point parsing: reset static link property after parsing static...
Xia Wang [Wed, 13 Apr 2011 22:13:10 +0000 (15:13 -0700)]
Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1

13 years agoam 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
Glenn Kasten [Wed, 13 Apr 2011 18:56:41 +0000 (11:56 -0700)]
am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code

* commit '8d2e14daa752d657b9747fc9734fbfd7b34c1f7a':
  Bug 4167061 remove debugging code

13 years agoam 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
Glenn Kasten [Wed, 13 Apr 2011 18:52:32 +0000 (11:52 -0700)]
am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code

* commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4':
  Bug 4167061 remove debugging code

13 years agoam b0d6f10e: Bug 4167061 remove debugging code
Glenn Kasten [Wed, 13 Apr 2011 18:48:28 +0000 (11:48 -0700)]
am b0d6f10e: Bug 4167061 remove debugging code

* commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc':
  Bug 4167061 remove debugging code

13 years agoMerge "Fix a typo in FrameLayout JavaDoc"
Steve Block [Wed, 13 Apr 2011 18:10:17 +0000 (11:10 -0700)]
Merge "Fix a typo in FrameLayout JavaDoc"

13 years agoMerge "More native code cleanup."
Elliott Hughes [Wed, 13 Apr 2011 18:09:57 +0000 (11:09 -0700)]
Merge "More native code cleanup."

13 years agoMerge "Use an @hide libcore API to get the FileDescriptor from a Socket."
Elliott Hughes [Wed, 13 Apr 2011 17:18:03 +0000 (10:18 -0700)]
Merge "Use an @hide libcore API to get the FileDescriptor from a Socket."

13 years agoMerge "Don't allocate a raw object then call its constructor manually..."
Elliott Hughes [Wed, 13 Apr 2011 17:17:46 +0000 (10:17 -0700)]
Merge "Don't allocate a raw object then call its constructor manually..."

13 years agoMerge "Add camera metering area API."
Wu-cheng Li [Wed, 13 Apr 2011 08:14:42 +0000 (01:14 -0700)]
Merge "Add camera metering area API."

13 years agoam 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
Wink Saville [Wed, 13 Apr 2011 00:03:29 +0000 (17:03 -0700)]
am 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE

* commit '05be003f7f3dd758c44c2cdb3e7aa638d8daa446':
  Fix occasional phone app crash

13 years agoam c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
Wink Saville [Wed, 13 Apr 2011 00:00:57 +0000 (17:00 -0700)]
am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE

* commit 'c078a4362791cec3976c4312d3f7e0e96b3487bf':
  Fix occasional phone app crash

13 years agoMerge "Fix occasional phone app crash" into honeycomb-LTE
Wink Saville [Tue, 12 Apr 2011 23:53:54 +0000 (16:53 -0700)]
Merge "Fix occasional phone app crash" into honeycomb-LTE

13 years agoMerge "Remove useless forward declarations."
Elliott Hughes [Tue, 12 Apr 2011 23:29:49 +0000 (16:29 -0700)]
Merge "Remove useless forward declarations."

13 years agoMerge "Updated system packages retain shared user"
Kenny Root [Tue, 12 Apr 2011 22:34:42 +0000 (15:34 -0700)]
Merge "Updated system packages retain shared user"

13 years agoam bf3452f3: am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo
Scott Main [Tue, 12 Apr 2011 21:55:32 +0000 (14:55 -0700)]
am bf3452f3: am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo

* commit 'bf3452f36c768808873e5428e3594c7eaec0a10c':
  docs: fix doc typo

13 years agoam 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo
Scott Main [Tue, 12 Apr 2011 21:52:30 +0000 (14:52 -0700)]
am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo

* commit '34b42b2ded4741e68413d0aa39f3af146629dcec':
  docs: fix doc typo

13 years agoam 7e8902a9: am f42937a8: docs: fix doc typo
Scott Main [Tue, 12 Apr 2011 21:48:30 +0000 (14:48 -0700)]
am 7e8902a9: am f42937a8: docs: fix doc typo

* commit '7e8902a90566bf05c9bc12f87f4149fc6e3c00a4':
  docs: fix doc typo

13 years agoam f42937a8: docs: fix doc typo
Scott Main [Tue, 12 Apr 2011 21:44:02 +0000 (14:44 -0700)]
am f42937a8: docs: fix doc typo

* commit 'f42937a8aa0af6b22d8a2a43a9bfc07c38aeffb5':
  docs: fix doc typo

13 years agoam 70cf1b97: (-s ours) am 68cb0ffa: (-s ours) am 71a556f2: Import revised translation...
Eric Fischer [Tue, 12 Apr 2011 20:28:14 +0000 (13:28 -0700)]
am 70cf1b97: (-s ours) am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations.  DO NOT MERGE

* commit '70cf1b97586a4f1ffa04fe0d83c3590fc22f6a56':
  Import revised translations.  DO NOT MERGE

13 years agoam 6ce11bb0: am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links
Scott Main [Tue, 12 Apr 2011 20:27:43 +0000 (13:27 -0700)]
am 6ce11bb0: am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links

* commit '6ce11bb0e1d8e0366f4321f90826d60ee1e52193':
  docs: fix broken links

13 years agoam e3aa4ec6: am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited downlo...
Bill Gruber [Tue, 12 Apr 2011 20:27:38 +0000 (13:27 -0700)]
am e3aa4ec6: am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations

* commit 'e3aa4ec6b1c0d1e732fb686c0d8adc7d729b6fc6':
  Doc fix-corrects the cited download locations

13 years agoam 68cb0ffa: (-s ours) am 71a556f2: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 12 Apr 2011 20:18:52 +0000 (13:18 -0700)]
am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations.  DO NOT MERGE

* commit '68cb0ffad05323dc1df7faeefa8f41586744c293':
  Import revised translations.  DO NOT MERGE

13 years agoam 91470be4: am c7b94371: am b9fedd97: docs: fix broken links
Scott Main [Tue, 12 Apr 2011 20:08:50 +0000 (13:08 -0700)]
am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links

* commit '91470be46644493be89dc277f3c0f987f34bc937':
  docs: fix broken links

13 years agoam c7b94371: am b9fedd97: docs: fix broken links
Scott Main [Tue, 12 Apr 2011 20:06:50 +0000 (13:06 -0700)]
am c7b94371: am b9fedd97: docs: fix broken links

* commit 'c7b94371a0a4cbe853c17c4610a564a5a4d3efd5':
  docs: fix broken links

13 years agoam b9fedd97: docs: fix broken links
Scott Main [Tue, 12 Apr 2011 20:02:43 +0000 (13:02 -0700)]
am b9fedd97: docs: fix broken links

* commit 'b9fedd9771a6aedf068155fd91f15baf52e668cd':
  docs: fix broken links

13 years agoam 71a556f2: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 12 Apr 2011 20:02:15 +0000 (13:02 -0700)]
am 71a556f2: Import revised translations.  DO NOT MERGE

* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
  Import revised translations.  DO NOT MERGE

13 years agoresolved conflicts for merge of 18490fb9 to master
Kenny Root [Tue, 12 Apr 2011 19:51:08 +0000 (12:51 -0700)]
resolved conflicts for merge of 18490fb9 to master

Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37

13 years agoam a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
Bill Gruber [Tue, 12 Apr 2011 19:42:26 +0000 (12:42 -0700)]
am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations

* commit 'a8c68be89d3735e5d579e521d0798032303330d3':
  Doc fix-corrects the cited download locations

13 years agoam df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
Bill Gruber [Tue, 12 Apr 2011 19:23:33 +0000 (12:23 -0700)]
am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations

* commit 'df8fc2e1bfb6abcbea107636f36fae464faf976f':
  Doc fix-corrects the cited download locations

13 years agoMerge "More native code cleanup."
Elliott Hughes [Tue, 12 Apr 2011 19:09:01 +0000 (12:09 -0700)]
Merge "More native code cleanup."

13 years agoMerge "Fix typos."
Andy McFadden [Tue, 12 Apr 2011 19:02:36 +0000 (12:02 -0700)]
Merge "Fix typos."

13 years agoam 9a693ed9: Doc fix-corrects the cited download locations
Bill Gruber [Tue, 12 Apr 2011 18:48:00 +0000 (11:48 -0700)]
am 9a693ed9: Doc fix-corrects the cited download locations

* commit '9a693ed9870cf2d5817a3bfc8dc0fbec4456a3c2':
  Doc fix-corrects the cited download locations

13 years agoMerge "protect all /cache/recovery/last_* files from deletion"
Doug Zongker [Tue, 12 Apr 2011 18:30:47 +0000 (11:30 -0700)]
Merge "protect all /cache/recovery/last_* files from deletion"

13 years agoresolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
Kenny Root [Tue, 12 Apr 2011 17:27:15 +0000 (10:27 -0700)]
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp

Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53

13 years agoMerge "Kill the global references in the OpenGL wrappers."
Elliott Hughes [Tue, 12 Apr 2011 17:19:11 +0000 (10:19 -0700)]
Merge "Kill the global references in the OpenGL wrappers."

13 years agoMerge "Experimental support for changing the video surface/texture on an active media...
Andreas Huber [Tue, 12 Apr 2011 16:25:32 +0000 (09:25 -0700)]
Merge "Experimental support for changing the video surface/texture on an active mediaplayer"

13 years agoMerge "If the media extractor specifies an invalid thumbnail time, default to the...
Andreas Huber [Tue, 12 Apr 2011 15:36:59 +0000 (08:36 -0700)]
Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame."

13 years agoam 0b9b8711: am 43be7a61: EthernetDataTracker: implement setDependencyMet
Benoit Goby [Tue, 12 Apr 2011 03:26:41 +0000 (20:26 -0700)]
am 0b9b8711: am 43be7a61: EthernetDataTracker: implement setDependencyMet

* commit '0b9b8711a1a2107dc913cc751b7d981fce4f3082':
  EthernetDataTracker: implement setDependencyMet

13 years agoam 43be7a61: EthernetDataTracker: implement setDependencyMet
Benoit Goby [Tue, 12 Apr 2011 03:23:42 +0000 (20:23 -0700)]
am 43be7a61: EthernetDataTracker: implement setDependencyMet

* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
  EthernetDataTracker: implement setDependencyMet

13 years agoresolved conflicts for merge of 31659471 to master
Benoit Goby [Tue, 12 Apr 2011 02:07:11 +0000 (19:07 -0700)]
resolved conflicts for merge of 31659471 to master

Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9

13 years agoam 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
Benoit Goby [Tue, 12 Apr 2011 01:53:57 +0000 (18:53 -0700)]
am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE

* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters

13 years agoresolved conflicts for merge of 08c39c6a to honeycomb-LTE
Benoit Goby [Tue, 12 Apr 2011 01:41:23 +0000 (18:41 -0700)]
resolved conflicts for merge of 08c39c6a to honeycomb-LTE

Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92

13 years agoam 07c25b65: am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized...
Brad Fitzpatrick [Tue, 12 Apr 2011 00:32:37 +0000 (17:32 -0700)]
am 07c25b65: am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"

* commit '07c25b651216daac884bd503c02b788418165b50':
  audioflinger: Enable ARMv5TE optimized resampler

13 years agoam 1f2a307b: resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp
Xavier Ducrohet [Tue, 12 Apr 2011 00:28:59 +0000 (17:28 -0700)]
am 1f2a307b: resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp

* commit '1f2a307b59a6f1d61390425b52c3f0aafc21c54b':
  LayoutLib: don't render when shader's local matrix is set to 0 scale.

13 years agoMerge "You don't need to poke around inside FileDescriptor manually."
Elliott Hughes [Tue, 12 Apr 2011 00:27:53 +0000 (17:27 -0700)]
Merge "You don't need to poke around inside FileDescriptor manually."

13 years agoam 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
Brad Fitzpatrick [Tue, 12 Apr 2011 00:27:12 +0000 (17:27 -0700)]
am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"

* commit '4430670f48f75661293371dab8db55865f5f56e0':
  audioflinger: Enable ARMv5TE optimized resampler

13 years agoresolved conflicts for merge of 4754c79a to honeycomb-plus-aosp
Xavier Ducrohet [Tue, 12 Apr 2011 00:11:41 +0000 (17:11 -0700)]
resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp

Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342

13 years agoam fc1bf925: resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp
Xavier Ducrohet [Mon, 11 Apr 2011 23:33:12 +0000 (16:33 -0700)]
am fc1bf925: resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp

* commit 'fc1bf9256372018188468b8ba5163ac5dcc74f56':
  Merge c5aeac7f from honeycomb.

13 years agoMerge "Fix in BreakIterator."
Gilles Debunne [Mon, 11 Apr 2011 23:21:38 +0000 (16:21 -0700)]
Merge "Fix in BreakIterator."

13 years agoresolved conflicts for merge of efa98a29 to honeycomb-plus-aosp
Xavier Ducrohet [Mon, 11 Apr 2011 23:15:54 +0000 (16:15 -0700)]
resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp

Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701

13 years agoam 08d9d9a4: Merge "Runtime resource overlay, iteration 1."
Kenny Root [Mon, 11 Apr 2011 22:33:19 +0000 (15:33 -0700)]
am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."

* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
  Runtime resource overlay, iteration 1.

13 years agoKill the global references in the OpenGL wrappers.
Elliott Hughes [Sat, 9 Apr 2011 03:01:01 +0000 (20:01 -0700)]
Kill the global references in the OpenGL wrappers.

Just use jniThrowException instead. Note that it would be trivial to throw
seemingly more appropriate exceptions (NullPointerException and
OutOfMemoryException in particular), but I'm only attempting to preserve
existing behavior here.

I also found shadowing bugs in some of the special-case functions, which
would previously always have leaked memory.

This also moves an accidental change to a generated file (ActivityThread ->
AppGlobals) into the generator, so it won't be overwritten in future.

Change-Id: Iab570310b568cb406c60dd0e2b8211f8a36ae590

13 years agoMerge "Import revised translations."
Eric Fischer [Mon, 11 Apr 2011 21:36:47 +0000 (14:36 -0700)]
Merge "Import revised translations."

13 years agoam 9e13c7e5: am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak
Mike Lockwood [Mon, 11 Apr 2011 21:28:34 +0000 (14:28 -0700)]
am 9e13c7e5: am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak

* commit '9e13c7e5d787252b2a88aace1115b51a95e16b5d':
  UsbManager: minor Javadoc tweak

13 years agoam f953d3e2: am 7f506024: am 78a9766b: Merge "Implement teardown script." into ginger...
Jason parks [Mon, 11 Apr 2011 21:28:30 +0000 (14:28 -0700)]
am f953d3e2: am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread

* commit 'f953d3e2eac2af121e4b83f6bf613e0800fd7952':
  Implement teardown script.

13 years agoam a83bc160: am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.
Jeff Hamilton [Mon, 11 Apr 2011 21:28:27 +0000 (14:28 -0700)]
am a83bc160: am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.

* commit 'a83bc160892078c20489897190ee163d5c4d3783':
  Make the NFC UID forward compatible.

13 years agoam 6f2b5d61: (-s ours) am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from...
James Dong [Mon, 11 Apr 2011 21:28:24 +0000 (14:28 -0700)]
am 6f2b5d61: (-s ours) am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread

* commit '6f2b5d614c13fb93f20697bce3bf73176828276d':
  When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.

13 years agoam 9645081c: am 43707a83: UsbManager: minor Javadoc tweak
Mike Lockwood [Mon, 11 Apr 2011 21:24:11 +0000 (14:24 -0700)]
am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak

* commit '9645081cc7f31e1151fedbcd5932a100719e91e4':
  UsbManager: minor Javadoc tweak

13 years agoam 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread
Jason parks [Mon, 11 Apr 2011 21:24:06 +0000 (14:24 -0700)]
am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread

* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
  Implement teardown script.

13 years agoam 7bb236c3: am 84d34078: Make the NFC UID forward compatible.
Jeff Hamilton [Mon, 11 Apr 2011 21:23:59 +0000 (14:23 -0700)]
am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.

* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
  Make the NFC UID forward compatible.

13 years agoam b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0...
James Dong [Mon, 11 Apr 2011 21:23:52 +0000 (14:23 -0700)]
am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread

* commit 'b0ccbacdb35e8e987eb9efd61af13fefd7c2f5f0':
  When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.

13 years agoMerge "Add a sprite controller."
Jeff Brown [Mon, 11 Apr 2011 21:10:56 +0000 (14:10 -0700)]
Merge "Add a sprite controller."

13 years agoam a7e8385c: am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
Glenn Kasten [Mon, 11 Apr 2011 19:49:03 +0000 (12:49 -0700)]
am a7e8385c: am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)

* commit 'a7e8385cb34a19e47fb67bf8f632a8b47503242d':
  Enable HDCP debugging in Stagefright (1 of 2)

13 years agoam 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
Glenn Kasten [Mon, 11 Apr 2011 19:46:38 +0000 (12:46 -0700)]
am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)

* commit '87ee132ac5dd99564d4ad8f05631bbb021dbc0b0':
  Enable HDCP debugging in Stagefright (1 of 2)

13 years agoam c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
Glenn Kasten [Mon, 11 Apr 2011 19:43:28 +0000 (12:43 -0700)]
am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)

* commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee':
  Enable HDCP debugging in Stagefright (1 of 2)

13 years agoMerge "Package manager changes to store and update user information."
Amith Yamasani [Mon, 11 Apr 2011 19:14:17 +0000 (12:14 -0700)]
Merge "Package manager changes to store and update user information."

13 years agoam 1b00dc66: am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine...
Wink Saville [Mon, 11 Apr 2011 19:11:14 +0000 (12:11 -0700)]
am 1b00dc66: am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE

* commit '1b00dc66d4b61b9a2bf44f76a9d3f54be91a2dbf':
  Move ProcessedMessage into HierarchicalStateMachine.

13 years agoam 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeyc...
Wink Saville [Mon, 11 Apr 2011 19:08:19 +0000 (12:08 -0700)]
am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE

* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
  Move ProcessedMessage into HierarchicalStateMachine.

13 years agoMerge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
Wink Saville [Mon, 11 Apr 2011 19:04:47 +0000 (12:04 -0700)]
Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE

13 years agoam 2df36fd6: am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings...
Freeman Ng [Mon, 11 Apr 2011 18:30:21 +0000 (11:30 -0700)]
am 2df36fd6: am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE

* commit '2df36fd6ec39e096327032283d058b48be19e843':
  Add prepaid data services URL to Secure Settings

13 years agoam b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
Freeman Ng [Mon, 11 Apr 2011 18:19:18 +0000 (11:19 -0700)]
am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE

* commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e':
  Add prepaid data services URL to Secure Settings

13 years agoMerge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
Freeman Ng [Mon, 11 Apr 2011 18:10:18 +0000 (11:10 -0700)]
Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE

13 years agoMerge "In the MP3 extractor, compute timestamps based on sample count instead of...
Jason Simmons [Mon, 11 Apr 2011 17:43:41 +0000 (10:43 -0700)]
Merge "In the MP3 extractor, compute timestamps based on sample count instead of byte count. This fixes timestamp accuracy on VBR streams."

13 years agoMerge "Runtime resource overlay, iteration 1."
Kenny Root [Mon, 11 Apr 2011 17:07:15 +0000 (10:07 -0700)]
Merge "Runtime resource overlay, iteration 1."

13 years agoam 6e797566: am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT...
Wink Saville [Sat, 9 Apr 2011 15:05:31 +0000 (08:05 -0700)]
am 6e797566: am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE

* commit '6e797566650c10ba8655aea914d521f5999073e8':
  Cleanup all functions overridden from DCT in GDCT