summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/admin
Commit message (Expand)AuthorAgeFilesLines
* Enterprise quick contact 1/2Makoto Onuki2015-03-302-0/+17
* Revert "Enterprise quick contact 1/2"Makoto Onuki2015-03-302-17/+0
* Enterprise quick contact 1/2Makoto Onuki2015-03-272-0/+17
* Fix build breakage by ag/661236Rubin Xu2015-03-261-1/+1
* Merge "Change doc for device initializer agent extra's type."Rubin Xu2015-03-261-8/+11
|\
| * Change doc for device initializer agent extra's type.Rubin Xu2015-03-261-8/+11
* | Merge "Fix documentation for ACTION_SET_PROFILE_OWNER"Amith Yamasani2015-03-251-6/+5
|\ \ | |/ |/|
| * Fix documentation for ACTION_SET_PROFILE_OWNERAmith Yamasani2015-03-251-6/+5
* | Merge "Framework: Introduced new NFC provisioning mime-type application/com.a...Andrei Kapishnikov2015-03-251-37/+70
|\ \
| * | Framework: Introduced new NFC provisioning mime-type application/com.android....Andrei Kapishnikov2015-03-251-37/+70
* | | Add isActiveAdminWithPolicy to DevicePolicyManagerInternalZoltan Szatmary-Ban2015-03-251-0/+9
|/ /
* | Merge "Fix doc for package checksum in DevicePolicyManager."Rubin Xu2015-03-251-5/+6
|\ \ | |/ |/|
| * Fix doc for package checksum in DevicePolicyManager.Rubin Xu2015-03-241-5/+6
* | Merge "Add Bluetooth connection extras to DPM."Craig Lafayette2015-03-241-0/+44
|\ \
| * | Add Bluetooth connection extras to DPM.Craig Lafayette2015-03-241-0/+44
* | | Merge "DPM constants for specifying minimum version numbers for DO and DIA."Julia Reynolds2015-03-231-0/+24
|\ \ \ | |_|/ |/| |
| * | DPM constants for specifying minimum version numbers for DO and DIA.Julia Reynolds2015-03-201-0/+24
| |/
* | Add DelegatedCertInstaller API in DPMSRubin Xu2015-03-202-5/+57
|/
* Merge "Recognise insecure encryption with a new constant"Robin Lee2015-03-161-3/+13
|\
| * Recognise insecure encryption with a new constantRobin Lee2015-02-231-3/+13
* | Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_INBenjamin Franz2015-03-131-0/+3
* | Merge "Document behavior change of isUninstallBlocked() since L MR1"Rubin Xu2015-03-101-1/+6
|\ \
| * | Document behavior change of isUninstallBlocked() since L MR1Rubin Xu2015-03-101-1/+6
* | | Merge "Revert "Remove TrustAgent whitelisting API""Adrian Roos2015-03-091-2/+0
|\ \ \
| * | | Revert "Remove TrustAgent whitelisting API"Adrian Roos2015-03-051-2/+0
* | | | Add a new extra to specify the admin component for provisioning.Nicolas Prevot2015-03-091-2/+39
* | | | Merge "Allow device and profile owners to set a user icon."Julia Reynolds2015-03-052-0/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Allow device and profile owners to set a user icon.Julia Reynolds2015-03-042-0/+18
* | | | Add security check for clearDeviceInitializer in the service.Julia Reynolds2015-03-052-4/+6
* | | | Clean up the lock task APIs for COSU devices.Benjamin Franz2015-03-051-7/+5
* | | | DOs can clear the DI; rehide hasUserSetupCompleted.Julia Reynolds2015-03-041-4/+4
|/ / /
* | | Allow the device initializer to perform user setup tasks.Julia Reynolds2015-03-043-18/+217
* | | resolved conflicts for merge of 5864f5ed to masterJoe Fernandez2015-03-032-5/+7
|\ \ \
| * \ \ am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed pro...Joe Fernandez2015-03-032-6/+8
| |\ \ \
| | * | | Minor typo fixes in managed profile Javadoc reference pages.Andrew Solovay2015-03-022-6/+8
* | | | | Remove unused imports in frameworks/base.John Spurlock2015-02-281-1/+0
| |_|/ / |/| | |
* | | | Merge "Fail silently when changing BLUETOOTH_ON/WIFI_ON directly"Nicolas Prevot2015-02-261-2/+7
|\ \ \ \
| * | | | Fail silently when changing BLUETOOTH_ON/WIFI_ON directlyNicolas Prevot2015-02-261-2/+7
| | |_|/ | |/| |
* | | | Fix javadoc for setLockTaskPackagesBenjamin Franz2015-02-261-2/+3
* | | | Merge "Allow alternative policy description for secondary users"Fyodor Kupolov2015-02-251-11/+26
|\ \ \ \
| * | | | Allow alternative policy description for secondary usersFyodor Kupolov2015-02-241-11/+26
| |/ / /
* | | | am b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent ...Jim Miller2015-02-251-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Remove TrustAgent whitelisting APIJim Miller2015-02-241-0/+2
* | | Fix docs.Ying Wang2015-02-201-1/+1
* | | New intent action for returning account migration resultAlexandra Gherghina2015-02-201-3/+19
* | | DevicePolicy: Make uid parameter an intRobin Lee2015-02-172-3/+3
* | | Merge "Device Policy API to choose a private key silently"Robin Lee2015-02-162-1/+53
|\ \ \
| * | | Device Policy API to choose a private key silentlyRobin Lee2015-02-052-1/+53
* | | | am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode in...Benjamin Franz2015-02-121-7/+6
|\ \ \ \ | | |/ / | |/| |
| * | | Fix the javadocs for lock task mode intents.Benjamin Franz2015-02-121-7/+6