From b68d6ae5a24e3e53839593bfe17f19c653bfca30 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 24 Jan 2017 10:53:57 -0500
Subject: [PATCH] Fix crash on user switch

Don't re-register a user switcher while getting a user switched
callback, because that will cause a crash.

Test: switch users.
Fixes: 34661001
Change-Id: I31453d75aabe6ecd657e7500cf1823890d5262a0
---
 .../statusbar/policy/DeviceProvisionedControllerImpl.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedControllerImpl.java
index 0fc300d1aa079..528fefe496539 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedControllerImpl.java
@@ -91,9 +91,11 @@ public class DeviceProvisionedControllerImpl extends CurrentUserTracker implemen
 
     @Override
     public void onUserSwitched(int newUserId) {
-        stopListening();
-        startListening(newUserId);
-        notifyUserChanged();
+        mContentResolver.unregisterContentObserver(mSettingsObserver);
+        mContentResolver.registerContentObserver(mDeviceProvisionedUri, true,
+                mSettingsObserver, 0);
+        mContentResolver.registerContentObserver(mUserSetupUri, true,
+                mSettingsObserver, newUserId);
         notifyUserChanged();
     }