summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/SettingsManager.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
-rw-r--r--src/com/android/camera/SettingsManager.java20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index c8f3f8c7b..f4162c79f 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -120,7 +120,6 @@ public class SettingsManager implements ListMenu.SettingsListener {
public static final String KEY_SHUTTER_SOUND = "pref_camera2_shutter_sound_key";
private static final String TAG = "SnapCam_SettingsManager";
- private static SettingsManager sInstance;
private ArrayList<CameraCharacteristics> mCharacteristics;
private ArrayList<Listener> mListeners;
private Map<String, Values> mValuesMap;
@@ -133,7 +132,7 @@ public class SettingsManager implements ListMenu.SettingsListener {
private JSONObject mDependency;
private int mCameraId;
- private SettingsManager(Context context) {
+ public SettingsManager(Context context) {
mListeners = new ArrayList<>();
mCharacteristics = new ArrayList<>();
mContext = context;
@@ -173,23 +172,6 @@ public class SettingsManager implements ListMenu.SettingsListener {
mDependency = parseJson("dependency.json");
}
- public static SettingsManager createInstance(Context context) {
- if (sInstance == null) {
- sInstance = new SettingsManager(context);
- }
- return sInstance;
- }
-
- public static SettingsManager getInstance() {
- return sInstance;
- }
-
- public void destroyInstance() {
- if (sInstance != null) {
- sInstance = null;
- }
- }
-
public List<String> getDisabledList() {
List<String> list = new ArrayList<>();
Set<String> keySet = mValuesMap.keySet();