summaryrefslogtreecommitdiffstats
path: root/services/core/java/com
Commit message (Expand)AuthorAgeFilesLines
* Retry "Always show auxiliary subtypes from NavBar keyboard icon."Seigo Nonaka2015-05-061-6/+26
* Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" in...Bart Sears2015-05-071-26/+6
|\
| * Revert "Always show auxiliary subtypes from NavBar keyboard icon."Bart Sears2015-05-071-26/+6
* | Merge changes from topic 'mr' into mnc-devJeff Brown2015-05-071-15/+0
|\ \
| * | Revert "Initial draft of new MediaRouter APIs."Jeff Brown2015-05-061-15/+0
* | | Merge "Move PhoneWindow and friends back into internal package" into mnc-devAdam Powell2015-05-061-1/+1
|\ \ \
| * | | Move PhoneWindow and friends back into internal packageAdam Powell2015-05-061-1/+1
* | | | Merge "Do nothing if hideSoftInput is called from not focused client." into m...Seigo Nonaka2015-05-061-2/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Do nothing if hideSoftInput is called from not focused client.Seigo Nonaka2015-05-061-2/+0
* | | | Merge "Add setting to mute wireless charging sound." into mnc-devJohn Spurlock2015-05-061-1/+3
|\ \ \ \
| * | | | Add setting to mute wireless charging sound.John Spurlock2015-05-061-1/+3
* | | | | Merge "Fetch DISALLOW_CONFIG_VPN for the current user." into mnc-devNicolas Prevot2015-05-061-2/+4
|\ \ \ \ \
| * | | | | Fetch DISALLOW_CONFIG_VPN for the current user.Nicolas Prevot2015-05-061-2/+4
| | |/ / / | |/| | |
* | | | | Merge "CEC: Reset active source/path before going into standby" into mnc-devJinsuk Kim2015-05-061-0/+3
|\ \ \ \ \
| * | | | | CEC: Reset active source/path before going into standbyJinsuk Kim2015-04-301-0/+3
* | | | | | Merge "Delay all syncing until the device is provisioned" into mnc-devMatthew Williams2015-05-061-34/+104
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Delay all syncing until the device is provisionedMatthew Williams2015-05-061-34/+104
* | | | | | Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-devSeigo Nonaka2015-05-061-6/+26
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Always show auxiliary subtypes from NavBar keyboard icon.Seigo Nonaka2015-05-061-6/+26
* | | | | | Zen: Calendar tracker should use event availability.John Spurlock2015-05-061-3/+16
| |_|_|_|/ |/| | | |
* | | | | Zen: Maintain source filters for both calls and messages.John Spurlock2015-05-052-13/+15
| |/ / / |/| | |
* | | | Only enable fingerprint auth after first regular authJorim Jaggi2015-05-051-12/+47
| |_|/ |/| |
* | | Merge "Call profile changed in cases were focused activity is nulled." into m...Kenny Guy2015-05-051-2/+20
|\ \ \
| * | | Call profile changed in cases were focused activity is nulled.Kenny Guy2015-04-301-2/+20
* | | | Merge "Permission UI - legacy apps support" into mnc-devSvet Ganov2015-05-053-46/+12
|\ \ \ \
| * | | | Permission UI - legacy apps supportSvet Ganov2015-05-053-46/+12
* | | | | Merge "Zen: Remove calendar rule attendance attribute." into mnc-devJohn Spurlock2015-05-051-30/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Zen: Remove calendar rule attendance attribute.John Spurlock2015-05-051-30/+8
* | | | | Remove dead code from IMMS.Seigo Nonaka2015-05-051-20/+7
* | | | | Merge changes from topic 'mwd-merge-050415' into mnc-devPrerepa Viswanadham2015-05-054-9/+40
|\ \ \ \ \
| * \ \ \ \ Merge commit '17455a3' into master_mergePrerepa Viswanadham2015-05-011-3/+9
| |\ \ \ \ \
| | * \ \ \ \ Merge "Added parameter to avoid having a stream opened, and with that, file t...Vinit Deshpande2015-04-281-3/+9
| | |\ \ \ \ \
| | | * | | | | Added parameter to avoid having a stream opened,Jan Nordqvist2015-04-231-3/+9
| | * | | | | | am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest...Matthew Williams2015-04-231-0/+6
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest...Matthew Williams2015-04-231-0/+6
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window ...Wale Ogunwale2015-04-231-2/+6
| | | |\ \ \ \ \ \
| | * | | | | | | | Final removal of CONNECTIVITY_ACTION_IMMEDIATE.Erik Kline2015-04-221-5/+0
| | * | | | | | | | CONNECTIVITY_ACTION is the new _IMMEDIATEErik Kline2015-04-212-4/+4
| * | | | | | | | | am c869bbfd: am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings fro...Wei Wang2015-05-011-0/+11
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI...Wei Wang2015-05-011-0/+11
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 04f2fe39 to masterMady Mellor2015-04-301-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am d73f05f5: am 2619ef39: Merge "Add onStylusButtonPress listener to View" in...Mady Mellor2015-04-301-0/+8
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ am cae8686c: am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - fr...Svetoslav2015-04-301-12/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - framework" into...Svetoslav2015-04-301-12/+37
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ am c8efc449: am 3d42d238: am f764d219: Merge "AudioService receives callback ...Jean-Michel Trivi2015-04-301-7/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic p...Jean-Michel Trivi2015-04-301-7/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ am 0f4c6a8b: am 1642e354: am 8f72b403: Merge "Zen: New event condition data m...John Spurlock2015-04-305-10/+151
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into m...John Spurlock2015-04-305-10/+151
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ am 2aab6de5: am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices wi...Zoltan Szatmary-Ban2015-04-301-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices without DPMS" i...Zoltan Szatmary-Ban2015-04-301-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \