summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* Merge "Permission UI - legacy apps support" into mnc-devSvet Ganov2015-05-052-2/+23
|\
| * Permission UI - legacy apps supportSvet Ganov2015-05-052-2/+23
* | Merge changes from topic 'mwd-merge-050415' into mnc-devPrerepa Viswanadham2015-05-052-0/+4
|\ \
| * \ am 4ee45178: am dbb03371: am 6e761c5d: Merge "Device policy: use owner label ...Robin Lee2015-05-011-3/+3
| |\ \
| * \ \ am c2b1f93c: am 2d7d9523: am a78240ba: AlarmManager: Reject non-olson timezon...Narayan Kamath2015-05-011-6/+37
| |\ \ \
| * \ \ \ am 9c14b3ab: am c7e9a17a: am 10a54a79: Merge "Remove dependency upon Fragment...Todd Kennedy2015-05-019-256/+987
| |\ \ \ \
| * \ \ \ \ resolved conflicts for merge of 04f2fe39 to masterMady Mellor2015-04-301-0/+11
| |\ \ \ \ \
| * \ \ \ \ \ am cae8686c: am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - fr...Svetoslav2015-04-301-6/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am bc4affc9: am 9e4003cd: am 729d0a06: Merge "Add process outgoing calls app ...Svetoslav2015-04-301-6/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am ccd36808: am 71264fb2: am c27b3fca: Merge "Add SIP app op - framework." in...Svetoslav2015-04-301-6/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 588fffc2: am 84c64efe: am 403ac2d6: Merge "AndroidKeyStore keys should not...Alex Klyubin2015-04-301-2/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 03f8542e: am 5242ef65: am 82863f13: Merge "Add permission to ap op mapping...Svet Ganov2015-04-301-3/+71
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 21a30889: am 1df4dca2: am 9e98dce6: Merge "Returning to wizard, split move...Jeff Sharkey2015-04-301-15/+24
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 666dbb43: am b00540dc: am e632dc35: Merge "Clarify javadoc of isKeyguardSe...Adrian Roos2015-04-291-11/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 2c372ef0: am 104a23c5: am e3538083: Merge "Add API to get app op for a per...Svet Ganov2015-04-291-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am da8f7a17: am af275e15: am c4aa3c78: Merge "Add status bar flag to disable ...Benjamin Franz2015-04-291-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a149ba02: am aa4e35eb: am b36586a7: Split some VolumeInfo state into Volum...Jeff Sharkey2015-04-291-14/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5b9a5fef: am b3c7ad32: am 7c97a3dd: Merge "Permissions control via profile...Amith Yamasani2015-04-292-0/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e7691daf: am 89f19371: am 6ab47fc1: Merge "Allow device initializers to se...Julia Reynolds2015-04-284-0/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 518c315a: am 94e3b0c5: am 0c2d0deb: Merge "Introduce disable2 into StatusB...Benjamin Franz2015-04-281-1/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Annotate some APIs with threading annotations"Tor Norbye2015-04-272-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Annotate some APIs with threading annotationsTor Norbye2015-04-232-0/+4
* | | | | | | | | | | | | | | | | | | | | Merge "When returning, transition only existing shared elements." into mnc-devGeorge Mount2015-05-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | When returning, transition only existing shared elements.George Mount2015-05-041-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Always force constructors accessible during inflationAlan Viverette2015-05-041-0/+1
* | | | | | | | | | | | | | | | | | | | | Merge "Move ContentInfoExtender from Notification.java to a support library" ...Jose Lima2015-05-041-471/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Move ContentInfoExtender from Notification.java to a support libraryJose Lima2015-05-011-471/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Add full backup criteria to android manifestMatthew Williams2015-05-032-65/+612
* | | | | | | | | | | | | | | | | | | | | Add read cell broadcast app op - frameworkSvet Ganov2015-05-021-7/+20
* | | | | | | | | | | | | | | | | | | | | Add camera app op - frameworkSvetoslav2015-05-021-0/+6
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Add body sensors app op - framework baseSvet Ganov2015-05-011-53/+67
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Device policy: use owner label instead of name" into mnc-devRobin Lee2015-05-011-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Device policy: use owner label instead of nameRobin Lee2015-04-301-3/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | AlarmManager: Reject non-olson timezones for targetSdk >= MNarayan Kamath2015-05-011-6/+37
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Remove dependency upon FragmentActivityTodd Kennedy2015-04-309-256/+987
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Add onStylusButtonPress listener to View" into mnc-devMady Mellor2015-04-301-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add onStylusButtonPress listener to ViewMady Mellor2015-04-301-0/+11
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Add use fingerprint app op - framework" into mnc-devSvetoslav2015-04-301-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add use fingerprint app op - frameworkSvetoslav2015-04-291-6/+16
* | | | | | | | | | | | | | | Merge "Add process outgoing calls app op - framework" into mnc-devSvetoslav2015-04-301-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Add process outgoing calls app op - frameworkSvetoslav2015-04-291-6/+16
* | | | | | | | | | | | | | Merge "Add SIP app op - framework." into mnc-devSvetoslav2015-04-301-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | / / / / / / / / / / / | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add SIP app op - framework.Svetoslav2015-04-291-6/+16
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc...Alex Klyubin2015-04-301-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | AndroidKeyStore keys should not be handled by Bouncy Castle.Alex Klyubin2015-04-291-2/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Add permission to ap op mappings for all runtime permissions." into mn...Svet Ganov2015-04-301-3/+71
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Add permission to ap op mappings for all runtime permissions.Svet Ganov2015-04-291-3/+71
* | | | | | | | | | | Returning to wizard, split move events.Jeff Sharkey2015-04-291-15/+24
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-devAdrian Roos2015-04-291-11/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Clarify javadoc of isKeyguardSecure and isDeviceSecureAdrian Roos2015-04-291-11/+9
| | |_|_|_|_|/ / / | |/| | | | | | |