Accessibility no longer overrides strong encryption.

Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f

1 files changed, 0 insertions, 29 deletions

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 8ef5b04..0fe7a4b 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -67,7 +67,6 @@ import android.util.Pools.Pool;
 import android.util.Pools.SimplePool;
 import android.util.Slog;
 import android.util.SparseArray;
-import android.view.AccessibilityManagerInternal;
 import android.view.Display;
 import android.view.IWindow;
 import android.view.InputDevice;
@@ -235,7 +234,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
         registerBroadcastReceivers();
         new AccessibilityContentObserver(mMainHandler).register(
                 context.getContentResolver());
-        LocalServices.addService(AccessibilityManagerInternal.class, new LocalService());
     }
 
     private UserState getUserStateLocked(int userId) {
@@ -1331,7 +1329,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
         updateTouchExplorationLocked(userState);
         updateEnhancedWebAccessibilityLocked(userState);
         updateDisplayColorAdjustmentSettingsLocked(userState);
-        updateEncryptionState(userState);
         scheduleUpdateInputFilter(userState);
         scheduleUpdateClientsIfNeededLocked(userState);
     }
@@ -1608,22 +1605,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
         DisplayAdjustmentUtils.applyAdjustments(mContext, userState.mUserId);
     }
 
-    private void updateEncryptionState(UserState userState) {
-        if (userState.mUserId != UserHandle.USER_OWNER) {
-            return;
-        }
-        final long identity = Binder.clearCallingIdentity();
-        try {
-            if (hasRunningServicesLocked(userState) && LockPatternUtils.isDeviceEncrypted()) {
-                // If there are running accessibility services we do not have encryption as
-                // the user needs the accessibility layer to be running to authenticate.
-                mLockPatternUtils.clearEncryptionPassword();
-            }
-        } finally {
-            Binder.restoreCallingIdentity(identity);
-        }
-    }
-
     private boolean hasRunningServicesLocked(UserState userState) {
         return !userState.mBoundServices.isEmpty() || !userState.mBindingServices.isEmpty();
     }
@@ -3969,14 +3950,4 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
             }
         }
     }
-
-    private final class LocalService extends AccessibilityManagerInternal {
-        @Override
-        public boolean isNonDefaultEncryptionPasswordAllowed() {
-            synchronized (mLock) {
-                UserState userState = getCurrentUserStateLocked();
-                return !hasRunningServicesLocked(userState);
-            }
-        }
-    }
 }