From e529bb9841b549afad7e732774a28be120339860 Mon Sep 17 00:00:00 2001
From: Alexandra Gherghina <alexgherghina@google.com>
Date: Wed, 3 Sep 2014 11:01:45 +0100
Subject: [PATCH] Code clean-ups following moving the managed profile under
 accounts

Bug: 16234745
Change-Id: I7b4799157394a85a27610de7e059c846f77dda02
---
 .../settings/accounts/AccountSettings.java    | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 891fdbb1976..9bcef13ff20 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -31,9 +31,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -117,6 +114,7 @@ public class AccountSettings extends SettingsPreferenceFragment
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+        mProfileNotAvailablePreference = new Preference(getActivity());
         setHasOptionsMenu(true);
     }
 
@@ -335,16 +333,11 @@ public class AccountSettings extends SettingsPreferenceFragment
             }
         } else {
             // Put a label instead of the accounts list
-            synchronized (this) {
-                if (mProfileNotAvailablePreference == null) {
-                    mProfileNotAvailablePreference = new Preference(getActivity());
-                    mProfileNotAvailablePreference.setEnabled(false);
-                    mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon);
-                    mProfileNotAvailablePreference.setTitle(null);
-                    mProfileNotAvailablePreference.setSummary(
-                            R.string.managed_profile_not_available_label);
-                }
-            }
+            mProfileNotAvailablePreference.setEnabled(false);
+            mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon);
+            mProfileNotAvailablePreference.setTitle(null);
+            mProfileNotAvailablePreference.setSummary(
+                    R.string.managed_profile_not_available_label);
             profileData.preferenceGroup.addPreference(mProfileNotAvailablePreference);
         }
         if (profileData.removeWorkProfilePreference != null) {