2 files changed, 3 insertions, 43 deletions

diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileManagerService.java
index 54f3d7cb..20cfa2b6 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileManagerService.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileManagerService.java
@@ -26,7 +26,6 @@ import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiSsid;
 import android.os.Message;
-import android.provider.Settings;
 import android.util.ArraySet;
 import com.android.internal.policy.IKeyguardService;
 import cyanogenmod.providers.CMSettings;
@@ -230,19 +229,6 @@ public class ProfileManagerService extends CMSystemService {
         }
     }
 
-    private class ZenModeObserver extends ContentObserver {
-        public ZenModeObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            if (mActiveProfile != null) {
-                mActiveProfile.updateRing(mContext);
-            }
-        }
-    }
-
     public ProfileManagerService(Context context) {
         super(context);
         mContext = context;
@@ -297,9 +283,6 @@ public class ProfileManagerService extends CMSystemService {
             mContext.getContentResolver().registerContentObserver(
                     CMSettings.System.getUriFor(CMSettings.System.SYSTEM_PROFILES_ENABLED),
                     false, new ProfilesObserver(mHandler), UserHandle.USER_ALL);
-            mContext.getContentResolver().registerContentObserver(
-                    Settings.Global.getUriFor(Settings.Global.ZEN_MODE),
-                    false, new ZenModeObserver(mHandler), UserHandle.USER_ALL);
         }
     }
 
diff --git a/sdk/src/java/cyanogenmod/app/Profile.java b/sdk/src/java/cyanogenmod/app/Profile.java
index 0141f11b..9a4666d7 100755
--- a/sdk/src/java/cyanogenmod/app/Profile.java
+++ b/sdk/src/java/cyanogenmod/app/Profile.java
@@ -22,7 +22,6 @@ import android.os.Parcel;
 import android.os.ParcelUuid;
 import android.os.Parcelable;
 import android.os.UserHandle;
-import android.media.AudioSystem;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
@@ -1229,34 +1228,12 @@ public final class Profile implements Parcelable, Comparable {
         return profile;
     }
 
-    private boolean dndAllowsRingChanges(Context context) {
-        int zenMode = Settings.Global.getInt(context.getContentResolver(),
-                Settings.Global.ZEN_MODE, Settings.Global.ZEN_MODE_OFF);
-        return zenMode != Settings.Global.ZEN_MODE_NO_INTERRUPTIONS &&
-                zenMode != Settings.Global.ZEN_MODE_ALARMS;
-    }
-
-    /** @hide */
-    public void updateRing(Context context) {
-        if (!dndAllowsRingChanges(context)) {
-            return;
-        }
-        // Set stream volume
-        StreamSettings sd = getSettingsForStream(AudioSystem.STREAM_RING);
-        if (sd != null) {
-            AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-            am.setStreamVolume(sd.getStreamId(), sd.getValue(), 0);
-        }
-        // Set ring mode
-        mRingMode.processOverride(context);
-    }
-
     /** @hide */
     public void doSelect(Context context, IKeyguardService keyguardService) {
         // Set stream volumes
         AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         for (StreamSettings sd : streams.values()) {
-            if (sd.isOverride() && sd.getStreamId() != AudioSystem.STREAM_RING) {
+            if (sd.isOverride()) {
                 am.setStreamVolume(sd.getStreamId(), sd.getValue(), 0);
             }
         }
@@ -1272,8 +1249,8 @@ public final class Profile implements Parcelable, Comparable {
             }
         }
 
-        updateRing(context);
-
+        // Set ring mode
+        mRingMode.processOverride(context);
         // Set airplane mode
         mAirplaneMode.processOverride(context);