OSDN Git Service

android-x86/frameworks-native.git
12 years agoam 59d46b06: Merge "Add an api to switch to the next IME and subtype"
satok [Fri, 10 Feb 2012 10:25:02 +0000 (02:25 -0800)]
am 59d46b06: Merge "Add an api to switch to the next IME and subtype"

* commit '59d46b06653b5f55c2f26d3ff8d642ffda0cecd8':
  Add an api to switch to the next IME and subtype

12 years agoMerge "Add an api to switch to the next IME and subtype"
satok [Fri, 10 Feb 2012 10:22:57 +0000 (02:22 -0800)]
Merge "Add an api to switch to the next IME and subtype"

12 years agoam 55ee8415: Merge "move away from MediaDebug and use ADebug instead for video editor...
James Dong [Fri, 10 Feb 2012 07:55:45 +0000 (23:55 -0800)]
am 55ee8415: Merge "move away from MediaDebug and use ADebug instead for video editor engine"

* commit '55ee84154b3afe07afef6311f707928856840f89':
  move away from MediaDebug and use ADebug instead for video editor engine

12 years agoMerge "move away from MediaDebug and use ADebug instead for video editor engine"
James Dong [Fri, 10 Feb 2012 07:53:50 +0000 (23:53 -0800)]
Merge "move away from MediaDebug and use ADebug instead for video editor engine"

12 years agoam 59adf8a1: am b45087bf: am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642
Scott Main [Fri, 10 Feb 2012 05:11:02 +0000 (21:11 -0800)]
am 59adf8a1: am b45087bf: am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642

* commit '59adf8a1019724e556f86957aba489e1fee5454d':

12 years agoam f1908925: am d2deae8f: am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials...
Joe Fernandez [Fri, 10 Feb 2012 05:11:00 +0000 (21:11 -0800)]
am f1908925: am d2deae8f: am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

* commit 'f19089259ecd6627cd4703ab55b5df8a4f4644a7':

12 years agoam 6b9f68ac: am 758fe151: am cf18f420: am 52bfc243: docs: fix misc doc bugs from...
Scott Main [Fri, 10 Feb 2012 05:10:57 +0000 (21:10 -0800)]
am 6b9f68ac: am 758fe151: am cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit '6b9f68ac89615505ac24f8c00d3fddc4ff43b58b':

12 years agoam b45087bf: am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642
Scott Main [Fri, 10 Feb 2012 05:09:01 +0000 (21:09 -0800)]
am b45087bf: am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642

* commit 'b45087bf09921dd515e83804d821f127d8b790c6':

12 years agoam d2deae8f: am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken...
Joe Fernandez [Fri, 10 Feb 2012 05:08:59 +0000 (21:08 -0800)]
am d2deae8f: am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

* commit 'd2deae8f40d33ad69d92963a7fceb90ee3cae1ad':

12 years agoam 758fe151: am cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue...
Scott Main [Fri, 10 Feb 2012 05:08:58 +0000 (21:08 -0800)]
am 758fe151: am cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit '758fe1511e499099deddcb94994b5d9a332062e1':

12 years agoam 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642
Scott Main [Fri, 10 Feb 2012 05:07:10 +0000 (21:07 -0800)]
am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642

* commit '98c313340a46401adda86b398a7623f39aa8e412':

12 years agoam a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue...
Joe Fernandez [Fri, 10 Feb 2012 05:07:08 +0000 (21:07 -0800)]
am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

* commit 'a300ea98df80a2d72d6131902a8fb3dbf9a6ed14':

12 years agoam cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue tracker
Scott Main [Fri, 10 Feb 2012 05:07:08 +0000 (21:07 -0800)]
am cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit 'cf18f42026b6dea9e1ec2f243718a6b7aebae3a2':

12 years agoam d10035d5: Merge "Some hardening of isolated processes by restricting access to...
Dianne Hackborn [Fri, 10 Feb 2012 02:10:48 +0000 (18:10 -0800)]
am d10035d5: Merge "Some hardening of isolated processes by restricting access to services."

