09ad6bfe9619ff7a61209131f1f3182d53d840d0 - platform/frameworks/base

commit	09ad6bfe9619ff7a61209131f1f3182d53d840d0	[log] [tgz]
author	Craig Lafayette <craiglafa@google.com>	Tue Jun 02 16:41:49 2015 -0400
committer	Craig Lafayette <craiglafa@google.com>	Thu Jun 11 14:00:56 2015 -0400
tree	a5e24b008436ae407a0ae4f07dad1b8932867a82
parent	77b2d49abb38fafb91fb99ce603a92f189553cd7 [diff]

Remove FRP wipe support for device initializers

- Remove ManagedProvisioning NFC parameter key from
  DevicePolicyManager
- Remove wipeIfAllowed from PersistentDataBlockManager

Bug: 21558883
Change-Id: I59354b7bb1ef7e0b0346ff9a7d1654780231dff0

api/current.txt[diff]
api/system-current.txt[diff]
core/java/android/app/admin/DevicePolicyManager.java[diff]
core/java/android/service/persistentdata/IPersistentDataBlockService.aidl[diff]
core/java/android/service/persistentdata/PersistentDataBlockManager.java[diff]
core/res/AndroidManifest.xml[diff]
services/core/java/com/android/server/PersistentDataBlockService.java[diff]

7 files changed

tree: a5e24b008436ae407a0ae4f07dad1b8932867a82