PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the build breakage caused by merge resolution

Browse Source 
commit 5d409ace19 broke the build

Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit 8c041f7862)
This commit is contained in:
Alexey Polyudov
2017-02-02 12:59:34 -08:00
parent 40046d4316
commit f689441eed
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
View File

@@ -148,20 +148,6 @@ final class LocalBluetoothPreferences {
editor.apply(); editor.apply();
} }
static void persistDiscoveringTimestamp(final Context context) {
// Load the shared preferences and edit it on a background
// thread (but serialized!).
QueuedWork.queue(new Runnable() {
public void run() {
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
editor.putLong(
KEY_DISCOVERING_TIMESTAMP,
System.currentTimeMillis());
editor.apply();
}
}, false);
}
static boolean hasDockAutoConnectSetting(Context context, String addr) { static boolean hasDockAutoConnectSetting(Context context, String addr) {
return getSharedPreferences(context).contains(KEY_DOCK_AUTO_CONNECT + addr); return getSharedPreferences(context).contains(KEY_DOCK_AUTO_CONNECT + addr);
} }