am dd97056f: Clear logs in Clock (9313973f) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/alarmclock/DigitalAppWidgetService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.util.Log;
		import android.widget.RemoteViewsService;

		public class DigitalAppWidgetService extends RemoteViewsService {
		public static final boolean LOGGING = true; // STOPSHIP Don't ship with this set to true
		public static final boolean LOGGING = false;

		@Override
		public RemoteViewsFactory onGetViewFactory(Intent i) {

+0 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,6 @@ public class SettingsActivity extends PreferenceActivity
		String[] labels = resources.getStringArray(R.array.timezone_labels);
		int minLength = ids.length;
		if (ids.length != labels.length) {
		// StopShip: Make sure to remove this after we get translations for K
		minLength = Math.min(minLength, labels.length);
		Log.e("Timezone ids and labels have different length!");
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -359,9 +359,6 @@ public class Utils {
		\|\| (alarmOnQuarterHour - System.currentTimeMillis()) > 901000) {
		Log.wtf("quarterly alarm calculation error");
		}
		Log.v("getAlarmOnQuarterHour returns " // STOPSHIP Don't ship with this log
		+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(nextQuarter.getTime())
		+ " to fire in " + (alarmOnQuarterHour - System.currentTimeMillis()));
		return alarmOnQuarterHour;
		}

		@@ -540,10 +537,8 @@ public class Utils {
		String[] ids = r.getStringArray(R.array.cities_id);
		int minLength = cities.length;
		if (cities.length != timezones.length \|\| ids.length != cities.length) {
		// StopShip: Make sure to remove this after we get transations for K
		minLength = Math.min(cities.length, Math.min(timezones.length, ids.length));
		Log.e("City lists sizes are not the same, trancating");
		// return null;
		}
		CityObj[] tempList = new CityObj[minLength];
		for (int i = 0; i < cities.length; i++) {

+5 −4

Original line number	Diff line number	Diff line
		@@ -46,8 +46,10 @@ public class TimerReceiver extends BroadcastReceiver {

		@Override
		public void onReceive(final Context context, final Intent intent) {
		if (Timers.LOGGING) {
		Log.v(TAG, "Received intent " + intent.toString());
		}
		String actionType = intent.getAction();

		// This action does not need the timers data
		if (Timers.NOTIF_IN_USE_CANCEL.equals(actionType)) {
		cancelInUseNotification(context);
		@@ -76,7 +78,7 @@ public class TimerReceiver extends BroadcastReceiver {
		// Remaining actions provide a timer Id
		if (!intent.hasExtra(Timers.TIMER_INTENT_EXTRA)) {
		// No data to work with, do nothing
		Log.d(TAG, "got intent without Timer data");
		Log.e(TAG, "got intent without Timer data");
		return;
		}

		@@ -84,9 +86,8 @@ public class TimerReceiver extends BroadcastReceiver {
		int timerId = intent.getIntExtra(Timers.TIMER_INTENT_EXTRA, -1);
		if (timerId == -1) {
		Log.d(TAG, "OnReceive:intent without Timer data for " + actionType);
		} else if (Timers.LOGGING) {
		Log.v(TAG, "Receiver OnReceive " + actionType + " " + timerId);
		}

		TimerObj t = Timers.findTimer(mTimers, timerId);

		if (Timers.TIMES_UP.equals(actionType)) {