From 06036361e55065342e8c3e866e4fce8d0397efe8 Mon Sep 17 00:00:00 2001
From: Ivan Chiang <chiangi@google.com>
Date: Fri, 22 Jun 2018 12:39:44 +0800
Subject: [PATCH] Fix crash of Connected Devices page

Doesn't set the preference context for savedDockUpdater.
We will throw IllegalStateException now.

Change-Id: I684cd2a917ce94e033be578349c3cc1d8650ccea
Fix: 110609074
Test: m -j SettingsRoboTests RunSettingsRoboTests
---
 .../PreviouslyConnectedDevicePreferenceController.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
index 0234647a446..eff97c3c900 100644
--- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
@@ -59,7 +59,9 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
         super.displayPreference(screen);
         if (isAvailable()) {
             mPreference = screen.findPreference(getPreferenceKey());
-            mBluetoothDeviceUpdater.setPrefContext(screen.getContext());
+            final Context context = screen.getContext();
+            mBluetoothDeviceUpdater.setPrefContext(context);
+            mSavedDockUpdater.setPreferenceContext(context);
         }
     }