summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add debug info to wificonfiguration dumpvandwalle2014-07-281-0/+11
| | | | Change-Id: I4887afa21d6e1d9463fa4a5cd0aa7ae22973239f
* Merge "Settings: Constants for notification settings." into lmp-devJohn Spurlock2014-07-271-0/+21
|\
| * Settings: Constants for notification settings.John Spurlock2014-07-281-0/+21
| | | | | | | | | | Bug:16208321 Change-Id: Iaf18dfc2edda9d80553f02ea0a74236230f89079
* | Handle synchronous failed connectionSailesh Nepal2014-07-292-16/+3
| | | | | | | | Change-Id: I406ccbdd1f70c85456b6e0d689332cf40a756707
* | am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset ↵Filip Gruszczynski2014-07-291-2/+1
|\ \ | | | | | | | | | | | | | | | | | | is applied twice." into klp-modular-dev * commit '896a82d77e732c7387b2279bcdd0f04d696b13df': Fix double chin issue, where bottom inset is applied twice.
| * \ am d0e03392: Merge "Fix double chin issue, where bottom inset is applied ↵Filip Gruszczynski2014-07-281-2/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | twice." into klp-modular-dev * commit 'd0e03392394164e1e261ef8829e187ad2362d426': Fix double chin issue, where bottom inset is applied twice.
| | * \ Merge "Fix double chin issue, where bottom inset is applied twice." into ↵Filip Gruszczynski2014-07-271-2/+1
| | |\ \ | | | | | | | | | | | | | | | klp-modular-dev
| | | * | Fix double chin issue, where bottom inset is applied twice.Filip Gruszczynski2014-07-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes how windowOutsetBottom is applied. Instead of being added to whatever inset is already set, it overwrites it. Bug: 16567038 Change-Id: Idedae93b790652e9de0519764ea7a03841f9e8fd
* | | | | am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on ↵Craig Mautner2014-07-292-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | stack." into klp-modular-dev * commit '09875ec7292b19e07c38b6127406d6aa7490e26c': Remove PendingActivityLaunches based on stack.
| * | | | am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into ↵Craig Mautner2014-07-282-3/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9': Remove PendingActivityLaunches based on stack.
| | * | | Merge "Remove PendingActivityLaunches based on stack." into klp-modular-devCraig Mautner2014-07-282-3/+3
| | |\ \ \
| | | * | | Remove PendingActivityLaunches based on stack.Craig Mautner2014-07-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was previously removing by trying to match activities, but the activity being matched would not have been in the stack yet. Since it doesn't get added to the stack when it goes into the list of pending activities. By removing all pending activities associated with the stack we clean up all such pending activities. Fixes bug 16045752. Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
* | | | | | Merge "Remove dead code 3." into lmp-devRobert Greenwalt2014-07-241-94/+16
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Remove dead code 3.Robert Greenwalt2014-07-291-94/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing mNetRequestersPids and mPriorityList. Change-Id: I8295040436b62f7f6495ece7154246fb719288a4
* | | | | | Zen: follow independent ringer mode changes.John Spurlock2014-07-282-0/+38
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug:16624498 Change-Id: Ib623118970a82c8406c714687b1b516378fe7824
* | | | | Allow VPNs to add/remove link addresses dynamically.Sreeram Ramachandran2014-07-296-26/+148
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15409819 Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
* | | | | Merge "Add cursor flags into SpriteController to suppor async cursor ↵Riley Andrews2014-07-242-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | updates. - This is fairly blindly taken from nvidia's implementation." into lmp-dev
| * | | | | Add cursor flags into SpriteController to suppor async cursor updates.Riley Andrews2014-07-282-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This is fairly blindly taken from nvidia's implementation. Change-Id: I825ecbd9cb4b394793dce079591b37efca546bbe
* | | | | | Merge "Updating lock-to-app look." into lmp-devWinson Chung2014-07-2520-117/+232
|\ \ \ \ \ \
| * | | | | | Updating lock-to-app look.Winson Chung2014-07-2820-117/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adding seek bars for tweaking values when in debug mode Change-Id: I92ae7b431ee170f5d8b31f34349d51a6b7f9ddef
* | | | | | | Merge "Provide outside-facing API for data management intent+label" into lmp-devChristopher Tate2014-07-272-0/+56
|\ \ \ \ \ \ \
| * | | | | | | Provide outside-facing API for data management intent+labelChristopher Tate2014-07-282-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 16346320 Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
* | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-07-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-281-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0495a69db49b3475537a3546bcb4d246b4dd018b Auto-generated-cl: translation import
* | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-07-2472-640/+1144
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-2872-640/+1144
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98856777334e10b3560806992290620a1bd58c1d Auto-generated-cl: translation import
* | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-2872-980/+1071
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1fcd1e840d7fbcc47d41e1dc997b685b6c4b9205 Auto-generated-cl: translation import
* | | | | | | Merge "Add MHL getPortInfo" into lmp-devJinsuk Kim2014-07-242-20/+32
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add MHL getPortInfoJinsuk Kim2014-07-282-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows MHL support flag to be put into port information Bug: 16215362 Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
* | | | | | | rename AudioSystem::newAudioSessionId()Eric Laurent2014-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename AudioSystem::newAudioSessionId() to AudioSystem::newAudioUniqueId() as it can be used also for I/O handles. Bug: 12378680. Change-Id: I3f6658db2b8db8f56d1a99f12b15429e293631e6
* | | | | | | Merge "Camera2: Fix wrong usage of toArray" into lmp-devYin-Chia Yeh2014-07-241-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Camera2: Fix wrong usage of toArrayYin-Chia Yeh2014-07-281-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to use "<T> T[]" version of toArray. Change-Id: I021ed5a4e446b34028810e8acea3395c1c3387e7
* | | | | | | | Merge "Remove dead code 2." into lmp-devRobert Greenwalt2014-07-282-326/+143
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove dead code 2.Robert Greenwalt2014-07-282-326/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing ConnectivityService.NetworkFactory. This requires disabling the ConnectivityServiceTest, but that's been broken since we stopped using NetworkStateTrackers anyway. Change-Id: I9b86bd37eb9d018c40f60dca5b00d62c36d4e3ad
* | | | | | | | Enable config CDMA home system by mcc mncJing Zhao2014-07-284-0/+41
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define CDMA home system IDs for Verizon Change-Id: Ie10d838173df3095238c50d419bd9de589e34e55
* | | | | | | Merge "android.media.AudioPatch: update comment" into lmp-devMike Lockwood2014-07-241-2/+2
|\ \ \ \ \ \ \
| * | | | | | | android.media.AudioPatch: update commentMike Lockwood2014-07-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5470c49be4b4f4dcda8db8f2d1153afe2e84ad1
* | | | | | | | Merge "Add kModeSync" into lmp-devBo Liu2014-07-245-7/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Add kModeSyncJohn Reck2014-07-245-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16526750 Change-Id: I4c087160e80432739321172fd57880846c8de6e0
* | | | | | | | | Add data-management intent + label to BackupTransport APIChristopher Tate2014-07-283-3/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 16346320 Change-Id: Id9e855a1d3cebbf801c27a21e1edc3ffcccfd2e9
* | | | | | | | | AudioAttributes and AudioRecord.Jean-Michel Trivi2014-07-286-56/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add audio recording source in AudioAttributes. New AudioRecord constructor with AudioAttributes and AudioFormat. Legacy AudioRecord constructor is calling into the new constructor. Bug 16009464 Change-Id: I69d81f9e71bdf946c4cfbda6d3d8552ffac6b5c2
* | | | | | | | | Merge "introduce WifiConnectionstatistics" into lmp-devvandwalle2014-07-289-8/+365
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | introduce WifiConnectionstatisticsvandwalle2014-07-289-8/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL is dependent on I10584a447fecd977df3eefd8e2cc028bd26ec0e3 Change-Id: I51fbbf062feb22c5f16b438675519064cc43e160
* | | | | | | | | | Make affiliatedTaskId public and unhidden.Craig Mautner2014-07-282-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow apps to see which of their tasks are affiliated in the RecentTaskInfo returned by getAppTasks(). Fixes bug 16546323. Change-Id: I54d75c02c194f58fb6513fa91c312289460f56b4
* | | | | | | | | | Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-devGeorge Mount2014-07-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Allow changing bounds to and from a zero-sized bounds.George Mount2014-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 14590183 Change-Id: I596cb384198a6f7de14afed0d78711f127d3511e
* | | | | | | | | | Fix QS overscroll flickeringJorim Jaggi2014-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f514285ec8de185e6f443d6943f0bd711dcac26
* | | | | | | | | | Fix slide edge constants to match the gravity values.George Mount2014-07-281-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 16544683 Change-Id: If9aeb585d5c3eb3a984288c09510e1dde0c03045
* | | | | | | | | | Merge "Revert "Load the WebView Java code from an APK." DO NOT MERGE" into ↵Selim Gurun2014-07-281-11/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | | | | | Revert "Load the WebView Java code from an APK." DO NOT MERGEBen Murdoch2014-07-281-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 72618c3363c83f2668dab4495b100a61d6d8700a. Bug: 16448724