diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 10:16:39 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 10:16:39 -0800 |
| commit | f68b4b26dfa43b99aa20e20f534330105edc30ec (patch) | |
| tree | 27085fbc56759abd8c8ff2756c4a9cffda702284 /src/com/android/camera/CameraSettings.java | |
| parent | 8a778b1701394d7783a474a8bbf5622dc122280f (diff) | |
| parent | cdd3e6fe1566e15ecf2b296b3cf4186332dbf81b (diff) | |
| download | LegacyCamera-f68b4b26dfa43b99aa20e20f534330105edc30ec.tar.gz LegacyCamera-f68b4b26dfa43b99aa20e20f534330105edc30ec.tar.bz2 LegacyCamera-f68b4b26dfa43b99aa20e20f534330105edc30ec.zip | |
resolved conflicts for merge of cdd3e6fe to stage-korg-master
Change-Id: I7f5844e0bb9a46cd8948b830712efdbc596a49f7
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 600575eb..f80395a4 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -69,7 +69,6 @@ public class CameraSettings { // MMS video length public static final int DEFAULT_VIDEO_DURATION_VALUE = -1; - @SuppressWarnings("unused") private static final String TAG = "CameraSettings"; private final Context mContext; @@ -272,8 +271,6 @@ public class CameraSettings { private void filterUnsupportedOptions(PreferenceGroup group, ListPreference pref, List<String> supported) { - CharSequence[] allEntries = pref.getEntries(); - // Remove the preference if the parameter is not supported or there is // only one options for the settings. if (supported == null || supported.size() <= 1) { |