summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Dump xt_qtaguid stats to using GID instead of su.Jeff Sharkey2012-01-311-2/+2
| | | | Change-Id: I77a956cf37c1f1f792f6939b2f32a47f1cbe14c0
* Merge "Move away from deprecated NetworkInfo extra."Jeff Sharkey2012-01-305-11/+18
|\
| * Move away from deprecated NetworkInfo extra.Jeff Sharkey2012-01-305-11/+18
| | | | | | | | | | | | | | | | | | Because the NetworkInfo included in CONNECTIVITY_ACTION broadcast extra does not reflect the state applicable to the calling UID, and the last sticky broadcast may have stale state, transition to calling ConnectivityManager.getActiveNetworkInfo() directly. Change-Id: I86b316fbedd0273585ad5f1248b091bc3a3a5520
* | am 136704a8: am b069833e: Merge "Adjust the LTE signal bar mapping." into ↵John Wang2012-01-301-5/+4
|\ \ | |/ |/| | | | | | | | | ics-mr1 * commit '136704a803ed7dd419a452315d1c0fe4885ce441': Adjust the LTE signal bar mapping.
| * am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1John Wang2012-01-301-5/+4
| |\ | | | | | | | | | | | | * commit 'b069833e63f711a6b140385003d67b3ff68fe66b': Adjust the LTE signal bar mapping.
| | * Merge "Adjust the LTE signal bar mapping." into ics-mr1John Wang2012-01-301-5/+4
| | |\
| | | * Adjust the LTE signal bar mapping.John Wang2012-01-271-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new mapping are Four bars: RSRP >= -95dBm Three bars: -105 dBm <= RSRP < -95 dBm Two bars: -115 dBm <= RSRP < -105 dBm One bars: RSRP < -115 dBm No bars: No Service bug:5640958 Change-Id: I9efabaeac33b624ea0a58a4d3760169dff6544f6
* | | | Merge "Fixing broken unittests."Makoto Onuki2012-01-301-1/+1
|\ \ \ \
| * | | | Fixing broken unittests.Shaopeng Jia2012-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test here is partly fixed by Change I38c54265. However, the test itself still needs to be fixed as local numbers in US never starts with a '1'. Bug: 5599741 Change-Id: I3a3961331961f4f535d30dec884babdb32e8b67b
* | | | | am fb300fb2: am 73790a53: Merge "docs: add G+ page announcement to homepage" ↵Scott Main2012-01-303-3/+50
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'fb300fb2f0f253c94c14090256f9695bca1a1e4b': docs: add G+ page announcement to homepage
| * | | | am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1Scott Main2012-01-303-3/+50
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '73790a53b580b8ec8eff88e25a19b5fcfa33392a': docs: add G+ page announcement to homepage
| | * | | Merge "docs: add G+ page announcement to homepage" into ics-mr1Scott Main2012-01-303-3/+50
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | docs: add G+ page announcement to homepageScott Main2012-01-303-3/+50
| | | | | | | | | | | | | | | | | | | | Change-Id: I400334fc1465b67ec34af2071a6cca5b6eda116f
* | | | | Merge "gltrace: Use Unix Domain Socket rather than INET Socket"Siva Velusamy2012-01-303-19/+21
|\ \ \ \ \
| * | | | | gltrace: Use Unix Domain Socket rather than INET SocketSiva Velusamy2012-01-273-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export trace information via abstract Unix Domain Socket (UDS). This allows tracing of applications without INTERNET permission, and should be faster as well. Change-Id: Iabb67fcc2bc2484afd8128af07dca723b81c52c6
* | | | | | Merge "Fix bug in LayoutTransition for INVISIBLE views"Chet Haase2012-01-305-25/+92
|\ \ \ \ \ \
| * | | | | | Fix bug in LayoutTransition for INVISIBLE viewsChet Haase2012-01-305-25/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a view is becoming VISIBLE or INVISIBLE in a container with a LayoutTransition, animations run to fade the view in and out and also to run 'changing' animations on the view's other siblings. This logic also cancels any running 'changin' animations to account for new ones running. However, in the specific case of INVISIBLE changes, there will be no layout changes in the container - layout has already accounted for that view (unlike in the case of GONE views); the visibility is just a matter of drawing the view (or not). Therefore, we're canceling 'changing' animations that should continue running and not replacing them with any other animations, since new animations would only be started on layout chnages which are not forthcoming. One artifact seen from this bug is that the navigation bar buttons sometimes disappear when changing orientation. This is because the menu button may toggle between VISIBLE and INVISIBLE, causing animations on the other buttons to get canceled, which leaves those views in a completely wrong state. The right thing to do is to avoid canceling in-process 'changing' animations and to skip the logic of setting up new 'changing' animations which won't fire anyway. There is some minor API work in here because we did not previously have the necessary information in LayoutTransition to know whether a view was being hidden or shown to/from the INVISIBLE state. Issue #5911213: LayoutTransitions ending in an odd state Change-Id: I5c60c8583c8ea08965727b4ef17b550c40a3882c
* | | | | | | Merge "Handle adding/removing/renaming nomedia paths"Marco Nelissen2012-01-303-0/+62
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Handle adding/removing/renaming nomedia pathsMarco Nelissen2012-01-273-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/5849015 Change-Id: I3ec7419498d1ecc83db6d4605b3d7610349231f7
* | | | | | | remove unneeded codeMathias Agopian2012-01-292-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I07e2fca7274d2e12bf5b4aee0050794bdb97a8b3
* | | | | | | fix buildMathias Agopian2012-01-293-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibdc45f1794e7ef60dc1ca0ff85c5cc4dff84c3fa
* | | | | | | Merge "update GLES headers and add support for corresponding new extensions."Mathias Agopian2012-01-2915-83/+3951
|\ \ \ \ \ \ \
| * | | | | | | update GLES headers and add support for corresponding new extensions.Mathias Agopian2012-01-2815-83/+3951
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Change-Id: I554d9659113b4721b748ee5c1a3b1ca82b11d75e
* | | | | | | Merge "added a few more commands to SF's dumpsys"Mathias Agopian2012-01-296-8/+65
|\ \ \ \ \ \ \
| * | | | | | | added a few more commands to SF's dumpsysMathias Agopian2012-01-286-8/+65
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --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
* | | | | | | Merge "remove unused code"Mathias Agopian2012-01-2920-10596/+0
|\ \ \ \ \ \ \
| * | | | | | | remove unused codeMathias Agopian2012-01-2820-10596/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: If900fcc50f9ffc424e270cb6063b16a2d7bc04d3
* | | | | | | am 27d2ab8b: am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in ↵Jean-Baptiste Queru2012-01-271-0/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | middle of DHCP operation" * commit '27d2ab8b27e7e1927e18869e898fa556e5da3d43': Wi-Fi: Handle disconnect in middle of DHCP operation
| * | | | | | am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP ↵Jean-Baptiste Queru2012-01-271-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation" * commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3': Wi-Fi: Handle disconnect in middle of DHCP operation
| | * \ \ \ \ \ am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"Jean-Baptiste Queru2012-01-271-0/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9781870491f4f33403f8d518879a88c20180d7cb': Wi-Fi: Handle disconnect in middle of DHCP operation
| | | * \ \ \ \ \ Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"Jean-Baptiste Queru2012-01-271-0/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | Wi-Fi: Handle disconnect in middle of DHCP operationVishal Mahaveer2012-01-271-0/+4
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore power mode and BT co-ex settings when disconnect happens in middle of DHCP operation. Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
* | | | | | | | | am 5525a43a: am 639b25ea: Merge "docs: add NOTICE to action bar icon pack ↵Roman Nurik2012-01-273-3/+37
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and sprinkle download links" into ics-mr1 * commit '5525a43a9c814faba22adfafc6517fb64259966f': docs: add NOTICE to action bar icon pack and sprinkle download links
| * | | | | | | | am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle ↵Roman Nurik2012-01-263-3/+37
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | download links" into ics-mr1 * commit '639b25ea289481da6cfd4229649b51ffc6ce3406': docs: add NOTICE to action bar icon pack and sprinkle download links
| | * | | | | | | Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" ↵Roman Nurik2012-01-263-3/+37
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1
| | | * | | | | | | docs: add NOTICE to action bar icon pack and sprinkle download linksRoman Nurik2012-01-263-3/+37
| | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1437ce64908c28621e86fff54767ddbd2b1fcb3a
* | | | | | | | | am 9d9c7189: am 00b3ceb4: Merge "docs: Update designing-navigation training ↵Roman Nurik2012-01-275-9/+56
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class to link to Android Design" into ics-mr1 * commit '9d9c718925e8ec189ba4615f93c2fe8e7d0ab23d': docs: Update designing-navigation training class to link to Android Design
| * | | | | | | | am 00b3ceb4: Merge "docs: Update designing-navigation training class to link ↵Roman Nurik2012-01-265-9/+56
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to Android Design" into ics-mr1 * commit '00b3ceb48b5e23daa8101db6080bee46d6518f43': docs: Update designing-navigation training class to link to Android Design
| | * | | | | | | Merge "docs: Update designing-navigation training class to link to Android ↵Roman Nurik2012-01-265-9/+56
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | Design" into ics-mr1
| | | * | | | | | docs: Update designing-navigation training class to link to Android DesignRoman Nurik2012-01-265-9/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1cdda032f31798f9a32b7bec583dcfaa6eafb8c2
* | | | | | | | | Fix 5906830: Don't crash on lock screens that lack a clock.Jim Miller2012-01-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash seen in SIM unlock screen where the layout doesn't have a clock to update. Change-Id: Ic1473b60f6d32f3feae9e7aa4510f6e435fa9a73
* | | | | | | | | Merge "Fix 5906830: Update the clock earlier when lock screen comes back ↵Jim Miller2012-01-272-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from suspend."
| * | | | | | | | | Fix 5906830: Update the clock earlier when lock screen comes back from suspend.Jim Miller2012-01-272-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge "Improve watchdog monitor for InputReader and InputDispatcher."Jeff Brown2012-01-274-3/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve watchdog monitor for InputReader and InputDispatcher.Jeff Brown2012-01-274-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge "Implement a cancelation mechanism for queries."Jeff Brown2012-01-2730-202/+1156
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Implement a cancelation mechanism for queries.Jeff Brown2012-01-2730-202/+1156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Use final on new member variablesGlenn Kasten2012-01-2713-30/+31
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use final for member fields initialized to a new and that are never modified. Change-Id: I042352c7bc21879613e7a50b1205b6923f8083cf
* | | | | | | | | | Merge "Bug 5567648 Request and abandon audio focus in calls"Jean-Michel Trivi2012-01-271-10/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug 5567648 Request and abandon audio focus in callsJean-Michel Trivi2012-01-271-10/+29
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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