frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN	Benjamin Franz	2015-03-13	1	-0/+3
*	Merge "Document behavior change of isUninstallBlocked() since L MR1"	Rubin Xu	2015-03-10	1	-1/+6
\|\
\| *	Document behavior change of isUninstallBlocked() since L MR1	Rubin Xu	2015-03-10	1	-1/+6
* \|	Merge "Revert "Remove TrustAgent whitelisting API""	Adrian Roos	2015-03-09	1	-2/+0
\|\ \
\| * \|	Revert "Remove TrustAgent whitelisting API"	Adrian Roos	2015-03-05	1	-2/+0
* \| \|	Add a new extra to specify the admin component for provisioning.	Nicolas Prevot	2015-03-09	1	-2/+39
* \| \|	Merge "Allow device and profile owners to set a user icon."	Julia Reynolds	2015-03-05	2	-0/+18
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Allow device and profile owners to set a user icon.	Julia Reynolds	2015-03-04	2	-0/+18
* \| \|	Add security check for clearDeviceInitializer in the service.	Julia Reynolds	2015-03-05	2	-4/+6
* \| \|	Clean up the lock task APIs for COSU devices.	Benjamin Franz	2015-03-05	1	-7/+5
* \| \|	DOs can clear the DI; rehide hasUserSetupCompleted.	Julia Reynolds	2015-03-04	1	-4/+4
\|/ /
* \|	Allow the device initializer to perform user setup tasks.	Julia Reynolds	2015-03-04	3	-18/+217
* \|	resolved conflicts for merge of 5864f5ed to master	Joe Fernandez	2015-03-03	2	-5/+7
\|\ \
\| * \	am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed pro...	Joe Fernandez	2015-03-03	2	-6/+8
\| \|\ \
\| \| * \|	Minor typo fixes in managed profile Javadoc reference pages.	Andrew Solovay	2015-03-02	2	-6/+8
* \| \| \|	Remove unused imports in frameworks/base.	John Spurlock	2015-02-28	1	-1/+0
\| \|_\|/ \|/\| \|
* \| \|	Merge "Fail silently when changing BLUETOOTH_ON/WIFI_ON directly"	Nicolas Prevot	2015-02-26	1	-2/+7
\|\ \ \
\| * \| \|	Fail silently when changing BLUETOOTH_ON/WIFI_ON directly	Nicolas Prevot	2015-02-26	1	-2/+7
* \| \| \|	Fix javadoc for setLockTaskPackages	Benjamin Franz	2015-02-26	1	-2/+3
* \| \| \|	Merge "Allow alternative policy description for secondary users"	Fyodor Kupolov	2015-02-25	1	-11/+26
\|\ \ \ \
\| * \| \| \|	Allow alternative policy description for secondary users	Fyodor Kupolov	2015-02-24	1	-11/+26
\| \|/ / /
* \| \| \|	am b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent ...	Jim Miller	2015-02-25	1	-0/+2
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	Remove TrustAgent whitelisting API	Jim Miller	2015-02-24	1	-0/+2
* \| \|	Fix docs.	Ying Wang	2015-02-20	1	-1/+1
* \| \|	New intent action for returning account migration result	Alexandra Gherghina	2015-02-20	1	-3/+19
* \| \|	DevicePolicy: Make uid parameter an int	Robin Lee	2015-02-17	2	-3/+3
* \| \|	Merge "Device Policy API to choose a private key silently"	Robin Lee	2015-02-16	2	-1/+53
\|\ \ \
\| * \| \|	Device Policy API to choose a private key silently	Robin Lee	2015-02-05	2	-1/+53
* \| \| \|	am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode in...	Benjamin Franz	2015-02-12	1	-7/+6
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Fix the javadocs for lock task mode intents.	Benjamin Franz	2015-02-12	1	-7/+6
* \| \| \|	DevicePolicy: clarify wipeData docstring	Robin Lee	2015-02-10	1	-2/+2
* \| \| \|	am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPerm...	Kenny Guy	2015-02-06	1	-3/+3
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \|
\| * \|	Fix mangled javadoc for setPermittedInputMethods.	Kenny Guy	2015-02-05	1	-3/+3
* \| \|	Add skip encryption constants for device owner provisioning.	Julia Reynolds	2015-02-02	1	-1/+12
* \| \|	Removed userHandle from setXXX methods	Fyodor Kupolov	2015-01-29	2	-41/+40
* \| \|	am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into...	Jim Miller	2015-01-22	1	-4/+10
\|\ \ \ \| \|/ /
\| * \|	Clarify getTrustAgentConfiguration() documentation.	Jim Miller	2015-01-21	1	-4/+10
* \| \|	resolve merge conflicts of 87f5369 to master.	Jorim Jaggi	2015-01-15	1	-10/+10
\|\ \ \ \| \|/ /
\| * \|	Make documentation for cross-profile intent filters clearer.	Nicolas Prevot	2015-01-14	1	-10/+10
* \| \|	Remove deprecated version of setProfileOwner that takes packageName	Esteban Talavera	2014-12-24	1	-21/+0
* \| \|	am 237637e2: am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter."...	Nicolas Prevot	2014-12-17	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev	Nicolas Prevot	2014-12-17	1	-0/+2
\| \|\ \
\| \| * \|	Fix the doc of addCrossProfileIntentFilter.	Nicolas Prevot	2014-12-17	1	-0/+2
* \| \| \|	am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" i...	Fyodor Kupolov	2014-12-09	2	-0/+18
\|\ \ \ \ \| \|/ / /
\| * \| \|	Added isRemovingAdmin method	Fyodor Kupolov	2014-12-04	2	-0/+18
\| \|/ /
* \| \|	am 05f23d97: am f57d9dcb: am fbeeac82: Merge "Add a tag to separate paragraph...	Paul Crowley	2014-12-02	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	Add a tag to separate paragraphs in Javadoc	Paul Crowley	2014-12-02	1	-2/+2
* \| \|	am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory res...	Paul Crowley	2014-11-26	1	-6/+14
\|\ \ \ \| \|/ /
\| * \|	Add flag for wiping factory reset protection data.	Paul Crowley	2014-11-25	1	-6/+14
* \| \|	am 9a4d0257: am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into...	Adrian Roos	2014-11-25	1	-1/+4
\|\ \ \ \| \|/ /