Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb

2011-01-26 22:00:07 -08:00
parent 9af5da5258 e797b82c76
commit ea1fbe9c8c
1 changed files with 0 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
+++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
@@ -218,7 +218,6 @@ public class PowerUI extends SystemUI {
            mLowBatteryDialog = d;
        }

-if (false) { // getRingtone ANRs
        final ContentResolver cr = mContext.getContentResolver();
        if (Settings.System.getInt(cr, Settings.System.POWER_SOUNDS_ENABLED, 1) == 1) {
            final String soundPath = Settings.System.getString(cr,
@@ -234,7 +233,6 @@ if (false) { // getRingtone ANRs
                }
            }
        }
-}
    }

    void dismissInvalidChargerDialog() {