Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d40ec64e authored Jun 23, 2015 by Daria Evdokimova Committed by Android Git Automerger Jun 23, 2015

am 8cf42f4b: Using MNC codename instead of int

* commit '8cf42f4b':
  Using MNC codename instead of int

parents d90e8c0d 8cf42f4b

src/com/android/deskclock/HandleDeskClockApiCalls.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -446,8 +446,8 @@ public class HandleDeskClockApiCalls extends Activity {
		final HashMap<String, CityObj> selectedCities =
		Cities.readCitiesFromSharedPrefs(prefs);
		if (selectedCities.remove(city.mCityId) != null) {
		final String reason = String.format(mContext.getString(
		R.string.city_deleted), city.mCityName);
		final String reason = mContext.getString(R.string.city_deleted,
		city.mCityName);
		Voice.notifySuccess(mActivity, reason);
		LogUtils.i(reason);
		Cities.saveCitiesToSharedPrefs(prefs, selectedCities);

src/com/android/deskclock/Voice.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -36,13 +36,15 @@ public final class Voice {
		}

		public static void notifySuccess(Activity activity, String message) {
		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
		// TODO change this to Build.VERSION.SDK_INT > Build.VERSION.LOLLIPOP_MR1
		if (Build.VERSION.CODENAME.equals("MNC")) {
		sDelegate.notifySuccess(activity.getVoiceInteractor(), message);
		}
		}

		public static void notifyFailure(Activity activity, String message) {
		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
		// TODO change this to Build.VERSION.SDK_INT > Build.VERSION.LOLLIPOP_MR1
		if (Build.VERSION.CODENAME.equals("MNC")) {
		sDelegate.notifyFailure(activity.getVoiceInteractor(), message);
		}
		}