24486 Commits

Author SHA1 Message Date
Chih-Chung Chang
d15d0e9fd3 am 3ef6ebe8: am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
Merge commit '3ef6ebe874022c4ec8fbb00067833a6f636c1e2f' into gingerbread-plus-aosp

* commit '3ef6ebe874022c4ec8fbb00067833a6f636c1e2f':
  Flush binder buffer after setting raw heap to avoid leaking a reference.
2010-07-02 07:50:26 -07:00
Chih-Chung Chang
3ef6ebe874 am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
Merge commit '7df7447112371fb5e46f6084b55ac2ccdfde139d' into gingerbread

* commit '7df7447112371fb5e46f6084b55ac2ccdfde139d':
  Flush binder buffer after setting raw heap to avoid leaking a reference.
2010-07-02 07:48:03 -07:00
Chih-Chung Chang
7df7447112 Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo 2010-07-02 07:43:31 -07:00
The Android Open Source Project
f601ce2c14 merge from open-source master
Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
2010-07-02 07:38:30 -07:00
Scott Main
1cbf9482d7 am 43d9b0ae: am f80372db: Merge "docs: update device dashboard; add historical chart" into froyo
Merge commit '43d9b0aeb891e10fdb2bd797d0d4c4417abf3bdb' into gingerbread-plus-aosp

* commit '43d9b0aeb891e10fdb2bd797d0d4c4417abf3bdb':
  docs: update device dashboard; add historical chart
2010-07-01 23:35:57 -07:00
Scott Main
43d9b0aeb8 am f80372db: Merge "docs: update device dashboard; add historical chart" into froyo
Merge commit 'f80372dbc0f4a1b80bebfe5f5124de8d31e0996b' into gingerbread

* commit 'f80372dbc0f4a1b80bebfe5f5124de8d31e0996b':
  docs: update device dashboard; add historical chart
2010-07-01 23:33:20 -07:00
Scott Main
f80372dbc0 Merge "docs: update device dashboard; add historical chart" into froyo 2010-07-01 23:26:58 -07:00
Chih-Chung Chang
fe1bac6762 Flush binder buffer after setting raw heap to avoid leaking a reference.
The problem was:

1. In handleShutter(), thread A in CameraService calls
   registerBuffers(IMemoryHeap) and it's received by thread B
   in system_server. [transaction 1]
2. While thread A is waiting for the reply, thread B calls
   back to thread A to get the id of the heap
   (IMemoryHeap.getHeapID). [transaction 2]
3. Thread A replies transaction 2 and is preemptied in kernel.
   Thread B gets the reply and finishes registerBuffers and send
   reply for transaction 1.
4. When thread A runs again, it gets the reply for transaction 1
   and returns to handleShutter().
5. At this point the transaction buffer for transaction 2 (which
   holds a reference to IMemoryHeap) is not freed because the
   BC_FREE_BUFFER command is kept in thread A's local command
   queue and not sent to the kernel.
6. Normally when thread A makes next transaction, the
   BC_FREE_BUFFER command will be sent together (piggyback) with
   the commands for that transaction. But in this case thread A
   is a callback thread from camera driver, so it does not make
   any binder calls afterwards, and the IMemoryHeap is never freed
   (until the next time handleShutter is called).

Change-Id: I435a258187509bdbbaf353339eb9ea577610cbd2
2010-07-02 12:56:54 +08:00
Mathias Agopian
377e235257 am 7f8edbd9: Merge "remove unused YUV formats" into gingerbread
Merge commit '7f8edbd92737bc610bf4f06ad8a516656be83188' into gingerbread-plus-aosp

* commit '7f8edbd92737bc610bf4f06ad8a516656be83188':
  remove unused YUV formats
2010-07-01 21:31:31 -07:00
Mathias Agopian
7f8edbd927 Merge "remove unused YUV formats" into gingerbread 2010-07-01 21:28:24 -07:00
Mathias Agopian
61c55c4907 remove unused YUV formats
Change-Id: Ie84616f842c7e0329d68e67e65a65d510558004b
2010-07-01 21:17:56 -07:00
Steve Howard
5c57e03d3d am 6ffd9ff0: Merge "Log full exception when failing to inflate notification view" into gingerbread
Merge commit '6ffd9ff07733a855daeda75416cea88e7456e9d6' into gingerbread-plus-aosp

* commit '6ffd9ff07733a855daeda75416cea88e7456e9d6':
  Log full exception when failing to inflate notification view
2010-07-01 19:41:12 -07:00
Steve Howard
6ffd9ff077 Merge "Log full exception when failing to inflate notification view" into gingerbread 2010-07-01 19:38:48 -07:00
Dianne Hackborn
39c921c6e5 am 8ae5a8e7: Get to the point of being able to do native drawing.
Merge commit '8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb' into gingerbread-plus-aosp

* commit '8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb':
  Get to the point of being able to do native drawing.
