summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge "Add API to get app op for a permission" into mnc-devSvet Ganov2015-04-291-0/+25
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Add API to get app op for a permissionSvet Ganov2015-04-291-0/+25
| |/
* | Merge "Add status bar flag to disable quick settings" into mnc-devBenjamin Franz2015-04-291-2/+10
|\ \
| * | Add status bar flag to disable quick settingsBenjamin Franz2015-04-281-2/+10
| |/
* | Split some VolumeInfo state into VolumeRecord.Jeff Sharkey2015-04-281-14/+13
* | Permissions control via profile/device owner adminAmith Yamasani2015-04-282-0/+77
|/
* Merge "Allow device initializers to set a preferred setup activity." into mnc...Julia Reynolds2015-04-274-0/+45
|\
| * Allow device initializers to set a preferred setup activity.Julia Reynolds2015-04-274-0/+45
* | Introduce disable2 into StatusBarManagerBenjamin Franz2015-04-271-1/+32
|/
* Migrate primary external storage.Jeff Sharkey2015-04-241-0/+2
* Merge "More usage tracking"Amith Yamasani2015-04-241-0/+2
|\
| * More usage trackingAmith Yamasani2015-04-241-0/+2
* | am cc9c597d: am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Impro...Wale Ogunwale2015-04-241-69/+33
|\ \
| * \ am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the...Wale Ogunwale2015-04-241-69/+33
| |\ \
| | * | Revert "[ActivityManager] Improve multi-thread access the same provider"Wale Ogunwale2015-04-241-69/+33
* | | | am 4cdc7e84: am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we ha...Wale Ogunwale2015-04-241-42/+24
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acqui...Wale Ogunwale2015-04-241-42/+24
| |\ \ | | |/
| | * Revert "Clean-up state if we have an exception when acquiring provider"Wale Ogunwale2015-04-241-42/+24
* | | Merge "Add ability to get and set idle state of apps"Amith Yamasani2015-04-242-0/+19
|\ \ \
| * | | Add ability to get and set idle state of appsAmith Yamasani2015-04-242-0/+19
* | | | Merge "Add permission requirement annotation for KeyGuard"Tor Norbye2015-04-241-0/+5
|\ \ \ \
| * | | | Add permission requirement annotation for KeyGuardTor Norbye2015-04-231-0/+5
* | | | | Restrict setting the profile/device owner with a signature-level permission.Nicolas Prevot2015-04-241-14/+18
* | | | | Package and storage movement callbacks.Jeff Sharkey2015-04-231-27/+174
* | | | | Add pre-order as a pricing type for ContentInfoExtenderJose Lima2015-04-231-0/+7
| |/ / / |/| | |
* | | | Merge "Quick build fix: Revert "Add pre-order as a pricing type for ContentIn...Ed Heyl2015-04-231-7/+0
|\ \ \ \
| * | | | Quick build fix: Revert "Add pre-order as a pricing type for ContentInfoExten...Ed Heyl2015-04-231-7/+0
* | | | | Merge "Add pre-order as a pricing type for ContentInfoExtender"Jose Lima2015-04-231-0/+7
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Add pre-order as a pricing type for ContentInfoExtenderJose Lima2015-04-221-0/+7
* | | | Disallow data clearing of DeviceOwner.Craig Mautner2015-04-232-0/+22
* | | | Merge "Add "assist block" API."Dianne Hackborn2015-04-231-0/+11
|\ \ \ \
| * | | | Add "assist block" API.Dianne Hackborn2015-04-221-0/+11
| |/ / /
* | | | Merge "Enable system service to notify device owners about pending update"Rubin Xu2015-04-233-0/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Enable system service to notify device owners about pending updateRubin Xu2015-04-223-0/+55
* | | | Merge "nullcheck Activity.getIntent() for AssistContent"Adam Skory2015-04-221-5/+10
|\ \ \ \
| * | | | nullcheck Activity.getIntent() for AssistContentAdam Skory2015-04-221-5/+10
| |/ / /
* | | | Merge "Work on issue #20401752: device idle and alarms."Dianne Hackborn2015-04-222-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Work on issue #20401752: device idle and alarms.Dianne Hackborn2015-04-212-0/+10
* | | | Merge "Add API for putting up locktask pinning toast."Craig Mautner2015-04-223-0/+36
|\ \ \ \
| * | | | Add API for putting up locktask pinning toast.Craig Mautner2015-04-213-0/+36
* | | | | Compress the preferred-app backup payloadsChristopher Tate2015-04-211-1/+1
* | | | | Merge "Make activity manager sleep top activity when dreaming."Jeff Brown2015-04-211-0/+21
|\ \ \ \ \
| * | | | | Make activity manager sleep top activity when dreaming.Jeff Brown2015-04-171-0/+21