summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats ↵Jeff Sharkey2011-09-180-0/+0
|\ | | | | | | | | | | | | buckets, full poll." into ics-factoryrom * commit 'aaf301736e923db15918617145069658696be453': DO NOT MERGE: Sample atomic network stats buckets, full poll.
| * Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ↵Jeff Sharkey2011-09-185-106/+89
| |\ | | | | | | | | | ics-factoryrom
| | * DO NOT MERGE: Sample atomic network stats buckets, full poll.Jeff Sharkey2011-09-185-106/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sampling network stats, always use atomic buckets instead of interpolating. Always poll iface and UID together so we distribute into buckets equally. Move stale bucket trimming to just before writing stats. Bug: 5321340 Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4
* | | am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryromJeff Sharkey2011-09-187-10/+186
|\ \ \ | |/ / | | | | | | | | | * commit '3d1d57dcdb02ace6af5810bd4ec3f8fad5fc1799': Collect and persist tethering stats.
| * | Merge "Collect and persist tethering stats." into ics-factoryromJeff Sharkey2011-09-187-10/+186
| |\ \ | | |/
| | * Collect and persist tethering stats.Jeff Sharkey2011-09-167-10/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use new "gettetherstats" netd command to retrieve statistics for active tethering connections. Keep tethering poll events separate from UID poll, even though they end up same historical structures. Bug: 5244846 Change-Id: Ia0c5165f6712c12b51586f86c331a2aad4ad6afb
* | | Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode"Adam Powell2011-09-186-14/+26
|\ \ \
| * | | Fix bug 5333962 - Problems with no action bar/overlay action modeAdam Powell2011-09-186-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the standalone action mode window for overlay mode to be of TYPE_APPLICATION. (This also fixes a bug where overflow menus would not work properly on these types of action mode bars.) Set exitFadeDuration on btn_cab_done_holo_* drawables. Remove no-window-focus override selector states for selectable item backgrounds to allow proper touch feedback on windows that do not have focus but that the user can interact with. Change-Id: Ib504866238708150d21e6183ff7b695869c05d3e
* | | | Fix build.Dianne Hackborn2011-09-181-1/+2
| | | | | | | | | | | | | | | | Change-Id: Ife2b4b207270f8017d3acd80c76eaf1c7a50986d
* | | | Merge "Fix issue #5242779: Device not responding to touch on unlock screen"Dianne Hackborn2011-09-187-106/+187
|\ \ \ \
| * | | | Fix issue #5242779: Device not responding to touch on unlock screenDianne Hackborn2011-09-187-106/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework how we decide when it is okay to turn on the screen by having the policy call back to the power manager when it knows the lock screen has been drawn. Change-Id: Ie8f3f72111dcf7f168723e6dce24e0343b4afe5d
* | | | | Merge "Retain DNS information from DHCP request"Irfan Sheriff2011-09-182-9/+41
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Retain DNS information from DHCP requestIrfan Sheriff2011-09-162-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DHCP renewal can fail to fill DNS information. In such a case retain info from DHCP request Bug: 5314392 Change-Id: I2413f738be7c8c965ef9e7ffbc348e2738aa68b5
* | | | | Merge "Revert "Fix bug #5332081 TextLayoutCache needs to be able to have ↵Fabrice Di Meglio2011-09-187-306/+240
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | more cache hits""
| * | | | | Revert "Fix bug #5332081 TextLayoutCache needs to be able to have more cache ↵Fabrice Di Meglio2011-09-187-306/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hits" This reverts commit d686d76814f18061e06995df0d5de9feb9f70a7e
* | | | | | Merge "doc change: fix attr name"Dirk Dougherty2011-09-171-1/+1
|\ \ \ \ \ \
| * | | | | | doc change: fix attr nameDirk Dougherty2011-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ida73a3f94f9abf969ebf3b44b07495bca924de10
* | | | | | | doc change: fix typoDirk Dougherty2011-09-171-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ib0e21fb53d3986ebb9f76dadc291ce9dfa42adf7
* | | | | | am 79aa4030: Merge "Can\'t stop the fling! Bug: 5335420" into ics-factoryromJeff Brown2011-09-163-2/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '79aa40302b643ee6c6227ee354a1b1378e721568': Can't stop the fling! Bug: 5335420
| * | | | | Merge "Can't stop the fling! Bug: 5335420" into ics-factoryromJeff Brown2011-09-163-2/+5
| |\ \ \ \ \
| | * | | | | Can't stop the fling!Jeff Brown2011-09-163-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5335420 Fixed a bug in VelocityTracker where the output velocity was not being set to zero when not available. Added a condition to ensure that the velocity is at least the minimum fling velocity before continuing. If not, then the user is trying to stop the fling and scroll more precisely. Change-Id: I36634b0c3f7a9a09cf20c33f71d41163a8e33eed
* | | | | | | am 259db3f6: Merge "Have all connections disconnected before turning off ↵Wink Saville2011-09-162-10/+25
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | radio." into ics-factoryrom * commit '259db3f66f8cbbf1eadec9c6b76d7e476318486c': Have all connections disconnected before turning off radio.
| * | | | | | Merge "Have all connections disconnected before turning off radio." into ↵Wink Saville2011-09-162-10/+25
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | ics-factoryrom
| | * | | | | Have all connections disconnected before turning off radio.Wink Saville2011-09-162-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5306201 Change-Id: I8a121e5ed951f286b6f3edc70c468e86ccedfbf0
* | | | | | | Merge "Revert "Forces AsyncTask to use the main looper Bug #5333924""Jeff Brown2011-09-161-7/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "Forces AsyncTask to use the main looper Bug #5333924"Jeff Brown2011-09-161-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6dafefb0f44c4e57384e2ec3e08fefac5cc7e071 This change is breaking the system on startup with an NPE. Need to fix that first then resubmit.
* | | | | | | | Merge "Force an update before we poll for the data."Tsu Chiang Chuang2011-09-161-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Force an update before we poll for the data.Tsu Chiang Chuang2011-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic70c1611ac289c934bf9f909e924c0043f065498
* | | | | | | | | Merge "add upload capabilities to data test."Tsu Chiang Chuang2011-09-163-2/+75
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | add upload capabilities to data test.Tsu Chiang Chuang2011-09-153-2/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8465e4b97ff7f48de1150193bcd2b520da1adf00
* | | | | | | | | am 1afeea0f: (-s ours) Merge "work around a problem where fp registers get ↵Mathias Agopian2011-09-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corrupted (DO NOT MERGE)" into ics-factoryrom * commit '1afeea0f207f8b8b781f799f5d150b70495abb1a': work around a problem where fp registers get corrupted (DO NOT MERGE)
| * | | | | | | | Merge "work around a problem where fp registers get corrupted (DO NOT ↵Mathias Agopian2011-09-161-1/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE)" into ics-factoryrom
| | * | | | | | | | work around a problem where fp registers get corrupted (DO NOT MERGE)Mathias Agopian2011-09-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5331198 Change-Id: I1f9b4a79d34d63f8adb0555909998664ea2ea9ca
* | | | | | | | | | Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache ↵Fabrice Di Meglio2011-09-167-240/+306
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | hits"
| * | | | | | | | | Fix bug #5332081 TextLayoutCache needs to be able to have more cache hitsFabrice Di Meglio2011-09-167-240/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - makes TextLayoutCache not carring about start/count. Basically he will cache the result for the full string and gives back the "chunk" corresponding to start/count - changed the TextLayoutCacheValue API to take start/count parameters - added the Harfbuzz LogClusters in TextLayoutCacheValue as it is needed for extracting the start/count "chunk" - fix potential issue of cache key leaking Change-Id: I9276f9bec744e8de36349acfba8429f7c6f83394
* | | | | | | | | | Merge "Forces AsyncTask to use the main looper Bug #5333924"Romain Guy2011-09-161-1/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Forces AsyncTask to use the main looperRomain Guy2011-09-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #5333924 This might break applications trying to use AsyncTask on a looper that is not the main thread, but such apps would already have issues (AsyncTask has a single static handler and attempting to use AsyncTask outside of the main thread would likely result in weird threading issues in other parts of the app.) Change-Id: Ibbf480627fc7b91326a27d4f5e5af49e8c5b5115
* | | | | | | | | | Merge "Clarify documentation of AdapterView.OnItemSelectedListener Bug #5331587"Romain Guy2011-09-161-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clarify documentation of AdapterView.OnItemSelectedListenerRomain Guy2011-09-161-2/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #5331587 Change-Id: Ic3d6aca573639d6cae3abb45bfe821f5fd31f1bc
* | | | | | | | | | am a2a960b4: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-09-160-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | into ics-factoryrom * commit 'a2a960b4a14f473f7677694973b5b9274eccc516': Import revised translations. DO NOT MERGE
| * | | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-factoryromEric Fischer2011-09-16149-4035/+3182
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-09-16149-4035/+3182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibae2079f2de6ae74d12a88e3c6f6f52b3010990f
* | | | | | | | | Merge "Fix "am profile" when run on system_server."Jeff Sharkey2011-09-161-29/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix "am profile" when run on system_server.Jeff Sharkey2011-09-151-29/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split profiler controls into separate object, since system server doesn't have an AppBindData. Bug: 5327365 Change-Id: I613170cd94e0d4930dee049d0fe6c19124f13d65
* | | | | | | | | | am f79ec360: Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" ↵Jean-Michel Trivi2011-09-161-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | into ics-factoryrom * commit 'f79ec360984011c49c52b7a19b96cbbc932df4be': Fix bug 5327199 Recycle bitmaps in RemoteControlClient
| * | | | | | | | Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" into ↵Jean-Michel Trivi2011-09-161-0/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-factoryrom
| | * | | | | | | | Fix bug 5327199 Recycle bitmaps in RemoteControlClientJean-Michel Trivi2011-09-161-0/+4
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When applying the new bitmap from the editor to the client, recycle the old bitmap, and set the reference to the editor bitmap to null. Change-Id: I7d79e4b8410e5035fa51b20be4b1ada391c84c28
* | | | | | | | | am 218148f1: Merge "Revert "Adding selected state for scrubber control"" ↵Justin Ho2011-09-1616-4/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-factoryrom * commit '218148f1ffb574282bdc72a1a4cc97b7129cf043': Revert "Adding selected state for scrubber control"
| * | | | | | | | Merge "Revert "Adding selected state for scrubber control"" into ics-factoryromJustin Ho2011-09-1616-4/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Adding selected state for scrubber control"Justin Ho2011-09-1616-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a11aeeb36560959db321f9757d4c5eccfdfa7f63