summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* 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-055-10/+41
|\ \ \ \
| * \ \ \ 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
| | | |\ \ \ \ \
| | * | | | | | | Always send the DHCP client identifier.Lorenzo Colitti2015-04-225-14/+19
| | * | | | | | | Log DHCP replies that we can't parse.Lorenzo Colitti2015-04-221-0/+4
| | * | | | | | | Merge "Final removal of CONNECTIVITY_ACTION_IMMEDIATE." into m-wireless-devErik Kline2015-04-221-5/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Final removal of CONNECTIVITY_ACTION_IMMEDIATE.Erik Kline2015-04-221-5/+0
| * | | | | | | | | am 4ee45178: am dbb03371: am 6e761c5d: Merge "Device policy: use owner label ...Robin Lee2015-05-011-8/+32
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am dbb03371: am 6e761c5d: Merge "Device policy: use owner label instead of na...Robin Lee2015-05-011-8/+32
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are acc...John Reck2015-05-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a fe...John Reck2015-04-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f225e6c6: am 550ab61c: am dc4ad271: Merge "Add package name extra to Packa...Benjamin Franz2015-04-302-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am 550ab61c: am dc4ad271: Merge "Add package name extra to PackageInstaller c...Benjamin Franz2015-04-302-1/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a54020c7: am 508c9fec: am 21df222f: Merge "New "frozen" state during app m...Jeff Sharkey2015-04-304-51/+95
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am 508c9fec: am 21df222f: Merge "New "frozen" state during app move/upgrade."...Jeff Sharkey2015-04-304-51/+95
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am df7f02b6: am ad61b833: Merge "Fix no vibration during shutdown."John Spurlock2015-04-302-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | am ad61b833: Merge "Fix no vibration during shutdown."John Spurlock2015-04-302-5/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix no vibration during shutdown."John Spurlock2015-04-302-5/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | Fix no vibration during shutdown.riddle_hsu2015-03-182-5/+6
| * | | | | | | | | | | | | | | | | | | | | | am 21a30889: am 1df4dca2: am 9e98dce6: Merge "Returning to wizard, split move...Jeff Sharkey2015-04-302-34/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | am 1df4dca2: am 9e98dce6: Merge "Returning to wizard, split move events." int...Jeff Sharkey2015-04-302-34/+112
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cd0f18a8: am 4d146ed2: am f7b795ca: Merge "Update use of procstate for ser...Dianne Hackborn2015-04-3019-27/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | am 4d146ed2: am f7b795ca: Merge "Update use of procstate for services." into ...Dianne Hackborn2015-04-3019-27/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7b21b4cb: am 850c1888: am 490d23bf: Merge "[Update API]: Rename accountAut...Simranjit Singh Kohli2015-04-291-17/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | am 850c1888: am 490d23bf: Merge "[Update API]: Rename accountAuthenticated to...Simranjit Singh Kohli2015-04-291-17/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 49c48223: am 8fcd6951: am db2af234: Merge "Update use of A-GPS modes in Gp...destradaa2015-04-291-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / /