diff options
author | Fan Zhang <zhfan@google.com> | 2017-07-25 10:30:24 -0700 |
---|---|---|
committer | Fan Zhang <zhfan@google.com> | 2017-07-25 13:06:32 -0700 |
commit | 84dd783c368bab03b205f58a5c2367932082acca (patch) | |
tree | 6aaf98477f86bd7a1ca5782d7d4ed2fa3092c1cf /src/com/android/settings/development/DevelopmentSwitchBarController.java | |
parent | a39daa25e7f4ce554ee863b1f65bdac686942bdf (diff) | |
download | packages_apps_Settings-84dd783c368bab03b205f58a5c2367932082acca.tar.gz packages_apps_Settings-84dd783c368bab03b205f58a5c2367932082acca.tar.bz2 packages_apps_Settings-84dd783c368bab03b205f58a5c2367932082acca.zip |
Fix a monkey crash in Developer settings.
- DevSetting shouldn't add switchbar listener if it's a Monkey test run
- DevSetting shouldn't remove switchbar listener if it's not registered
- Refactor some switchbar logic in order to create test
Change-Id: Ie65ff9b04778075789010169039393bd0551acfb
Fix: 64021498
Test: robotests
Diffstat (limited to 'src/com/android/settings/development/DevelopmentSwitchBarController.java')
-rw-r--r-- | src/com/android/settings/development/DevelopmentSwitchBarController.java | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/src/com/android/settings/development/DevelopmentSwitchBarController.java b/src/com/android/settings/development/DevelopmentSwitchBarController.java new file mode 100644 index 0000000000..168f7c062b --- /dev/null +++ b/src/com/android/settings/development/DevelopmentSwitchBarController.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.development; + +import com.android.settings.Utils; +import com.android.settings.widget.SwitchBar; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnStart; +import com.android.settingslib.core.lifecycle.events.OnStop; + +public class DevelopmentSwitchBarController implements LifecycleObserver, OnStart, OnStop { + + private final SwitchBar mSwitchBar; + private final boolean mIsAvailable; + private final DevelopmentSettings mSettings; + + public DevelopmentSwitchBarController(DevelopmentSettings settings, SwitchBar switchBar, + boolean isAvailable, Lifecycle lifecycle) { + mSwitchBar = switchBar; + mIsAvailable = isAvailable && !Utils.isMonkeyRunning(); + mSettings = settings; + + if (mIsAvailable) { + lifecycle.addObserver(this); + } else { + mSwitchBar.setEnabled(false); + } + } + + @Override + public void onStart() { + mSwitchBar.addOnSwitchChangeListener(mSettings); + } + + @Override + public void onStop() { + mSwitchBar.removeOnSwitchChangeListener(mSettings); + } +} |