commit 8dbdc91ef1f14c6fb30263572d86eefe62413822
author Jackal Guo <jackalguo@google.com> Wed Aug 22 01:08:02 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 22 01:08:02 2018 +0000
tree ef1feb15bd45a6bcaf009956ae5a2c642c9d7a9c
parent ec0d236e765ee1381e9712a5217f883e83d3b4cd
parent ea479da1e039bc926419972eb559a4fe6a3f36bc

Merge "disableSelf doesn't recover the init state of value"

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index acbb67c..6be9550 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1567,8 +1567,9 @@
         }
         final long identity = Binder.clearCallingIdentity();
         try {
+            final String settingValue = builder.toString();
             Settings.Secure.putStringForUser(mContext.getContentResolver(),
-                    settingName, builder.toString(), userId);
+                    settingName, TextUtils.isEmpty(settingValue) ? null : settingValue, userId);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }