commit 9dce0791f8e9a0e91eabe61589c9a9c5f695f7b2
author Alexandra Gherghina <alexgherghina@google.com> Thu Sep 04 09:26:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 09:26:03 2014 +0000
tree 7aacc68fe4dc8aee6282a9787dc4e084ef602be8
parent 7641e1ad44f6006cac1bd1b88ca09b3bab2cca78
parent e529bb9841b549afad7e732774a28be120339860

Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev

src/com/android/settings/accounts/AccountSettings.java

diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 891fdbb..9bcef13 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -31,9 +31,6 @@
 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 void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+        mProfileNotAvailablePreference = new Preference(getActivity());
         setHasOptionsMenu(true);
     }
 
@@ -335,16 +333,11 @@
             }
         } 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) {