From c2d6544e049cf11f4a0923558fb7c71f2b90219c Mon Sep 17 00:00:00 2001 From: Chenjie Yu Date: Thu, 1 Feb 2018 22:27:17 -0800 Subject: [PATCH] fix bluetooth puller + bluetooth adapter may be lost, in which case we should try to get it again Test: cts test Change-Id: I331ab45cea930cb5b8b95885442214d4a410b13b Fix: 72949299 --- .../com/android/server/stats/StatsCompanionService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java index f498cdd85ee8b..c280739f2e1ad 100644 --- a/services/core/java/com/android/server/stats/StatsCompanionService.java +++ b/services/core/java/com/android/server/stats/StatsCompanionService.java @@ -113,7 +113,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { new StatFs(Environment.getRootDirectory().getAbsolutePath()); private final StatFs mStatFsTemp = new StatFs(Environment.getDownloadCacheDirectory().getAbsolutePath()); - private final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); public StatsCompanionService(Context context) { super(); @@ -677,12 +676,13 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } private synchronized BluetoothActivityEnergyInfo pullBluetoothData() { + final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); if (adapter != null) { - SynchronousResultReceiver bluetoothReceiver = null; - bluetoothReceiver = new SynchronousResultReceiver("bluetooth"); + SynchronousResultReceiver bluetoothReceiver = new SynchronousResultReceiver("bluetooth"); adapter.requestControllerActivityEnergyInfo(bluetoothReceiver); return awaitControllerInfo(bluetoothReceiver); } else { + Slog.e(TAG, "Failed to get bluetooth adapter!"); return null; } }