* commit 'd10035d52bcd4eed9f83cad580d606cd522dd6c7':
  Some hardening of isolated processes by restricting access to services.

12 years agoMerge "Some hardening of isolated processes by restricting access to services."
Dianne Hackborn [Fri, 10 Feb 2012 02:08:38 +0000 (18:08 -0800)]
Merge "Some hardening of isolated processes by restricting access to services."

12 years agoSome hardening of isolated processes by restricting access to services.
Dianne Hackborn [Fri, 10 Feb 2012 00:12:18 +0000 (16:12 -0800)]
Some hardening of isolated processes by restricting access to services.

Services now must explicitly opt in to being accessed by isolated
processes.  Currently only the activity manager and surface flinger
allow this.  Activity manager is needed so that we can actually
bring up the process; SurfaceFlinger is needed to be able to get the
display information for creating the Configuration.  The SurfaceFlinger
should be safe because the app doesn't have access to the window
manager so can't actually get a surface to do anything with.

The activity manager now protects most of its entry points against
isolated processes.

Change-Id: I0dad8cb2c873575c4c7659c3c2a7eda8e98f46b0

12 years agoam 8bb8dc9b: Merge "Update BiDiTests app"
Fabrice Di Meglio [Fri, 10 Feb 2012 01:36:41 +0000 (17:36 -0800)]
am 8bb8dc9b: Merge "Update BiDiTests app"

* commit '8bb8dc9b5f67d6c82d18da4ea46053ea80b75c84':
  Update BiDiTests app

12 years agoMerge "Update BiDiTests app"
Fabrice Di Meglio [Fri, 10 Feb 2012 01:35:21 +0000 (17:35 -0800)]
Merge "Update BiDiTests app"

12 years agoam 9c81154d: am ad231a30: am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642
Scott Main [Fri, 10 Feb 2012 00:08:36 +0000 (16:08 -0800)]
am 9c81154d: am ad231a30: am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642

* commit '9c81154dfe88e7f94bd2a3359e035185722fcefe':
  docs: fix xss issue bug 5125642

12 years agoam ad231a30: am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642
Scott Main [Fri, 10 Feb 2012 00:06:31 +0000 (16:06 -0800)]
am ad231a30: am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642

* commit 'ad231a303ee8fe7f8b51900d7b57971ab9963ad4':
  docs: fix xss issue bug 5125642

12 years agoam db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642
Scott Main [Fri, 10 Feb 2012 00:04:15 +0000 (16:04 -0800)]
am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642

* commit 'db7da7ee40231225861f4d39ea2f256bbca06f24':
  docs: fix xss issue bug 5125642

12 years agoam d9c8bbd5: docs: fix xss issue bug 5125642
Scott Main [Fri, 10 Feb 2012 00:01:51 +0000 (16:01 -0800)]
am d9c8bbd5: docs: fix xss issue bug 5125642

* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642

12 years agoam d9c8bbd5: docs: fix xss issue bug 5125642
Scott Main [Fri, 10 Feb 2012 00:01:38 +0000 (16:01 -0800)]
am d9c8bbd5: docs: fix xss issue bug 5125642

* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642

12 years agoam 4f0106cc: Merge "Finish up B frame support in MPEG4Writer"
James Dong [Thu, 9 Feb 2012 23:24:32 +0000 (15:24 -0800)]
am 4f0106cc: Merge "Finish up B frame support in MPEG4Writer"

* commit '4f0106cca0c40cd506367c894436f91c4920a5e1':
  Finish up B frame support in MPEG4Writer

12 years agoMerge "Finish up B frame support in MPEG4Writer"
James Dong [Thu, 9 Feb 2012 23:22:58 +0000 (15:22 -0800)]
Merge "Finish up B frame support in MPEG4Writer"

12 years agoam 468a9715: Merge "Remove unused param."
Jason Sams [Thu, 9 Feb 2012 23:19:10 +0000 (15:19 -0800)]
am 468a9715: Merge "Remove unused param."

* commit '468a971512f4665b13e83cc3c7dc24c9031b14eb':
  Remove unused param.

12 years agoMerge "Remove unused param."
Jason Sams [Thu, 9 Feb 2012 23:17:27 +0000 (15:17 -0800)]
Merge "Remove unused param."

12 years agoam 8f0f10a8: Merge "Experiment with seeking to closest frame instead of closest syncf...
Andreas Huber [Thu, 9 Feb 2012 22:54:58 +0000 (14:54 -0800)]
am 8f0f10a8: Merge "Experiment with seeking to closest frame instead of closest syncframe"

* commit '8f0f10a80a89b2071b949f13ac6ff23514366d23':
  Experiment with seeking to closest frame instead of closest syncframe

12 years agoMerge "Experiment with seeking to closest frame instead of closest syncframe"
Andreas Huber [Thu, 9 Feb 2012 22:52:58 +0000 (14:52 -0800)]
Merge "Experiment with seeking to closest frame instead of closest syncframe"

12 years agoam f4aaf1f5: am 4f21e3a0: am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials...
Joe Fernandez [Thu, 9 Feb 2012 21:53:42 +0000 (13:53 -0800)]
am f4aaf1f5: am 4f21e3a0: am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

* commit 'f4aaf1f56247289838f4bb25ee704196464be4f2':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)

12 years agoam 4f21e3a0: am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken...
Joe Fernandez [Thu, 9 Feb 2012 21:51:00 +0000 (13:51 -0800)]
am 4f21e3a0: am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

* commit '4f21e3a08adefbb5e109e2f844386ed844c1c436':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)

12 years agoam 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue...
Joe Fernandez [Thu, 9 Feb 2012 21:48:46 +0000 (13:48 -0800)]
am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

* commit '20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)

12 years agoam 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696...
Joe Fernandez [Thu, 9 Feb 2012 21:46:55 +0000 (13:46 -0800)]
am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)

12 years agoam 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696...
Joe Fernandez [Thu, 9 Feb 2012 21:46:41 +0000 (13:46 -0800)]
am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)

12 years agoMerge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android...
Joe Fernandez [Thu, 9 Feb 2012 21:45:01 +0000 (13:45 -0800)]
Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

12 years agoam e7eeace5: am ec12ae99: am 79cfde69: am 52bfc243: docs: fix misc doc bugs from...
Scott Main [Thu, 9 Feb 2012 20:55:36 +0000 (12:55 -0800)]
am e7eeace5: am ec12ae99: am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit 'e7eeace594861365b4b5de08eee2cb4c0abf06b2':
  docs: fix misc doc bugs from external issue tracker

12 years agoam ec12ae99: am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue...
Scott Main [Thu, 9 Feb 2012 20:53:12 +0000 (12:53 -0800)]
am ec12ae99: am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit 'ec12ae9933e463181338834387caa7c58b330635':
  docs: fix misc doc bugs from external issue tracker

12 years agoam 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:50:18 +0000 (12:50 -0800)]
am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit '79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
  docs: fix misc doc bugs from external issue tracker

12 years agoam 52bfc243: docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:48:18 +0000 (12:48 -0800)]
am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker

12 years agoam 52bfc243: docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:48:08 +0000 (12:48 -0800)]
am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker

12 years agoam 48e1b91b: Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 9 Feb 2012 19:38:54 +0000 (11:38 -0800)]
am 48e1b91b: Merge "Import translations. DO NOT MERGE"

* commit '48e1b91b36a47b39c2317a9fd595799dcf92b844':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 9 Feb 2012 19:37:18 +0000 (11:37 -0800)]
Merge "Import translations. DO NOT MERGE"

12 years agoam c725a370: Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 9 Feb 2012 19:28:38 +0000 (11:28 -0800)]
am c725a370: Merge "Import translations. DO NOT MERGE"

* commit 'c725a3705ba8646e134091981e84da99fe4076b1':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 9 Feb 2012 19:26:02 +0000 (11:26 -0800)]
Merge "Import translations. DO NOT MERGE"

