Wink Saville
f2fbd2eda5
Merge "Telephony: Make IccFileHandler use ci instead of phone"
2012-03-13 15:10:55 -07:00
Daniel Lam
2e76c992bf
SurfaceTexture: Fully refactored from BufferQueue
...
Cleaning up camera and media interactions as part of SurfaceTexture refactoring
Change-Id: Iea2b10ff80b5f01f83ed0902c725df1d3b4c541a
2012-03-13 14:39:28 -07:00
Eric Fischer
dc19246853
Merge "Import translations. DO NOT MERGE"
2012-03-13 14:25:21 -07:00
Eric Fischer
39cfc7c1cc
Merge "Import translations. DO NOT MERGE"
2012-03-13 14:25:11 -07:00
Eric Fischer
55baedbea0
Import translations. DO NOT MERGE
...
Change-Id: Ifae737940ed904103eb4177dcb0fe6256f1f1fbb
2012-03-13 14:17:47 -07:00
Robert Greenwalt
8e94c25f5d
Merge "Record the trimmed cmd string for logs"
2012-03-13 14:13:07 -07:00
Eric Fischer
6e3735fa01
Import translations. DO NOT MERGE
...
Change-Id: I1797f7d37caafea3764ef0d95a3ab7b8f6bd16ab
2012-03-13 14:04:22 -07:00
Marco Nelissen
1c1d1e7ed7
Merge "Gapless playback, step 1."
2012-03-13 13:23:07 -07:00
Marco Nelissen
84b8320545
Gapless playback, step 1.
...
Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly
by reusing the initial AudioTrack for subsequent players.
Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
2012-03-13 13:13:14 -07:00
Eino-Ville Talvala
586d365e00
Merge "Check for null characters being used in camera parameters."
2012-03-13 13:03:48 -07:00
Fabrice Di Meglio
41efc44754
Merge "Move LocalUtil unit tests from Frameworks to CTS"
2012-03-13 12:51:59 -07:00
Fabrice Di Meglio
1103beee44
Move LocalUtil unit tests from Frameworks to CTS
...
Change-Id: I9f3333a4fdf7ccbe71e5bd5a9bd0104551efb724
2012-03-13 12:49:53 -07:00
James Dong
7cd59760be
Merge "Switched to use the header files in /frameworks/native and deleted the duplicate header files in /frameworks/base"
2012-03-13 12:44:54 -07:00
Robert Greenwalt
d192598d3e
Record the trimmed cmd string for logs
...
The over the wire command includes a \0 that mangles log messages.
bug:6149176
Change-Id: I77d4e443f1966bff060f1b97570851f7549fee8e
2012-03-13 12:30:14 -07:00
Craig Mautner
a1b09a92d8
Merge "Set the reason for screen-off before usage."
2012-03-13 12:21:09 -07:00
Daniel Lehmann
53567a756e
Merge "Introduce READ_CALL_LOG and WRITE_CALL_LOG"
2012-03-13 12:17:45 -07:00
Chet Haase
278836e22c
Merge "Fix garbage deref with DisplayList property structures"
2012-03-13 11:51:46 -07:00
Chet Haase
491189f6bb
Fix garbage deref with DisplayList property structures
...
This is the real fix to issue 6158892. We currently delete
transform/camera structures at DisplayList destructor time, if these
structures are not NULL. We set the fields to NULL in an init() method
called (eventually) by the constructor. But it is possible for the object
to be destroyed before that init code is called, resulting in the deref
bug reported. The fi is to set these structures to NULL directly in the
constructor.
Issue 6158892i: Device runtime restarts frequently
Change-Id: Ibfa0f9314767eed6fd51f4ec7edc0d0edd5fdd0f
2012-03-13 11:42:34 -07:00
Alex Yakavenka
2b75d12a7b
Telephony: Make IccFileHandler use ci instead of phone
...
Change-Id: I94889b5b7954d9c16721f12145e8412ba418ac12
2012-03-13 11:39:03 -07:00
Craig Mautner
44bf70fba2
Set the reason for screen-off before usage.
...
An occasional call sequence through updateLightsLocked ended up storing
the old screen-off reason rather than the current screen-off reason.
This caused the Keyguard screen to be bypassed when turning back on. By
saving the power-off reason in mScreenOffReason prior to calling
updateLightsLocked we eliminate this problem.
The offending calling sequence was:
PowerManagerService.setPowerState(..., reason) => updateLightsLocked
=> animateTo => screenOffFinishedAminatingLocked(mScreenOffReason)
=> sendNotificationLocked.
Change-Id: I8ee0b3226f94af7ff7e7b7b0bf54e47fd0c03631
2012-03-13 11:38:38 -07:00
Glenn Kasten
a2d68c9394
Merge "Whitespace and indentation"
2012-03-13 11:35:12 -07:00
Romain Guy
3c9d9c18b4
Merge "Follow the include style used elsewhere in the library"
2012-03-13 11:19:26 -07:00
Romain Guy
d5a85fb63d
Follow the include style used elsewhere in the library
...
Change-Id: I14aebdaeb04b6f4c611153ece4ac1f6ad9bfc15f
2012-03-13 11:18:20 -07:00
George Mount
e5359373e0
Merge "Support "prev" for IME input."
2012-03-13 11:16:47 -07:00
Chet Haase
8d4ada4cd3
Merge "Fix garbage deref in DisplayList structures"
2012-03-13 11:16:03 -07:00
Chet Haase
866ed817d0
Fix garbage deref in DisplayList structures
...
Issue #6158892 : Device runtime restarts frequently
Change-Id: I4e6afaaf9ac66d6846caf0ed82ea67163d8b15c2
2012-03-13 11:13:36 -07:00
Glenn Kasten
18db49a462
Whitespace and indentation
...
Fix indentation to be multiple of 4.
Make it easier to search:
sp< not sp < to
"switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.
Use git diff -b or -w to verify.
Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
2012-03-13 11:09:47 -07:00
Alex Sakhartchouk
0657813970
Merge "Using the rs API instead."
2012-03-13 09:31:22 -07:00
James Dong
c830e7db7f
Merge "Fixing coding style : Indentation"
2012-03-13 09:21:37 -07:00
Irfan Sheriff
a52bf287cf
Merge "Improve network avoidance"
2012-03-13 08:36:47 -07:00
Glenn Kasten
f4c072d421
Merge "Clean up assertion checks"
2012-03-13 07:16:44 -07:00
Insun Kang
d59e4e2b05
Fixing coding style : Indentation
...
Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
2012-03-13 17:17:41 +09:00
James Dong
e1dea48f92
Switched to use the header files in /frameworks/native
...
and deleted the duplicate header files in /frameworks/base
o related-to-bug: 6044887
Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
2012-03-12 21:28:57 -07:00
Daniel Lehmann
958ec9d0b2
am bdac8bb4: am aac03528: am 0e873700: Remove the country detector logging
...
* commit 'bdac8bb4a2d26c21fbb43980ae63beabbcf2ba97':
2012-03-12 18:32:42 -07:00
Daniel Lehmann
e024749830
am 8f30d219: am f0533f94: am 0e873700: Remove the country detector logging
...
* commit '8f30d2191eb88d577d6d2ba9874053cfea0091c8':
Remove the country detector logging
2012-03-12 18:30:17 -07:00
Daniel Lehmann
bdac8bb4a2
am aac03528: am 0e873700: Remove the country detector logging
...
* commit 'aac0352871071bc88eda1f017f928644f55dab25':
2012-03-12 18:28:19 -07:00
Daniel Lehmann
8f30d2191e
am f0533f94: am 0e873700: Remove the country detector logging
...
* commit 'f0533f9462275eff04491a1a27ee4cb1f4afd581':
Remove the country detector logging
2012-03-12 18:27:33 -07:00
Daniel Lehmann
aac0352871
am 0e873700: Remove the country detector logging
...
* commit '0e87370077b322b3a88c345a44c6bf3d56617071':
Remove the country detector logging
2012-03-12 18:24:41 -07:00
Daniel Lehmann
f0533f9462
am 0e873700: Remove the country detector logging
...
* commit '0e87370077b322b3a88c345a44c6bf3d56617071':
Remove the country detector logging
2012-03-12 18:24:41 -07:00
Glenn Kasten
ff31fdcd12
Merge "Fix bug where mMixerStatus was set to IDLE"
2012-03-12 18:24:35 -07:00
Dianne Hackborn
13dfcd1f08
Merge "Dejank: also animate window moves due to requested size changes."
2012-03-12 18:21:25 -07:00
Glenn Kasten
6cb5e64f48
Fix bug where mMixerStatus was set to IDLE
...
Change-Id: I55df1738fb7ba17ba6caeea6a17557526eac17a7
2012-03-12 18:13:59 -07:00
Siva Velusamy
4faaed97ab
Merge "ActivityManager: add option to allow OpenGL trace."
2012-03-12 18:10:36 -07:00
Siva Velusamy
b48e029107
Merge "Expose a function to set OpenGL Trace level."
2012-03-12 18:10:19 -07:00
Xia Wang
4b87e4a56c
Merge "Fix test flakiness"
2012-03-12 17:55:18 -07:00
Jeff Sharkey
b8c81768d9
Merge "Let <path-permission> block unprotected providers."
2012-03-12 17:54:33 -07:00
James Dong
b9e8d86b74
Merge "Removed the include header path since it is not needed."
2012-03-12 17:51:05 -07:00
Dianne Hackborn
1743b64d87
Dejank: also animate window moves due to requested size changes.
...
This performance an animation when, for example, a dialog window is
moved because the size of its content has changed.
Change-Id: I2d79a1a57f94e0f2f8ef706a473fca6c9cc637cf
2012-03-12 17:04:43 -07:00
Daniel Lehmann
0e87370077
Remove the country detector logging
...
Bug:6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
2012-03-12 17:04:17 -07:00
Fabrice Di Meglio
7d9ec65da0
Merge "Fix the build"
2012-03-12 16:44:39 -07:00