summaryrefslogtreecommitdiffstats
path: root/services/devicepolicy/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Device Policy API to choose a private key silently"Robin Lee2015-02-161-0/+54
|\
| * Device Policy API to choose a private key silentlyRobin Lee2015-02-051-0/+54
| | | | | | | | | | | | | | | | | | Support for certificate chooser (keychain) to first query a profile owner (if one exists) for a silent credentials grant which will be passed back to the caller as an alias. Bug: 15065444 Change-Id: I0729b435c218b7991e6cb5faedefb7900577afcc
* | Merge "Avoid NullPointerException in enableSystemApp if the app is absent."Nicolas Prevot2015-02-111-0/+4
|\ \
| * | Avoid NullPointerException in enableSystemApp if the app is absent.Nicolas Prevot2015-02-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | In enableSystemApp: if the app is absent, throw a IllegalArgumentException instead of failing with a NullPointerException. BUG:19321306 Change-Id: I4ec09a0a77d29ca04e8d52f5546c1e4d0f8641e5
* | | Dont throw an exception for non-system apps when enabling system apps.Nicolas Prevot2015-02-111-8/+7
|/ / | | | | | | | | | | | | In EnableSystemAppWithIntent: if a non-system app matches the intent: ignore it instead of throwing an exception. Change-Id: I64dc9a0bbc1a6bc5e2159a33b7273464ed2518c5
* | am a2ced3e8: am 8d12d3da: Merge "Only switch user if current user is being ↵Kenny Guy2015-02-051-1/+4
|\ \ | |/ |/| | | | | | | | | wiped" into lmp-mr1-dev automerge: eeb43fb * commit 'a2ced3e879458786edf715a0016293791db7fd65': Only switch user if current user is being wiped
| * Only switch user if current user is being wipedKenny Guy2015-02-041-1/+4
| | | | | | | | | | | | | | | | Only try and switch to owner if the current user is being removed. Bug: 19252449 Change-Id: I0143d87360db0834876821cbf52fec4933ecbd35
* | Merge "Removed userHandle from setXXX methods"Fyodor Kupolov2015-01-301-45/+41
|\ \
| * | Removed userHandle from setXXX methodsFyodor Kupolov2015-01-291-45/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User handle is now extracted from UID of the calling process. Previously setXXX methods may not work properly, if userHandle parameter was different from a user of the calling process. In practice, this wouldn't have happened because setters were always called with a userHandle of the caller process. Bug:17202572 Change-Id: I1c08c54c975a04b8c54719a1e280ad3cfaff2e67
* | | Move mute/unmute handling to adjust volume pathsRoboErik2015-01-291-4/+8
|/ / | | | | | | | | | | | | | | | | This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no longer supported and muting is redirected through the adjust volume APIs. Also updates the hidden master versions of these APIs. Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
* | am ad664808: am 6d16b861: Merge "Avoid NullPointerException if createUser ↵Benjamin Franz2015-01-261-0/+3
|\ \ | |/ | | | | | | | | | | returns null" into lmp-mr1-dev automerge: 2805669 * commit 'ad66480838189332b82cd2861bca4357aa2b93da': Avoid NullPointerException if createUser returns null
| * Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-devBenjamin Franz2015-01-261-0/+3
| |\
| | * Avoid NullPointerException if createUser returns nullBenjamin Franz2015-01-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | If createUser returns null, we run into a NullPointerException in createAndInitializeUser. This can happen when the policy DISALLOW_ADD_USER is set. Bug: 19121141 Change-Id: Id4bda832a243fa42c31eb5a176ecaa248aee68f5
* | | am 20bd0c23: am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent ↵Zoltan Szatmary-Ban2015-01-261-0/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | when locking/unlocking location share" into lmp-mr1-dev * commit '20bd0c232cd4421affc871ccd01492ecd04316d0': Ensure notifications are sent when locking/unlocking location share
| * | Merge "Ensure notifications are sent when locking/unlocking location share" ↵Zoltan Szatmary-Ban2015-01-261-0/+13
| |\ \ | | |/ | |/| | | | into lmp-mr1-dev
| | * Ensure notifications are sent when locking/unlocking location shareZoltan Szatmary-Ban2015-01-231-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the restriction 'DISALLOW_SHARE_LOCATION' is applied or removed on a user it is important to send out notifications to content observers of LOCATION_PROVIDERS_ALLOWED. Bug: 18995405 Change-Id: I8b3910a423a012ea9d15470eec101723c9f0eaf7
* | | am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling ↵Benjamin Franz2015-01-231-21/+42
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | getUserData" into lmp-mr1-dev automerge: 07b87e5 * commit '07b87e537da3ec658235fe1d874c7dba5b4d696d': Avoid SecurityException when calling getUserData
| * | Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-devBenjamin Franz2015-01-231-21/+42
| |\ \ | | |/ | |/|
| | * Avoid SecurityException when calling getUserDataBenjamin Franz2015-01-221-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we risk getting a SecurityException in a number of places, where getUserData is called for a different user than the calling user. To avoid this, the caller is cleared in a helper function. Bug: 18662452 Change-Id: Ibc131c602e52d9f013fe739a9c18e693181ded67
* | | am 4be433dc: am 10dd6eef: am fd846dfb: Merge "Sync file before using ↵Kenny Guy2015-01-161-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | JournaledFile commit." into lmp-mr1-dev * commit '4be433dc0b817fd4129e2bd99edb4c484f980600': Sync file before using JournaledFile commit.
| * | Sync file before using JournaledFile commit.Kenny Guy2015-01-151-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Ext4 doesn't guarantee that write file.new / close file.new rename file.new to file will mean data in file.new makes it to file atomically. The rename may happen with previous contents of file.new and then later update to new contents See docs for noauto_da_alloc So rebooting the device during JournaledFile.commit may mean we are left with an empty file. Bug: 18590558 Change-Id: I35322c82871bed30c2c6ebbd1388338f0471f3ba
| * Profile owner hint in warning for extra CAsRobin Lee2015-01-091-1/+4
| | | | | | | | | | | | | | | | The version of the warning with a named installer should be shown in the case of a managed profile, not only a managed device. Bug: 18224038 Change-Id: I27865f77e963b9b15416f2e4a4ffc38fed8f5532
| * Revert "Profile owner hint in warning for extra CAs"Robin Lee2015-01-081-4/+1
| | | | | | | | | | | | | | | | | | This reverts commit e1d8dcd9e170c1ed8a13b6e1256ea1fb22c26c49. Something funny happened in the process of submitting this, swathes of strings.xml became mis-encoded. Bug: 18224038 Change-Id: I0276ff3f880fe749546e8cc7e3e2f41c22c27705
* | Explicitly specify user on LPU's private methodsAdrian Roos2015-01-081-2/+2
| | | | | | | | | | | | | | | | Also fixes a bug in DevicePolicyManagerService where the wrong user was used. Bug: 18931518 Change-Id: I7ae8ecfdb1c835cdee7eafa2b96e1ec8b712977b
* | Purge biometric weak and keyguard widgetsAdrian Roos2015-01-071-2/+2
| | | | | | | | | | Bug: 18931518 Change-Id: I5da41908b1d6895a69f981e139f2d268327fafcd
* | am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra ↵Robin Lee2015-01-071-1/+4
|\ \ | |/ | | | | | | | | | | | | | | CAs" into lmp-mr1-dev automerge: 23bb3f1 * commit '23bb3f11cbe4ca64337b5b75c333ea891760213f': Profile owner hint in warning for extra CAs
| * Profile owner hint in warning for extra CAsRobin Lee2015-01-051-1/+4
| | | | | | | | | | | | | | | | The version of the warning with a named installer should be shown in the case of a managed profile, not only a managed device. Bug: 18224038 Change-Id: I58bddb162799481d5e8feb169b0c0bff17cbeeb7
* | Merge "Remove deprecated version of setProfileOwner that takes packageName"Esteban Talavera2014-12-291-32/+7
|\ \
| * | Remove deprecated version of setProfileOwner that takes packageNameEsteban Talavera2014-12-241-32/+7
| | | | | | | | | | | | | | | | | | | | | The ComponentName equivalent should be used instead. Bug: 17654371 Change-Id: I7001e86ab1709b824944148a3c44af5243dacb83
* | | am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile ↵Robin Lee2014-12-281-6/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | CAs"" into lmp-mr1-dev automerge: c9db16c automerge: b6b7d42 * commit 'b6b7d4251cdab1843ae9b2ae167ac9276ada241e': Revert "DevicePolicy: Don't warn about managed profile CAs"
| * Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into ↵Robin Lee2014-12-231-6/+0
| |\ | | | | | | | | | lmp-mr1-dev
| | * Revert "DevicePolicy: Don't warn about managed profile CAs"Robin Lee2014-12-221-6/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 80559f4aadb3419eecdf6bf61945af584cd2aa8a. Bug: 18224038 Change-Id: I108a4e8cf185401fef4806e1ad8c2cc78992e843
* | | am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" ↵Fyodor Kupolov2014-12-091-2/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'd483a85e69c3bb83b25473b93806e063b72c9315': Added isRemovingAdmin method
| * | Merge "Added isRemovingAdmin method" into lmp-mr1-devFyodor Kupolov2014-12-051-2/+23
| |\ \
| | * | Added isRemovingAdmin methodFyodor Kupolov2014-12-041-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added isRemovingAdmin method, so that clients can query if device admin is currently being removed. Bug: 17609838 Change-Id: I82547a9eeb228fcf8ac2a6e639ca1a75fa41d161
* | | | am 81b27f4c: am b2905092: am 0702752c: Merge "Potential fix for accidental ↵Amith Yamasani2014-12-091-10/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | deactivation of profile owner" into lmp-mr1-dev * commit '81b27f4c9fcdb1e3379152d08a3abc0fb5e62c53': Potential fix for accidental deactivation of profile owner
| * | | Potential fix for accidental deactivation of profile ownerAmith Yamasani2014-12-041-10/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a safeguard to only check for changing packages when re-validating active admins. 1. If package is being removed, only check if it's not being replaced. 2. If package is changing, only check the changing package that matches one of the active admins. 3. If package is being added and is a replacement (update), then check if it affects any matching active admins and verify the validity of the receivers. If by any chance some package broadcast was occuring at a time when an admin was being updated, or the package removed broadcast was coming in much before the update was registered with package manager then this will help in avoiding accidental deactivation. Bug: 18590558 Change-Id: I7f4897e8836f81aa037b8be87d399942ce78b1a2
* | | am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory ↵Paul Crowley2014-11-261-17/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | reset protection data." into lmp-mr1-dev * commit '0d122e265c52ef25dbad652378b3a5e51a86f041': Add flag for wiping factory reset protection data.
| * | Merge "Add flag for wiping factory reset protection data." into lmp-mr1-devPaul Crowley2014-11-251-17/+25
| |\ \ | | |/ | |/|
| | * Add flag for wiping factory reset protection data.Paul Crowley2014-11-251-17/+25
| | | | | | | | | | | | | | | Bug: 18366448 Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
* | | am a7ffed86: am cc19e8b8: am 692e4933: Merge "DevicePolicy: Don\'t warn ↵Robin Lee2014-11-261-4/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | about managed profile CAs" into lmp-mr1-dev * commit 'a7ffed86fce0a0cab8915bd6a727605959f08bb7': DevicePolicy: Don't warn about managed profile CAs
| * | DevicePolicy: Don't warn about managed profile CAsRobin Lee2014-11-251-4/+8
| |/ | | | | | | | | | | | | | | | | Setting up a managed profile should have included a step to warn about this sort of thing already. As the user should trust the profile owner anyway it's hard to argue this warning is needed. Bug: 18224038 Change-Id: Ie86ba26851af726c0dec30eb9c32894ed6bb4a00
* | am 9a4d0257: am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" ↵Adrian Roos2014-11-251-2/+9
|\ \ | |/ | | | | | | | | | | into lmp-mr1-dev * commit '9a4d0257beadf53c706afbcb4abc76c17a44ff00': Fix DPM.resetPassword("")
| * Merge "Fix DPM.resetPassword("")" into lmp-mr1-devAdrian Roos2014-11-241-2/+9
| |\
| | * Fix DPM.resetPassword("")Adrian Roos2014-11-211-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | While we're at it, also fix some multi-user issues in LockPatternUtils. Bug: 17496766 Change-Id: I8e557ea640fa589817c8f8f818c91463585d5ea7
* | | am 1f26bf6b: am 108bdbc9: am efb2df69: Merge "Different messages when wiping ↵Amith Yamasani2014-11-221-0/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | user and not device" into lmp-mr1-dev * commit '1f26bf6bfd683b840f688b41d285fd9c942e6ed5': Different messages when wiping user and not device
| * | Different messages when wiping user and not deviceAmith Yamasani2014-11-211-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are 3 types of users 1. Primary - device will be wiped 2. Managed profile - profile will be removed 3. Secondary user - user will be removed Show different messages for almost wipe and wipe in each of these 3 cases. Bug: 16843155 Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
* | | am 5c374a58: am b3d0580f: am 08229e81: Merge "Shutdown backup manager ↵Zoltan Szatmary-Ban2014-11-211-0/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | service when device owner is set" into lmp-mr1-dev * commit '5c374a582ceff913e420d21d63e1d7b087d6fc56': Shutdown backup manager service when device owner is set
| * | Merge "Shutdown backup manager service when device owner is set" into ↵Zoltan Szatmary-Ban2014-11-211-0/+13
| |\ \ | | | | | | | | | | | | lmp-mr1-dev
| | * | Shutdown backup manager service when device owner is setZoltan Szatmary-Ban2014-11-131-0/+13
| | | | | | | | | | | | | | | | | | | | Bug: 16641441 Change-Id: I3fe54e43324c15dabd56834a923e8e8cb4eea98d
generated by cgit v1.1 at 2024-12-24 04:51:23 +0000