65018 Commits

Author SHA1 Message Date
Glenn Kasten
1f812f720f Fix const sp<>& in parameter list and return value
EffectModule::addHandle and Client::heap() were declared incorrectly.

As a parameter, an sp<> should be & for efficiency, and for input
parameters it should also be const to protect the caller's value.

But as a return value, an sp<> should have neither const or &.  The "e"
in "return e;" might be located on the stack, and if there is "&" then
the caller would see the address of a variable which no longer exists.
Also, an & would make it hard to do "return 0;".
A "const" without & is meaningless in the return type.
(In this particular case, the "e" is a member field, so it was safe.)

Change-Id: I3df5f294214eb15a9d4d596c6d5ef29de97b5c27
2012-01-30 10:31:09 -08:00
Mathias Agopian
acabf48867 remove unneeded code
Change-Id: I07e2fca7274d2e12bf5b4aee0050794bdb97a8b3
2012-01-29 23:11:06 -08:00
Mathias Agopian
dfbcee6cb8 fix build
Change-Id: Ibdc45f1794e7ef60dc1ca0ff85c5cc4dff84c3fa
2012-01-29 22:22:08 -08:00
Mathias Agopian
0589e58236 Merge "update GLES headers and add support for corresponding new extensions." 2012-01-29 22:03:19 -08:00
Mathias Agopian
c0e32a47d5 Merge "added a few more commands to SF's dumpsys" 2012-01-29 22:02:36 -08:00
Mathias Agopian
b19e06f3e5 Merge "remove unused code" 2012-01-29 22:01:41 -08:00
Mathias Agopian
8d1b5e3c0b added a few more commands to SF's dumpsys
--latency-clear [name]
clears the latency data for the specified layer or for
all layers if none is specified

--list
prints the list of all layers regardless of their visibility

Change-Id: I7c07ae020f838c173b98ee50f3fb3e93da78acbb
2012-01-28 22:31:55 -08:00
Mathias Agopian
780018ded1 update GLES headers and add support for corresponding new extensions.
Change-Id: I554d9659113b4721b748ee5c1a3b1ca82b11d75e
2012-01-28 20:41:35 -08:00
Mathias Agopian
34e0491313 remove unused code
Change-Id: If900fcc50f9ffc424e270cb6063b16a2d7bc04d3
2012-01-28 18:47:13 -08:00
Jean-Baptiste Queru
0e1ad89ca5 am 27d2ab8b: am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '27d2ab8b27e7e1927e18869e898fa556e5da3d43':
  Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 21:09:20 -08:00
Roman Nurik
d28ce2140f am 5525a43a: am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '5525a43a9c814faba22adfafc6517fb64259966f':
  docs: add NOTICE to action bar icon pack and sprinkle download links
2012-01-27 21:08:59 -08:00
Roman Nurik
479c96c575 am 9d9c7189: am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '9d9c718925e8ec189ba4615f93c2fe8e7d0ab23d':
  docs: Update designing-navigation training class to link to Android Design
2012-01-27 21:08:50 -08:00
Jim Miller
118bb2bd86 Fix 5906830: Don't crash on lock screens that lack a clock.
This fixes a crash seen in SIM unlock screen where the
layout doesn't have a clock to update.

Change-Id: Ic1473b60f6d32f3feae9e7aa4510f6e435fa9a73
2012-01-27 17:59:49 -08:00
Jim Miller
b90559a606 Merge "Fix 5906830: Update the clock earlier when lock screen comes back from suspend." 2012-01-27 17:42:26 -08:00
Jeff Brown
cb0af4f1b0 Merge "Improve watchdog monitor for InputReader and InputDispatcher." 2012-01-27 17:37:31 -08:00
Jeff Brown
2d2d7d6f42 Merge "Implement a cancelation mechanism for queries." 2012-01-27 17:37:24 -08:00
Jeff Brown
112b5f52c5 Improve watchdog monitor for InputReader and InputDispatcher.
Try harder to test for liveness.  There are situations where
the lock might not be held but the input system is stuck in
a callback into the window manager policy that has hung.

Bug: 5094994
Change-Id: Iff88655512a5dc8bbb4615be65f4115e975c020b
2012-01-27 17:33:42 -08:00
Jeff Brown
75ea64fc54 Implement a cancelation mechanism for queries.
Added new API to enable cancelation of SQLite and content provider
queries by means of a CancelationSignal object.  The application
creates a CancelationSignal object and passes it as an argument
to the query.  The cancelation signal can then be used to cancel
the query while it is executing.

If the cancelation signal is raised before the query is executed,
then it is immediately terminated.

Change-Id: If2c76e9a7e56ea5e98768b6d4f225f0a1ca61c61
2012-01-27 17:33:21 -08:00
Jim Miller
ce4a0c6f16 Fix 5906830: Update the clock earlier when lock screen comes back from suspend.
This attempts to fix an issue where sometimes the time shown on lock
screen was really old.  The code now sets the time immediately when the
screen turns on.

Change-Id: Ic4649ea342499aea82f997ba488bc2cb45987739
2012-01-27 17:15:18 -08:00
Glenn Kasten
30c918ce7f Use final on new member variables
Use final for member fields initialized to a new and that are never modified.

Change-Id: I042352c7bc21879613e7a50b1205b6923f8083cf
2012-01-27 16:13:00 -08:00
Jean-Michel Trivi
cf0c7d1031 Merge "Bug 5567648 Request and abandon audio focus in calls" 2012-01-27 14:50:28 -08:00
Fabrice Di Meglio
39d18f53b3 Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE" 2012-01-27 14:42:06 -08:00
Fabrice Di Meglio
a731b082b2 Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE
- also clean some destructors (was not quite compulsory because
they are related to some Singletons)