12 years agoam 7ff3144a: Merge "Add new feature for running services in "isolated" sandbox proces...
Dianne Hackborn [Thu, 9 Feb 2012 19:22:17 +0000 (11:22 -0800)]
am 7ff3144a: Merge "Add new feature for running services in "isolated" sandbox processes."

* commit '7ff3144aa6a4c5e6f0f64933ce174b424cfbfd6e':
  Add new feature for running services in "isolated" sandbox processes.

12 years agoMerge "Add new feature for running services in "isolated" sandbox processes."
Dianne Hackborn [Thu, 9 Feb 2012 19:20:07 +0000 (11:20 -0800)]
Merge "Add new feature for running services in "isolated" sandbox processes."

12 years agoam 1c90e73f: Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQ...
Jamie Gennis [Thu, 9 Feb 2012 19:09:30 +0000 (11:09 -0800)]
am 1c90e73f: Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."

* commit '1c90e73f5d22c3d8e07b236ec8f33a42c01e056f':
  Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue.

12 years agoMerge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."
Jamie Gennis [Thu, 9 Feb 2012 19:08:02 +0000 (11:08 -0800)]
Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."

12 years agoam 0777d2df: Merge "Clarify comments for WebSettings."
Steve Block [Thu, 9 Feb 2012 11:29:24 +0000 (03:29 -0800)]
am 0777d2df: Merge "Clarify comments for WebSettings."

* commit '0777d2df89e4c5269fce6054ee1a0446043ce112':
  Clarify comments for WebSettings.

12 years agoMerge "Clarify comments for WebSettings."
Steve Block [Thu, 9 Feb 2012 11:04:49 +0000 (03:04 -0800)]
Merge "Clarify comments for WebSettings."

12 years agoam fe07b9a2: Merge "Tentative fix for mysteriously recycled bitmap"
Justin Ho [Wed, 8 Feb 2012 21:00:39 +0000 (13:00 -0800)]
am fe07b9a2: Merge "Tentative fix for mysteriously recycled bitmap"

* commit 'fe07b9a2ab54305de553332d0ab278fdf7158ae4':
  Tentative fix for mysteriously recycled bitmap

12 years agoMerge "Tentative fix for mysteriously recycled bitmap"
Justin Ho [Wed, 8 Feb 2012 20:59:17 +0000 (12:59 -0800)]
Merge "Tentative fix for mysteriously recycled bitmap"

12 years agoam f6a7e1f7: Merge "Don\'t wait for current activity to pause before resuming next."
Dianne Hackborn [Wed, 8 Feb 2012 19:40:04 +0000 (11:40 -0800)]
am f6a7e1f7: Merge "Don\'t wait for current activity to pause before resuming next."

* commit 'f6a7e1f7cd12fbbb2e35391850aec7d7d57b8f66':
  Don't wait for current activity to pause before resuming next.

12 years agoMerge "Don't wait for current activity to pause before resuming next."
Dianne Hackborn [Wed, 8 Feb 2012 19:38:23 +0000 (11:38 -0800)]
Merge "Don't wait for current activity to pause before resuming next."

12 years agoam e1a409ba: Merge "Enable B frame support in MPEG4Writer"
James Dong [Wed, 8 Feb 2012 18:44:44 +0000 (10:44 -0800)]
am e1a409ba: Merge "Enable B frame support in MPEG4Writer"

* commit 'e1a409ba68087c66238c986b270c17932e39f0ba':
  Enable B frame support in MPEG4Writer

12 years agoMerge "Enable B frame support in MPEG4Writer"
James Dong [Wed, 8 Feb 2012 18:42:35 +0000 (10:42 -0800)]
Merge "Enable B frame support in MPEG4Writer"

12 years agoam 52835f5d: Merge "Combine duplicate code & document wp<> in mClients"
Glenn Kasten [Wed, 8 Feb 2012 18:29:48 +0000 (10:29 -0800)]
am 52835f5d: Merge "Combine duplicate code & document wp<> in mClients"

* commit '52835f5d201ac05743586f3553ced856d62a08fb':
  Combine duplicate code & document wp<> in mClients

