OSDN Git Service

Remove FRP wipe support for device initializers
authorCraig Lafayette <craiglafa@google.com>
Tue, 2 Jun 2015 20:41:49 +0000 (16:41 -0400)
committerCraig Lafayette <craiglafa@google.com>
Thu, 11 Jun 2015 18:00:56 +0000 (14:00 -0400)
commit09ad6bfe9619ff7a61209131f1f3182d53d840d0
treea5e24b008436ae407a0ae4f07dad1b8932867a82
parent77b2d49abb38fafb91fb99ce603a92f189553cd7
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
api/system-current.txt
core/java/android/app/admin/DevicePolicyManager.java
core/java/android/service/persistentdata/IPersistentDataBlockService.aidl
core/java/android/service/persistentdata/PersistentDataBlockManager.java
core/res/AndroidManifest.xml
services/core/java/com/android/server/PersistentDataBlockService.java