Change-Id: I3091cac7b38628cda593d72570ba7a5d7ea2a15c
2012-01-27 14:24:46 -08:00
Jean-Michel Trivi
4ed37ea81a Bug 5567648 Request and abandon audio focus in calls
Up to now, audio focus was implicitly requested and abandoned
 when changing the audio mode. This is no longer the case so the
 behavior with regards to audio focus can be indepently set by
 the CallManager.
The logic implemented here is the same as the one previously used
 in AudioService:
  - only request audio focus when the ring volume index is > 0
    when ringing,
  - request focus before setting the audio mode to a mode other
    than normal
  - abandon audio focus after setting the audio mode to normal

Change-Id: Ia543dc779563dbff09414771fee60e589dfaab9d
2012-01-27 14:20:27 -08:00
Jean-Michel Trivi
11001c344a Merge "Bug 5567648 disassociate audio mode and audio focus" 2012-01-27 14:15:37 -08:00
Glenn Kasten
b975ae45cb Merge "Remove optional LVMX service" 2012-01-27 14:11:16 -08:00
Jean-Baptiste Queru
27d2ab8b27 am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
  Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 13:58:03 -08:00
Jean-Baptiste Queru
dc8668c8a7 am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '9781870491f4f33403f8d518879a88c20180d7cb':
  Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 13:55:56 -08:00
Gilles Debunne
566e8baf43 Merge "Fix for IOOB when suggestions have disappeared" 2012-01-27 13:54:50 -08:00
Gilles Debunne
ea1181220d Merge "Handle tap and move cursor before showing suggestions" 2012-01-27 13:54:42 -08:00
Teng-Hui Zhu
913917449d Merge "Revert "Hack to workaround the fact that the EGL context can be"" 2012-01-27 13:48:25 -08:00
Jean-Baptiste Queru
9781870491 Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 2012-01-27 13:36:49 -08:00
Jean-Michel Trivi
4dd3674e51 Bug 5567648 disassociate audio mode and audio focus
Don't automatically change the audio focus when
 the audio mode changes. This is best handled by the
 applications that change the audio mode so they
 can address their usecases as they please (for
 instance to define the behavior when switching calls).
Replaced the implicit "mode to focus" behavior with
 two methods to request and abandon audio focus. These
 methods are only to be used by the framework, and maintain
 the logic in AudioService to prevent other apps to request
 audio focus during a call.
A susequent change will update com.android.internal.telephony.CallManager
 to take advantage of these two methods.

Change-Id: If84ebd508e985083e8cac82ece44940c72b5c669
2012-01-27 13:32:45 -08:00
Vishal Mahaveer
21bd79f51c Wi-Fi: Handle disconnect in middle of DHCP operation
Restore power mode and BT co-ex settings when disconnect
happens in middle of DHCP operation.

Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-01-27 14:51:23 -06:00
Eric Fischer
d4760fc2b7 Merge "Import translations. DO NOT MERGE" 2012-01-27 11:58:58 -08:00
Eric Fischer
fb197c2654 Import translations. DO NOT MERGE
Change-Id: I853c3fd2a3ada0c78e461550dc6c61bb5e09404a
2012-01-27 11:55:32 -08:00
Eric Fischer
b6c51b9a88 Import translations. DO NOT MERGE
Change-Id: I16defb344c5a4a253bc34b414f6395a785bd7003
2012-01-27 11:51:46 -08:00
Glenn Kasten
de57586c90 Remove optional LVMX service
Change-Id: I64121d320b756e46869b82b79e49aebacbac3a48
2012-01-27 11:25:51 -08:00
Eric Fischer
66ed857806 Merge "Mark locale-neutral configuration strings translatable="false"" 2012-01-27 11:22:52 -08:00
Eric Fischer
53ebe33e76 Mark locale-neutral configuration strings translatable="false"
Change-Id: I344b871553339b9d98b7bfed74be02dc85b4e195
2012-01-27 11:04:23 -08:00
Nick Pelly
d343bb9692 Merge "Fix doc bug." 2012-01-27 11:03:57 -08:00
Nick Pelly
d3cb80d2af Fix doc bug.
Change-Id: Ib7361abb0461d4295e889c505dd45e3a40193451
2012-01-27 11:03:05 -08:00
Nick Pelly
fbc659e259 Merge "Fix build: update current.txt" 2012-01-27 10:35:12 -08:00
Nick Pelly
21c136a4ec Fix build: update current.txt
Change-Id: Ic28314e98784ebe513bd2191d3fa6c9bd5674422
2012-01-27 10:34:18 -08:00
Stephen Hines
cee905be48 Merge "Don't wait forever if there are no commands to execute." 2012-01-27 10:08:18 -08:00
Nick Pelly
ef78d96b90 Merge "Add NdefMessage.getByteLength(), and more minor fixes:" 2012-01-27 09:59:10 -08:00
Jamie Gennis
7bea650208 Merge "SurfaceTexture: use fence sync on omap4 & s5pc110" 2012-01-27 09:53:14 -08:00
Glenn Kasten
c14639a9a1 Merge "Use audio_source_t consistently" 2012-01-27 09:06:00 -08:00
Glenn Kasten
c1f63ddba7 Merge "AudioStreamIn and AudioStreamOut" 2012-01-27 07:22:30 -08:00
Glenn Kasten
6562dadf3c Merge "Declare methods in binder opcode order" 2012-01-27 07:19:53 -08:00