12 years agoam c067717c: Merge "Invalidate text display list when text properties change."
Gilles Debunne [Wed, 8 Feb 2012 18:29:46 +0000 (10:29 -0800)]
am c067717c: Merge "Invalidate text display list when text properties change."

* commit 'c067717c1e4e25c511c3712e213c6f0ce2451d57':
  Invalidate text display list when text properties change.

12 years agoMerge "Combine duplicate code & document wp<> in mClients"
Glenn Kasten [Wed, 8 Feb 2012 18:27:58 +0000 (10:27 -0800)]
Merge "Combine duplicate code & document wp<> in mClients"

12 years agoMerge "Invalidate text display list when text properties change."
Gilles Debunne [Wed, 8 Feb 2012 18:27:46 +0000 (10:27 -0800)]
Merge "Invalidate text display list when text properties change."

12 years agoam 8e0cc398: Merge "Use audio_io_handle_t consistently instead of int"
Glenn Kasten [Wed, 8 Feb 2012 18:23:31 +0000 (10:23 -0800)]
am 8e0cc398: Merge "Use audio_io_handle_t consistently instead of int"

* commit '8e0cc398e348f2c75498f813560bc73be6640371':
  Use audio_io_handle_t consistently instead of int

12 years agoMerge "Use audio_io_handle_t consistently instead of int"
Glenn Kasten [Wed, 8 Feb 2012 18:22:11 +0000 (10:22 -0800)]
Merge "Use audio_io_handle_t consistently instead of int"

12 years agoam b3f04a65: Merge "Delete entries in bulk"
Marco Nelissen [Wed, 8 Feb 2012 18:17:18 +0000 (10:17 -0800)]
am b3f04a65: Merge "Delete entries in bulk"

* commit 'b3f04a656907abb0d89485edb24517249a0a9142':
  Delete entries in bulk

12 years agoMerge "Delete entries in bulk"
Marco Nelissen [Wed, 8 Feb 2012 18:15:01 +0000 (10:15 -0800)]
Merge "Delete entries in bulk"

12 years agoam f31d0500: Simplify destructors
Glenn Kasten [Wed, 8 Feb 2012 17:52:58 +0000 (09:52 -0800)]
am f31d0500: Simplify destructors

* commit 'f31d05007c9cc5db90e0641e4f8621f5463dcb4e':
  Simplify destructors

12 years agoam c722ba33: Merge "Effect UUID inputs passed by pointer are const"
Glenn Kasten [Wed, 8 Feb 2012 17:39:49 +0000 (09:39 -0800)]
am c722ba33: Merge "Effect UUID inputs passed by pointer are const"

* commit 'c722ba33dd1225cd26d9d758e08234a1bb8f4864':
  Effect UUID inputs passed by pointer are const

12 years agoMerge "Effect UUID inputs passed by pointer are const"
Glenn Kasten [Wed, 8 Feb 2012 17:37:26 +0000 (09:37 -0800)]
Merge "Effect UUID inputs passed by pointer are const"

12 years agoam 1b651212: Merge "Add ril.test.emergency system property."
Wink Saville [Wed, 8 Feb 2012 17:21:24 +0000 (09:21 -0800)]
am 1b651212: Merge "Add ril.test.emergency system property."

* commit '1b6512127b11256b615c3f8e9049494fb0ad4f1b':
  Add ril.test.emergency system property.

12 years agoMerge "Add ril.test.emergency system property."
Wink Saville [Wed, 8 Feb 2012 17:19:19 +0000 (09:19 -0800)]
Merge "Add ril.test.emergency system property."

12 years agoam a5a6580d: Merge "Use pid_t not int"
Glenn Kasten [Wed, 8 Feb 2012 16:42:22 +0000 (08:42 -0800)]
am a5a6580d: Merge "Use pid_t not int"

* commit 'a5a6580d17acbad9407a92e7372598aeed3d0a70':
  Use pid_t not int

12 years agoam 1b33107f: Merge "Don\'t double destruct audio_track_cblk_t"
Glenn Kasten [Wed, 8 Feb 2012 16:42:18 +0000 (08:42 -0800)]
am 1b33107f: Merge "Don\'t double destruct audio_track_cblk_t"

