commit a55b168b5d5a0584b2411793f870a7849c5014f1
author Rubin Xu <rubinxu@google.com> Tue Jan 31 10:06:56 2017 +0000
committer Rubin Xu <rubinxu@google.com> Thu Feb 02 18:44:46 2017 +0000
tree 95695187d713a3b9735592d27bf4e66f27fee7ad
parent 59ced28f0f722d2517afc65d755ebb388902f76b

Small tweaks in LockSettingsService

Paves way for synthetic password flow: Two notable changes:
1. when unify/un-unify work challenges, provide the old work profile password.
2. when clearing lock, supply old credentials.

Test: Unit test to be added in a follow up CL.
Bug: 33126414
Change-Id: I2a9553c5e7cc701338436e99e5a1289cebd1eda9

services/core/java/com/android/server/LockSettingsShellCommand.java

diff --git a/services/core/java/com/android/server/LockSettingsShellCommand.java b/services/core/java/com/android/server/LockSettingsShellCommand.java
index e131251..1ab5303 100644
--- a/services/core/java/com/android/server/LockSettingsShellCommand.java
+++ b/services/core/java/com/android/server/LockSettingsShellCommand.java
@@ -116,7 +116,7 @@
     }
 
     private void runClear() throws RemoteException {
-        mLockPatternUtils.clearLock(mCurrentUserId);
+        mLockPatternUtils.clearLock(mOld, mCurrentUserId);
         getOutPrintWriter().println("Lock credential cleared");
     }