diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-04-04 22:35:43 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-04-04 22:36:10 -0700 |
| commit | ecb148707eb376fc5dc60b3626dec34ae847ecc8 (patch) | |
| tree | 82a9de9999197d2ac892208544b15c716ee7bfa3 /src | |
| parent | d6098ce16fa4bc11b5a59d1228745357ffb3d72e (diff) | |
| download | packages_apps_Settings-ecb148707eb376fc5dc60b3626dec34ae847ecc8.tar.gz packages_apps_Settings-ecb148707eb376fc5dc60b3626dec34ae847ecc8.tar.bz2 packages_apps_Settings-ecb148707eb376fc5dc60b3626dec34ae847ecc8.zip | |
Revert "Settings: disable wifi display from search indexing if disabled"
* Breaks the build. Missing variables, bad syntax.
DONUTS-1234
This reverts commit 8b1fe7d8b3d704ce841f4af12cd9d7b98eb9330d.
Change-Id: Idf1a5a9580d85148d117893568515562bea31af2
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 5 | ||||
| -rw-r--r-- | src/com/android/settings/search/IndexDatabaseHelper.java | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 20678872d..97353a80a 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -820,11 +820,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements } if (!isCameraGestureAvailable(context.getResources())) { result.add(KEY_CAMERA_GESTURE); - - if (!context.getResources().getBoolean( - com.android.internal.R.bool.config_enableWifiDisplay) && - (SystemProperties.getInt(FORCE_WIFI_DISPLAY_ENABLE, -1) != 1)) { - result.add(KEY_WIFI_DISPLAY); } return result; } diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java index fd7b76240..84a2922b6 100644 --- a/src/com/android/settings/search/IndexDatabaseHelper.java +++ b/src/com/android/settings/search/IndexDatabaseHelper.java @@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper { private static final String TAG = "IndexDatabaseHelper"; private static final String DATABASE_NAME = "search_index.db"; - private static final int DATABASE_VERSION = 119; + private static final int DATABASE_VERSION = 118; public interface Tables { public static final String TABLE_PREFS_INDEX = "prefs_index"; |