* commit '1b33107f3798636cb85cc876b17d4e2adbf1294a':
  Don't double destruct audio_track_cblk_t

12 years agoam cd330e7f: Merge "AudioFlinger methods const and inline"
Glenn Kasten [Wed, 8 Feb 2012 16:42:16 +0000 (08:42 -0800)]
am cd330e7f: Merge "AudioFlinger methods const and inline"

* commit 'cd330e7f38bf72290c1a230cb93b8177470e88bf':
  AudioFlinger methods const and inline

12 years agoMerge "Use pid_t not int"
Glenn Kasten [Wed, 8 Feb 2012 16:40:28 +0000 (08:40 -0800)]
Merge "Use pid_t not int"

12 years agoMerge "Don't double destruct audio_track_cblk_t"
Glenn Kasten [Wed, 8 Feb 2012 16:40:15 +0000 (08:40 -0800)]
Merge "Don't double destruct audio_track_cblk_t"

12 years agoMerge "AudioFlinger methods const and inline"
Glenn Kasten [Wed, 8 Feb 2012 16:39:39 +0000 (08:39 -0800)]
Merge "AudioFlinger methods const and inline"

12 years agoam 1e3a8d30: Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
Glenn Kasten [Wed, 8 Feb 2012 16:37:52 +0000 (08:37 -0800)]
am 1e3a8d30: Merge "Remove dead mutex in AudioTrack/AudioRecord thread"

* commit '1e3a8d3090f2a33562201f95f736949a8d2df576':
  Remove dead mutex in AudioTrack/AudioRecord thread

12 years agoam cbe8b722: Merge "Use virtual destructors"
Glenn Kasten [Wed, 8 Feb 2012 16:35:41 +0000 (08:35 -0800)]
am cbe8b722: Merge "Use virtual destructors"

* commit 'cbe8b722479c7777c1ada27a898cefa47c1acdc7':
  Use virtual destructors

12 years agoMerge "Remove dead mutex in AudioTrack/AudioRecord thread"
Glenn Kasten [Wed, 8 Feb 2012 16:34:33 +0000 (08:34 -0800)]
Merge "Remove dead mutex in AudioTrack/AudioRecord thread"

12 years agoMerge "Use virtual destructors"
Glenn Kasten [Wed, 8 Feb 2012 16:33:41 +0000 (08:33 -0800)]
Merge "Use virtual destructors"

12 years agoam 22776652: Merge "Improve performance for sp<> on stack"
Glenn Kasten [Wed, 8 Feb 2012 15:47:29 +0000 (07:47 -0800)]
am 22776652: Merge "Improve performance for sp<> on stack"

* commit '2277665266780eae75d6c25df4826bffbffa00cc':
  Improve performance for sp<> on stack

12 years agoam 09b9ba0d: Merge "AudioTrack declare more methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:45:22 +0000 (07:45 -0800)]
am 09b9ba0d: Merge "AudioTrack declare more methods const"

* commit '09b9ba0db29aaebe682b7391d93ae179b8bd8ee8':
  AudioTrack declare more methods const

12 years agoam 01a80269: Merge "Use 0 not NULL for sp<> and wp<>"
Glenn Kasten [Wed, 8 Feb 2012 15:45:20 +0000 (07:45 -0800)]
am 01a80269: Merge "Use 0 not NULL for sp<> and wp<>"

* commit '01a802692f6bf2c97a623683d073e949af61d7a9':
  Use 0 not NULL for sp<> and wp<>

12 years agoMerge "Improve performance for sp<> on stack"
Glenn Kasten [Wed, 8 Feb 2012 15:45:15 +0000 (07:45 -0800)]
Merge "Improve performance for sp<> on stack"

12 years agoam 35624c17: Merge "Use bool instead of int"
Glenn Kasten [Wed, 8 Feb 2012 15:43:05 +0000 (07:43 -0800)]
am 35624c17: Merge "Use bool instead of int"

* commit '35624c17973a941fe000026d899f065c1155021b':
  Use bool instead of int

