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
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
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
Fabrice Di Meglio
8cbc26f0aa
Fix the build
...
- was missing the update to current.txt
Change-Id: I7bbd363f989c3deae071dce60af75a76c9477695
2012-03-12 16:42:37 -07:00
Omari Stephens
3d441a1c4f
Merge "Refactor smoke tests to enable one-app-per-testcase runs"
2012-03-12 16:38:35 -07:00
Irfan Sheriff
90d57dfac3
Improve network avoidance
...
Adds a back-off based technique where the amount of time we wait before
avoiding wi-fi is increased.
This will reduce power consumption on devices that are experiencing high
variance on wi-fi
Change-Id: I40da03edfb5373ddb51056818ca0744dc26a5600
2012-03-12 16:12:55 -07:00
Fabrice Di Meglio
34ba5a0a16
Merge "Make public more RTL APIs"
2012-03-12 16:09:21 -07:00
Andrew Flynn
fafebf85bd
am b0a07985: (-s ours) am 4326da7e: Merge "DO NOT MERGE Fix back button state issue" into ics-scoop
...
* commit 'b0a07985b99308109d8ca8e8758caca7a43c1bb2':
DO NOT MERGE Fix back button state issue
2012-03-12 16:06:36 -07:00
Andrew Flynn
3a67442348
am a443d352: (-s ours) am 53935258: Merge "DO NOT MERGE" into ics-scoop
...
* commit 'a443d3520a3b399daee7504940274e09316fe38c':
DO NOT MERGE
2012-03-12 16:06:29 -07:00
Andrew Flynn
b0a07985b9
am 4326da7e: Merge "DO NOT MERGE Fix back button state issue" into ics-scoop
...
* commit '4326da7e0d5d63bad718e9848294405971f8f9ab':
DO NOT MERGE Fix back button state issue
2012-03-12 16:04:15 -07:00
Andrew Flynn
a443d3520a
am 53935258: Merge "DO NOT MERGE" into ics-scoop
...
* commit '5393525809115fcf5027f292a243ebe34cfbfb7c':
DO NOT MERGE
2012-03-12 16:04:12 -07:00
Wink Saville
a59e1bf6d7
am 752c5db2: am 4f50ff1e: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit '752c5db2cb0bb4104dbdcd99a5ae1103b650fc66':
2012-03-12 16:02:43 -07:00
Andrew Flynn
4326da7e0d
Merge "DO NOT MERGE Fix back button state issue" into ics-scoop
2012-03-12 16:00:44 -07:00
Andrew Flynn
5393525809
Merge "DO NOT MERGE" into ics-scoop
2012-03-12 16:00:36 -07:00
Wink Saville
33c67dcb23
am 2a0eed20: am 442612a2: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit '2a0eed20b5828877b2db24bf49468e10c3f1b36b':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
2012-03-12 16:00:09 -07:00
Wink Saville
752c5db2cb
am 4f50ff1e: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit '4f50ff1ee39cdb3c93d2ef88c0007195765ec1c6':
2012-03-12 15:59:44 -07:00
Wink Saville
2a0eed20b5
am 442612a2: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit '442612a273981a1b21fdb2e9c19a887ab710224d':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
2012-03-12 15:57:44 -07:00