summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Collapse)AuthorAgeFilesLines
* More battery stats.Dianne Hackborn2014-02-259-20/+93
| | | | | | | | | - Add events for sync. - Add more descriptive tags for wake events. - Fix battery reset. - Fix tracking of wifi data. Change-Id: Ic07f2a86a5ed33e7da57eb1108c31c777ecd801f
* Merge "Tabs -> spaces in frameworks/base."John Spurlock2014-02-2521-115/+115
|\
| * Tabs -> spaces in frameworks/base.John Spurlock2014-02-2521-115/+115
| | | | | | | | Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
* | Fix NFC docs breakage.Martijn Coenen2014-02-251-2/+2
| | | | | | | | Change-Id: I680dc7974316c77cb1835b5a81f30e6961ba3c49
* | am c407ace3: am d4c819c0: am dd9ce628: Merge "Clean up activities and ↵Craig Mautner2014-02-253-1/+31
|\ \ | | | | | | | | | | | | | | | | | | displays when done" into klp-modular-dev * commit 'c407ace3019c4e542654cf17fd04d9436d3f3436': Clean up activities and displays when done
| * \ am dd9ce628: Merge "Clean up activities and displays when done" into ↵Craig Mautner2014-02-253-1/+31
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'dd9ce6287eb9ccae8d527e6750c91b0bd47834fc': Clean up activities and displays when done
| | * \ Merge "Clean up activities and displays when done" into klp-modular-devCraig Mautner2014-02-253-1/+31
| | |\ \
| | | * | Clean up activities and displays when doneCraig Mautner2014-02-253-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More maintenance fixes. Fix bug 13157352. Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
* | | | | Merge "Add an API to manually invoke Android Beam."Martijn Coenen2014-02-254-1/+90
|\ \ \ \ \
| * | | | | Add an API to manually invoke Android Beam.Martijn Coenen2014-02-144-1/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activities can call NfcAdapter.invokeBeam() to manually invoke the Beam animation. Any NFC tap is then enough to complete the transaction. Also, added NdefRecord convenience method for creating Text records. Bug: 5134061 Change-Id: Ia9df360d1d7e8451157c85a6d12f2a4eec924960
* | | | | | am fcf7d3a6: am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy ↵Hui Lu2014-02-251-14/+96
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | network connectivity." into klp-modular-dev * commit 'fcf7d3a64947a8a0f05ee9e0669abe4a0727f926': Reconnect/teardown proxy network connectivity.
| * | | | | am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into ↵Hui Lu2014-02-251-14/+96
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '95e3cba1f66af5594b5bdc210426ced44dd7b7ac': Reconnect/teardown proxy network connectivity.
| | * | | | Merge "Reconnect/teardown proxy network connectivity." into klp-modular-devHui Lu2014-02-251-14/+96
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Reconnect/teardown proxy network connectivity.Hui Lu2014-02-181-14/+96
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9bf6f96883a2151fceef788e65d9a767d0f52c69
* | | | | | Merge "Hide managed profiles from user switchers."Kenny Guy2014-02-252-2/+33
|\ \ \ \ \ \
| * | | | | | Hide managed profiles from user switchers.Kenny Guy2014-02-242-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide managed profiles from lockscreen user switcher on tablets. Hide managed profiles from power menu user switcher on phones. Add flag to enable multi user ui turned off by default. Change-Id: I4c69a6f7b0f39c249fc85fd940318df1ddab073f
* | | | | | | Merge "Adding the requiredForProfile flag."Nicolas Prevot2014-02-252-0/+27
|\ \ \ \ \ \ \
| * | | | | | | Adding the requiredForProfile flag.Nicolas Prevot2014-02-242-0/+27
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling to use requiredForProfile in application manifests It determines which applications will be installed for managed profiles and for restricted profiles Change-Id: I14b4de2c9f41c2bbf5cd9fd0ca6caf5ce2d04131
* | | | | | | Merge "Force measurement in LinearLayout if any views are skipped"Alan Viverette2014-02-251-4/+11
|\ \ \ \ \ \ \
| * | | | | | | Force measurement in LinearLayout if any views are skippedAlan Viverette2014-02-241-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 12249256 Change-Id: I805cc70c4a2982befd9eb625be1378e6a2d9eba6
* | | | | | | | Merge "Fix some issues with network usage in battery stats."Dianne Hackborn2014-02-252-17/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix some issues with network usage in battery stats.Dianne Hackborn2014-02-242-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b354872511fcb55cecb2e09aada2eab41a1e202
* | | | | | | | | Camera2: Correct some minor errors in awb region specZhijun He2014-02-243-49/+53
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also correct some other typos. Change-Id: Ib7ac65cd82d06a20aa47cce10a9976a3ac405142
* | | | | | | | Merge "Damage IsolatedZVolume when shadows change"Chris Craik2014-02-241-1/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Damage IsolatedZVolume when shadows changeChris Craik2014-02-211-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:12874322 Change-Id: I3dd92f551dfb00965ccd08647586f378f8949b1c
* | | | | | | | | Merge "Add back resize buffer"John Reck2014-02-242-103/+86
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add back resize bufferJohn Reck2014-02-212-103/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12825810 Change-Id: Ic2329c30524010f54778101853b30f8f8d9eeb6c
* | | | | | | | | Merge "Improve how battery stats collects network stats."Dianne Hackborn2014-02-243-55/+172
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve how battery stats collects network stats.Dianne Hackborn2014-02-243-55/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This optimizes the path for battery stats to collect per-uid network usage. It now collects wifi and mobile usage separately, with a path that allows it to recycle all data structures and filter out stats it isn't interested in before they come back to java. This is setting us up for the actual goal, to collect mobile stats independently each time the mobile radio goes down, allowing us to distribute mobile radio usage across uids based on the number of packets they transferred during a session. Change-Id: I21a0f517cf087ea5aa8b8dd535e20b46e361a52b
* | | | | | | | | | Check for ongoing detachment in AbsListViewAlan Viverette2014-02-241-3/+12
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 13167767 Change-Id: Ie1a828eadbb99daef46af77544f233fee09fd1bc
* | | | | | | | | Merge "Check for null view root before checking for accessibility focus"Alan Viverette2014-02-242-42/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check for null view root before checking for accessibility focusAlan Viverette2014-02-242-42/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 13168971 Change-Id: Ia75d77b18112371f56a624e11f9509f14ec98093
* | | | | | | | | | Merge "Camera2: update 3A state related metadata key docs"Zhijun He2014-02-242-15/+174
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Camera2: update 3A state related metadata key docsZhijun He2014-02-242-15/+174
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12840262 Change-Id: I2092e1d24b262a0568b880094b8ad6a87510b346
* | | | | | | | | | Merge "Add the calling package name to requestRouteToHost"Chad Brubaker2014-02-243-7/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add the calling package name to requestRouteToHostChad Brubaker2014-02-193-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The calling package name will be used to check if an application is a system application when deciding if a route should be exempt from VPN routing rules. Bug: 12937545 Change-Id: I2c09c875fe9bb9685871a0a801ddcbb32fc17405
* | | | | | | | | | Fix missing # in method name in javadoc.Torne (Richard Coles)2014-02-241-1/+1
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix doc generation. Change-Id: I2e333a7224eeaff7a870fedc7f7a4eb113d1fe2f
* | | | | | | | | Merge "Remove trailing spaces and tabs"Yohei Yukawa2014-02-241-15/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove trailing spaces and tabsYohei Yukawa2014-02-241-15/+15
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actual fix will be covered by subsequent patches. BUG: 12954290 Change-Id: I55f2374fd447d5b3d5a696de6f9b493e32f4e17a
* | | | | | | | | Merge "Enables a profile owner or device owner to set and clear default ↵Sander Alewijnse2014-02-243-0/+58
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | intent handler activities."
| * | | | | | | | Enables a profile owner or device owner to set and clear default intent ↵Sander Alewijnse2014-02-213-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handler activities. Those intent handlers are persistent preferences. They will remain the default intent handler even if the set of potential event handlers for the intent filter changes and if the intent preferences are reset. Change-Id: Id0cfae46f93c10d89e441f272096a205ec518dd0
* | | | | | | | | Allow alpha modulation in ColorStateList itemsAlan Viverette2014-02-221-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it much easier to define a disabled state color as an alpha modulation of some base color. Change-Id: Ie2ecf40b1f6560fcd8eda208d780616dddfc0d08
* | | | | | | | | am 3dc57b39: am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home ↵Craig Mautner2014-02-221-6/+29
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | activity" into klp-modular-dev * commit '3dc57b39f2a87fe3692b5606de2b0c0693fc485c': Fixes for ActivityView on home activity
| * | | | | | | am ffda4648: Merge "Fixes for ActivityView on home activity" into ↵Craig Mautner2014-02-221-6/+29
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'ffda464851008f750246f343c939d8003071cd23': Fixes for ActivityView on home activity
| | * | | | | | Fixes for ActivityView on home activityCraig Mautner2014-02-211-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the ActivityView is part of the home activity special checks must be made. Things like don't move the home stack to the back when the ActivityView activity is resumed. Fixes bug 13119389. Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
* | | | | | | | Fix refactoring of invalidate methodsAlan Viverette2014-02-211-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was incorrectly clearing the DRAWN flag and updating mLastIsOpaque from partial invalidations, though why this should be different is somewhat of a mystery. BUG: 13138721 Change-Id: Ic8d11a64406bc78e94adec7355c1f50d87567887
* | | | | | | | am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to ↵Greg Hackmann2014-02-222-2/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb': open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal Move time setting code from SystemClock to AlarmManagerService
| * | | | | | | resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aospGreg Hackmann2014-02-212-2/+23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
| | * \ \ \ \ \ \ Merge changes I6d4fdada,Ia34899a4Greg Hackmann2014-02-212-2/+23
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal Move time setting code from SystemClock to AlarmManagerService
| | | * | | | | | | Move time setting code from SystemClock to AlarmManagerServiceGreg Hackmann2014-02-212-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On devices using /dev/rtc instead of /dev/alarm, updating the time-of-day clock and RTC are separate syscalls. Hence the clock and RTC could be left in inconsistent states if two threads called SystemClock.setCurrentTimeMillis() simultaneously. By moving this code into AlarmManagerService, we can put a global lock around AlarmManagerService.setTime() and prevent the race condition. Note that access to SystemClock.setCurrentTimeMillis() is now gated by android.permission.SET_TIME, where before it was gated by filesystem permissions (i.e., could the process write to /dev/alarm or /dev/rtc). Change-Id: Ia34899a4cde983656305fd2ef466dfe908ed23c8 Signed-off-by: Greg Hackmann <ghackmann@google.com>
generated by cgit v1.1 at 2024-08-19 06:32:37 +0000