12 years agoMerge "AudioTrack declare more methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:42:40 +0000 (07:42 -0800)]
Merge "AudioTrack declare more methods const"

12 years agoMerge "Use 0 not NULL for sp<> and wp<>"
Glenn Kasten [Wed, 8 Feb 2012 15:41:44 +0000 (07:41 -0800)]
Merge "Use 0 not NULL for sp<> and wp<>"

12 years agoam 16d64ad6: Merge "Declare more IAudioFlinger methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:40:57 +0000 (07:40 -0800)]
am 16d64ad6: Merge "Declare more IAudioFlinger methods const"

* commit '16d64ad699b2dc91d5e1f149a3de645cf83ec965':
  Declare more IAudioFlinger methods const

12 years agoam e0efd5f6: Merge "Remove dead code"
Glenn Kasten [Wed, 8 Feb 2012 15:40:54 +0000 (07:40 -0800)]
am e0efd5f6: Merge "Remove dead code"

* commit 'e0efd5f6c19e8944e5dd65e8c537fcb32b1b9fd2':
  Remove dead code

12 years agoMerge "Use bool instead of int"
Glenn Kasten [Wed, 8 Feb 2012 15:40:23 +0000 (07:40 -0800)]
Merge "Use bool instead of int"

12 years agoMerge "Declare more IAudioFlinger methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:39:27 +0000 (07:39 -0800)]
Merge "Declare more IAudioFlinger methods const"

12 years agoMerge "Remove dead code"
Glenn Kasten [Wed, 8 Feb 2012 15:38:42 +0000 (07:38 -0800)]
Merge "Remove dead code"

12 years agoam 2228130a: am cc9dd9a6: am 02beef84: am 09ff04d7: docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:54:18 +0000 (21:54 -0800)]
am 2228130a: am cc9dd9a6: am 02beef84: am 09ff04d7: docs: fix typo in menu TOC

* commit '2228130a983da7efe36d7f0916dc6503656de773':

12 years agoam a5bbd3b3: am f8274e50: am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:54:15 +0000 (21:54 -0800)]
am a5bbd3b3: am f8274e50: am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC

* commit 'a5bbd3b348a72f6a64445defdbb29c36fb2b62d9':
  docs: fix typo in menu TOC

12 years agoam cc9dd9a6: am 02beef84: am 09ff04d7: docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:52:27 +0000 (21:52 -0800)]
am cc9dd9a6: am 02beef84: am 09ff04d7: docs: fix typo in menu TOC

* commit 'cc9dd9a6373fef19fbfb40f0e09ac8016bc74e38':

12 years agoam f8274e50: am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:52:24 +0000 (21:52 -0800)]
am f8274e50: am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC

* commit 'f8274e506c1e4ef798554244370daf57cc88ecdb':
  docs: fix typo in menu TOC

12 years agoam 02beef84: am 09ff04d7: docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:50:20 +0000 (21:50 -0800)]
am 02beef84: am 09ff04d7: docs: fix typo in menu TOC

* commit '02beef8445fbf45b4dfc2472275dc5b49bb41a50':

12 years agoam 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:49:37 +0000 (21:49 -0800)]
am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC

* commit '8561a6b0c5e0fbec7101108bf480f2adb485f2bc':
  docs: fix typo in menu TOC

12 years agoam 09ff04d7: docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:48:03 +0000 (21:48 -0800)]
am 09ff04d7: docs: fix typo in menu TOC

* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
  docs: fix typo in menu TOC

12 years agoam 09ff04d7: docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:47:38 +0000 (21:47 -0800)]
am 09ff04d7: docs: fix typo in menu TOC

* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
  docs: fix typo in menu TOC

12 years agoam 1c4ea6a2: Merge "Revert "Make NDC not block forever and handle restart.""
Guang Zhu [Wed, 8 Feb 2012 03:43:19 +0000 (19:43 -0800)]
am 1c4ea6a2: Merge "Revert "Make NDC not block forever and handle restart.""

* commit '1c4ea6a26c32a0a6f6b41966dabcc8d7f106ad85':
  Revert "Make NDC not block forever and handle restart."