commit 8dfa6b76191f49f4873b50d4a69999a46b055f08
author Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:35:30 2015 -0800
committer Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:35:30 2015 -0800
tree fb11002af3698cf94c095991c2473a10197dc28c
parent e33841a08da4ec72b5609e20040c95256a816711
parent bb08b8b0c7d768bb288a6b01e5ea6b082b28edb5

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE

Change-Id: I1d218bf9e6bc804d062145d971b0ab7821ae7e07

src/com/android/managedprovisioning/EncryptDeviceActivity.java

diff --git a/src/com/android/managedprovisioning/EncryptDeviceActivity.java b/src/com/android/managedprovisioning/EncryptDeviceActivity.java
index c036ea3..5439315 100644
--- a/src/com/android/managedprovisioning/EncryptDeviceActivity.java
+++ b/src/com/android/managedprovisioning/EncryptDeviceActivity.java
@@ -67,7 +67,8 @@
                 ServiceManager.getService("mount"));
 
         try {
-            return (mountService.getEncryptionState() == IMountService.ENCRYPTION_STATE_OK);
+            int state = mountService.getEncryptionState();
+            return (state == IMountService.ENCRYPTION_STATE_OK || state == IMountService.ENCRYPTION_STATE_OK_MDTP_ACTIVATED);
         } catch (RemoteException e) {
             return false;
         }
@@ -82,4 +83,4 @@
         intent.setAction(DevicePolicyManager.ACTION_START_ENCRYPTION);
         startActivity(intent);
     }
-}
\ No newline at end of file
+}