2010-07-01 19:25:01 -07:00
Dianne Hackborn
8ae5a8e7c0 Get to the point of being able to do native drawing.
A little cleanup.

Change-Id: I37ef0557abf330d91d6fe47e81d062206b3bc346
2010-07-01 18:44:46 -07:00
Steve Howard
ce94584096 Log full exception when failing to inflate notification view
When inflating a notification's view fails, include the exception in
the log message.  Without this exception all we get is "couldn't
inflate view for notification <package>/<id>", which isn't very
helpful for tracking down the particular error in the view.

This exception used to be included in the log message, but it was
removed in 005847b03b2 -- any particular reason why?

Change-Id: I623b9e4c8291e4c035f26380e5f22ad6b65176a7
2010-07-01 17:54:16 -07:00
Eric Laurent
64fa7f072a am f520411a: am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit 'f520411a35db5248934a4b50859ca72e3f865593' into gingerbread-plus-aosp

* commit 'f520411a35db5248934a4b50859ca72e3f865593':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 16:38:33 -07:00
Eric Laurent
f520411a35 am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit 'c03befe3d62eb2a3e1d56fec0ca188a6094d53dd' into gingerbread

* commit 'c03befe3d62eb2a3e1d56fec0ca188a6094d53dd':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 16:36:02 -07:00
Eric Laurent
c03befe3d6 Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Problem:
When the bluetooth device is removed, the AudioService clears all active SCO connections
and unlinks from the client application's binder interface death.
The problem is that the unlinking is done even if no more connections are active for a given client,
which throws a runtime exception that is not catched causing the system server to crash.

The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of
active SCO connections for this client is not 0. The NoSuchElementException exception is also
catched when calling unlinkToDeath()

Change-Id: I7086424301fc63a5666da61c38169349d3e078f4
2010-07-01 16:23:34 -07:00
Dianne Hackborn
58f35ff416 am 54a181b1: Make real API for native code to get its window.
Merge commit '54a181b1a2b1517a9479b21fbf7705a688232faf' into gingerbread-plus-aosp

* commit '54a181b1a2b1517a9479b21fbf7705a688232faf':
  Make real API for native code to get its window.
2010-07-01 16:00:19 -07:00
Scott Main
db3b598c93 docs: update device dashboard; add historical chart
Change-Id: Iafed4ed927141d34dcdb728918320be2fa2cf151
2010-07-01 14:57:41 -07:00
Dianne Hackborn
54a181b1a2 Make real API for native code to get its window.
Added implementation to use ANativeWindow and provide
it to a NativeActivity.

Change-Id: I890d71b6e15d4af71e6cf81b327961d7061ec1c2
2010-07-01 14:43:23 -07:00
James Dong
d6ec21751b am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread
Merge commit '65c83b906d01c3c1493d0547757dbb16d4c3722a' into gingerbread-plus-aosp

* commit '65c83b906d01c3c1493d0547757dbb16d4c3722a':
  Refactor Stagefright::StartMPEG4Recording()
2010-07-01 14:12:47 -07:00
James Dong
65c83b906d Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread 2010-07-01 14:11:01 -07:00
Amith Yamasani
2cc2c75dcc am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread
Merge commit 'c7dacb7374e04c003b0764e7c348765b629c18cb' into gingerbread-plus-aosp

* commit 'c7dacb7374e04c003b0764e7c348765b629c18cb':
  DO NOT MERGE: Add a battery capacity value to the power profile.
2010-07-01 13:53:08 -07:00
Amith Yamasani
c7dacb7374 Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread 2010-07-01 13:51:27 -07:00
Jean-Baptiste Queru
61af57bfc3 Merge "Fix missing NL" 2010-07-01 13:46:03 -07:00
Amith Yamasani
169741b708 DO NOT MERGE: Add a battery capacity value to the power profile.
Can be accessed through PowerProfile.getBatteryCapacity()

Individual device profiles need to be updated with their capacities.

(merged from master)

Change-Id: Ie76ab6de47c44807a46934331665e077a7226566
2010-07-01 13:42:59 -07:00
Eric Laurent
eba857d126 am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread
Merge commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2' into gingerbread-plus-aosp

* commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 11:56:11 -07:00
Eric Laurent
a0c2b53966 Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread 2010-07-01 11:54:00 -07:00
James Dong
7b06de6d5a Refactor Stagefright::StartMPEG4Recording()
- Also, better error handling

Change-Id: Ic18d08dc6489adf92c6a588efa4baca66429b175
2010-07-01 10:28:38 -07:00
Andreas Huber
d51c2cacce am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Merge commit '45bac57aa00281e6b45756c691c588bdaf762521' into gingerbread-plus-aosp

* commit '45bac57aa00281e6b45756c691c588bdaf762521':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
2010-07-01 10:07:17 -07:00
Andreas Huber
45bac57aa0 Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Change-Id: I972324a8fc9757e6e8116b0270ec0882106f8733
2010-07-01 09:08:38 -07:00
Joe Onorato
393e145934 am a2dd4c17: put the status bar back in the system process
Merge commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4' into gingerbread-plus-aosp

* commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4':
  put the status bar back in the system process
2010-07-01 05:01:52 -07:00
Joe Onorato
6fd470fbdc am 6be4739e: quiet noisy debug spew
Merge commit '6be4739e1b302eb447dee195eaecbfcf82317310' into gingerbread-plus-aosp

* commit '6be4739e1b302eb447dee195eaecbfcf82317310':
  quiet noisy debug spew
2010-07-01 05:01:48 -07:00
Joe Onorato
a2dd4c17bb put the status bar back in the system process
Change-Id: I401b0ac8e3c96b61e787eb18341d18be75b3761d
2010-07-01 07:51:04 -04:00
Joe Onorato
6be4739e1b quiet noisy debug spew
Change-Id: I55c3b16f58bbe0ec4c6547c525863a7d16f8263d
2010-07-01 07:47:08 -04:00
Chih-Chung Chang
bda93c4cb9 am 09b90057: Add multiple camera support for in MediaProfiles.
Merge commit '09b9005769f2b717f637131578ce6cfa6bd62bd9' into gingerbread-plus-aosp

* commit '09b9005769f2b717f637131578ce6cfa6bd62bd9':
  Add multiple camera support for in MediaProfiles.
2010-06-30 20:22:40 -07:00
Chih-Chung Chang
09b9005769 Add multiple camera support for in MediaProfiles.
Change-Id: Ie89568a0f5f5fd08ede77e33f9a559215d6bed9a
2010-07-01 10:57:15 +08:00
Eric Laurent
e2dd8c4592 Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Problem:
When the bluetooth device is removed, the AudioService clears all active SCO connections
and unlinks from the client application's binder interface death.
The problem is that the unlinking is done even if no more connections are active for a given client,
which throws a runtime exception that is not catched causing the system server to crash.

The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of
active SCO connections for this client is not 0. The NoSuchElementException exception is also
catched when calling unlinkToDeath()

Change-Id: I29a28fcce1a579217cea271956a55778e05d3e37
2010-06-30 19:41:56 -07:00
Christopher Tate
d3233ae902 am 160edb36: Add ability to guard a thread against setting its own prio to bg
Merge commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b' into gingerbread-plus-aosp

* commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b':
  Add ability to guard a thread against setting its own prio to bg
2010-06-30 18:28:08 -07:00
Christopher Tate
160edb3645 Add ability to guard a thread against setting its own prio to bg
The guard is compiled out by default because it adds overhead to
android.os.Process.setPriority().

Change-Id: Ibb2a648c6349b381abb7ae62a358888b04fba871
2010-06-30 18:25:01 -07:00
Dianne Hackborn
177c405a24 am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread
Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp

* commit 'c6e1d88022db800773401c16803e1ab27fd01a7e':
  Introduce official public NativeWindow type.
2010-06-30 16:08:24 -07:00
Dianne Hackborn
c6e1d88022 Merge "Introduce official public NativeWindow type." into gingerbread 2010-06-30 16:05:30 -07:00
Mathias Agopian
e341a0b5e9 am 30fe6fa0: Merge "fix live wallpapers on Droid" into gingerbread
Merge commit '30fe6fa07a9b9c6e7498198608125add8eb40744' into gingerbread-plus-aosp

* commit '30fe6fa07a9b9c6e7498198608125add8eb40744':
  fix live wallpapers on Droid
2010-06-30 16:01:33 -07:00
The Android Open Source Project
c511d4f84c merge from open-source master
Change-Id: I99a88f61bc0f3ddcc233b6784e24427a7f8978be
2010-06-30 15:59:42 -07:00
Mathias Agopian
30fe6fa07a Merge "fix live wallpapers on Droid" into gingerbread 2010-06-30 15:59:02 -07:00
Mathias Agopian
4cfb3a69d2 fix live wallpapers on Droid
On omap3 h/w we force opaque formats to RGB_565 instead of RGBX_8888
because the GL driver doesn't support it. RGBX_8888 is always remapped
to RGBA_8888.

Change-Id: I0bfabeb98c8d3a399079e6797cf2a0ee95915324
2010-06-30 15:43:47 -07:00
Jeff Brown
0c2df98425 am d8ae2885: Merge "Fix injection of specially intercepted keys like HOME." into gingerbread
Merge commit 'd8ae28854e1ed9bd90d7407f94c2e5ed9028b712' into gingerbread-plus-aosp

* commit 'd8ae28854e1ed9bd90d7407f94c2e5ed9028b712':
  Fix injection of specially intercepted keys like HOME.
2010-06-30 15:33:41 -07:00
Christopher Tate
705a2df97c am c8525edc: Merge "Remove memory monitoring from the system watchdog" into gingerbread
Merge commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08' into gingerbread-plus-aosp

* commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08':
  Remove memory monitoring from the system watchdog
2010-06-30 15:33:35 -07:00