diff options
| author | Christopher Tate <ctate@google.com> | 2015-03-16 16:55:14 -0700 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2015-03-16 17:39:07 -0700 |
| commit | 2d4aadca9487d76cb7220bdba90afa53119664ea (patch) | |
| tree | c332c59f9cb2263aef59f1216995de0eba196afa /packages/SettingsProvider | |
| parent | 6597e3435f8abfedbb9a4f1bfb10cc17ea7f38bf (diff) | |
| download | frameworks_base-2d4aadca9487d76cb7220bdba90afa53119664ea.zip frameworks_base-2d4aadca9487d76cb7220bdba90afa53119664ea.tar.gz frameworks_base-2d4aadca9487d76cb7220bdba90afa53119664ea.tar.bz2 | |
Merge restored accessibility enable state, don't overwrite
We do not want to accidentally disable the user's currently-enabled
accessibility service(s); presumably they turned them on during
setup for a reason. We now merge the prior + current states rather
than simply replacing the current state with the former.
Bug 19427367
Change-Id: I96eb47df57318c88066c5da6862f23f656639148
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java index 1cad610..30786f0 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java @@ -62,8 +62,9 @@ public class SettingsHelper { */ private static final ArraySet<String> sBroadcastOnRestore; static { - sBroadcastOnRestore = new ArraySet<String>(1); + sBroadcastOnRestore = new ArraySet<String>(2); sBroadcastOnRestore.add(Settings.Secure.ENABLED_NOTIFICATION_LISTENERS); + sBroadcastOnRestore.add(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES); } private interface SettingsLookup { |