summaryrefslogtreecommitdiffstats
path: root/services/core/java
Commit message (Collapse)AuthorAgeFilesLines
* Fix the wrong conversion of byte to int.Yuncheol Heo2014-05-201-3/+4
| | | | | | Because 'byte' type is signed, we need a mask when converting it to 'int' type. Change-Id: I3a8fcb38c9d108c0280d66301e29144391807401
* Merge "Allow adding a user while still removing other users"Amith Yamasani2014-05-202-3/+14
|\
| * Allow adding a user while still removing other usersAmith Yamasani2014-05-192-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When at the user limit, removing and adding a user causes a race condition where the deleted user is still being removed and adding another one fails. This change excludes deleted users from the counting to compare against the limit. Also fix an ArrayIndexOutOfBounds recently introduced in AppOpsService. Bug: 13282768 Change-Id: Ib79659e7604396583a280dbbc560b288a6d9051c
* | Merge "Fix infinite loop in TrustManagerService exception handler."Jim Miller2014-05-201-2/+0
|\ \
| * | Fix infinite loop in TrustManagerService exception handler.Jim Miller2014-05-191-2/+0
| |/ | | | | | | | | | | Fixes bug 15092272 Change-Id: I972a9134aed18fc160c919eac93e9d488b5691f1
* | Merge "Dump the countdown condition, if active."John Spurlock2014-05-201-0/+12
|\ \
| * | Dump the countdown condition, if active.John Spurlock2014-05-191-0/+12
| | | | | | | | | | | | Change-Id: I3fa1d239379565bae74094dc2bc2da76326f41dd
* | | Merge "Fixing regression in dismissing Recents."Winson Chung2014-05-191-2/+2
|\ \ \
| * | | Fixing regression in dismissing Recents.Winson Chung2014-05-191-2/+2
| | |/ | |/| | | | | | | | | | | | | - Restoring app info functionality when developer options are enabled and you long-press on the app icon. Change-Id: I8a20ff5f595eefa20db5528c0d5b1a1f0b110834
* | | Merge "Speed up brightness transition if auto brightness adjustment is changed"Adrian Roos2014-05-191-1/+4
|\ \ \
| * | | Speed up brightness transition if auto brightness adjustment is changedAdrian Roos2014-05-161-1/+4
| | | | | | | | | | | | | | | | Bug: 15019366 Change-Id: Id6e18f6b74d801bc8e87ba84c0948bbbabda368b
* | | | Merge "Rename session classes to have media prefix, hide routes"RoboErik2014-05-194-23/+23
|\ \ \ \
| * | | | Rename session classes to have media prefix, hide routesRoboErik2014-05-164-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This renames several of the core session classes to be prefixed with Media. It also adds @hide to all route references for now. Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
* | | | | Merge "Move media key processing to sessions"RoboErik2014-05-192-7/+105
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Move media key processing to sessionsRoboErik2014-05-162-7/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send all media key events over to the MediaSessionService instead of AudioManager. This does not affect volume handling yet, so it is possible to get into a state where volume will be handled by a different thing than media buttons. Except for corner cases this shouldn't be noticable. Change-Id: I00a576175d9c82937f0836e509b9a98d5cb77b83
* | | | Merge "Fix bug where location provider fails on secondary users. Bug: 12592045"David Christie2014-05-191-10/+14
|\ \ \ \
| * | | | Fix bug where location provider fails on secondary users.David Christie2014-05-141-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12592045 Change-Id: I196b8621c7f61c3492ad29ae90b608304dc29d66
* | | | | Fix the buildRobert Greenwalt2014-05-191-1/+1
| |_|_|/ |/| | | | | | | | | | | Change-Id: I18f78f6055f6f9c14571058d6834c8dec01aa732
* | | | Merge "Initial changes to enable keyboard support with alternate Recents. ↵Winson Chung2014-05-191-0/+18
|\ \ \ \ | | | | | | | | | | | | | | | (Bug 14067913)"
| * | | | Initial changes to enable keyboard support with alternate Recents. (Bug ↵Winson Chung2014-05-171-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | 14067913) Change-Id: Icc5d2a784ed3c3c27143eb04cbb4305549ee223a
* | | | | Merge "Enabling alternate recents on all form factors."Winson Chung2014-05-193-25/+10
|\ \ \ \ \
| * | | | | Enabling alternate recents on all form factors.Winson Chung2014-05-133-25/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9dec6da7646205b72f46cedf604fadfb03cab6d4
* | | | | | Merge "Fix cropping for fullscreen windows"Adrian Roos2014-05-191-3/+14
|\ \ \ \ \ \
| * | | | | | Fix cropping for fullscreen windowsAdrian Roos2014-05-191-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15046646 Change-Id: I526c0044e3715a4096373b8bbbdbd0c864be2df9
* | | | | | | Add javadoc for NetworkRequest.Robert Greenwalt2014-05-191-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moved the requestId serial number out of this public class into CS. Had to leave NetworkRequest hidden for now because the docs refer to things still hidden in ConnectivityManager. Change-Id: I14d1fe52d992adf5e4dc197b8f5433e40b0adfe6
* | | | | | | am 9672ee12: am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree ↵Narayan Kamath2014-05-191-17/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on an ISA for shared UIDs." * commit '9672ee125d6aee73bf1e5425c4089285714f25bf': Fail if we're unable to agree on an ISA for shared UIDs.
| * | | | | | | am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA ↵Narayan Kamath2014-05-191-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for shared UIDs." * commit 'deda5467f44fc4a03c3435f0c6d7bda4ea298b99': Fail if we're unable to agree on an ISA for shared UIDs.
| * | | | | | | am 6e2e6868: am 706b1d7e: Merge "Remove "required" prefix from ABI fields."Narayan Kamath2014-05-155-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e2e686889037711170ee145f9dfdb442cee85db': Remove "required" prefix from ABI fields.
* | | | | | | | Merge "Do not pass null to IInputMethod#setSessionEnabled"Yohei Yukawa2014-05-191-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not pass null to IInputMethod#setSessionEnabledYohei Yukawa2014-05-191-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doen't make sense to pass null as IInputMethodSession for IInputMethod#setSessionEnabled. If we do this, it causes NPE. BUG: 14980068 Change-Id: Ide48d098d5e7640890257e31f8872e79b9821eb2
* | | | | | | | | Merge "Initialize internal CEC logical devices"Jinsuk Kim2014-05-182-6/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Initialize internal CEC logical devicesJinsuk Kim2014-05-152-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocates logical address of internal HDMI-CEC logical device(s) using the resource config_hdmiCecLogicalDeviceType. Change-Id: I1a0d2f7bce36fc643887241f03161dc053d6c25c
* | | | | | | | | | Merge "Decouple network_sampling frequency from VDBG"Robert Greenwalt2014-05-181-2/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Decouple network_sampling frequency from VDBGRobert Greenwalt2014-05-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a special debug flag for testing network sampling. Change-Id: Ibe572c3b5648ca25f1e5be2c61e5c5ad2979b2cb
* | | | | | | | | | | Merge "Pass correct task to window manager"Craig Mautner2014-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Pass correct task to window managerCraig Mautner2014-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target task when starting is not always the top task. If it's not the window manager gets into a bad state. Fixes bug 14684143. Change-Id: I90145ae43bdc5d980dc25ac19e12aa84debfed71
* | | | | | | | | | | Merge "Refactoring RecentsActivityValues into TaskDescription, and ensuring ↵Winson Chung2014-05-173-49/+49
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they are resolved when set. (Bug 14995928, 14832629)"
| * | | | | | | | | | | Refactoring RecentsActivityValues into TaskDescription, and ensuring they ↵Winson Chung2014-05-163-49/+49
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are resolved when set. (Bug 14995928, 14832629) Change-Id: I582221468e63a96a5dfd132a31b09e72099b170f
* | | | | | | | | | | Merge "Add idle-state controller for the Task Manager"Christopher Tate2014-05-171-0/+180
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add idle-state controller for the Task ManagerChristopher Tate2014-05-161-0/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Idle time" is currently defined to begin ~ an hour (actually slightly more) after the screen turns off and/or dreaming begins. Screen-on and dreams-ending are the triggers for declaring "idle" time to be over. Bug 14993295 Change-Id: I0898871d5b76a52d647ae2ebcb1b2f941ec45e79
* | | | | | | | | | | | Merge "Stop clatd when starting the Nat464Xlat service."Lorenzo Colitti2014-05-161-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Stop clatd when starting the Nat464Xlat service.Lorenzo Colitti2014-05-161-2/+10
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a runtime restart happens while clatd was running, we try to start clatd, which causes a fatal exception because netd returns a 400 error (clatd already started. Bug: 13450716 Bug: 15012035 Change-Id: I102a06d6193fb5f4a1ebe5ad52e5647ff72ca0da
* | | | | | | | | | | Refactored code didn't make it into previous CLMatthew Williams2014-05-164-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ec93e783267d0c0fb39fbc8d0abe7270bdaea68
* | | | | | | | | | | Merge "TM TaskServiceContext implementation"Matthew Williams2014-05-166-80/+674
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | TM TaskServiceContext implementationMatthew Williams2014-05-166-80/+674
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each task is run on the client from within a TaskServiceContext. TSC tracks the state of execution of each task on the client. Change-Id: I93c306a83c1115559f4e9675d9997dceae3f186a
* | | | | | | | | | | Merge "Trust Agents: Withhold trust until user has authenticated"Adrian Roos2014-05-161-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Trust Agents: Withhold trust until user has authenticatedAdrian Roos2014-05-161-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14229695 Change-Id: I40d9fa442aa05437c20081c007ed64f984042418
* | | | | | | | | | | Merge "Trust Agents: Implement DPM override"Adrian Roos2014-05-161-2/+31
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Trust Agents: Implement DPM overrideAdrian Roos2014-05-161-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable trust agents when a device policy disabling them is in effect. Bug: 14619289 Change-Id: I0920a17021cbf045d2362735df49ef4d013fcc7f
* | | | | | | | | | | Merge "Fix recording of wake_lock_in."Dianne Hackborn2014-05-161-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |