am f8e54846: am 9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev (83d55189) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -12335,6 +12335,7 @@ package android.media {
		method public int getVolume();
		method public int getVolumeHandling();
		method public int getVolumeMax();
		method public boolean isConnecting();
		method public boolean isEnabled();
		method public void requestSetVolume(int);
		method public void requestUpdateVolume(int);

+13 −1

Original line number	Diff line number	Diff line
		@@ -1357,12 +1357,24 @@ public class MediaRouter {
		}

		/**
		* @return true if this route is enabled and may be selected
		* Returns true if this route is enabled and may be selected.
		*
		* @return True if this route is enabled.
		*/
		public boolean isEnabled() {
		return mEnabled;
		}

		/**
		* Returns true if the route is in the process of connecting and is not
		* yet ready for use.
		*
		* @return True if this route is in the process of connecting.
		*/
		public boolean isConnecting() {
		return mStatusCode == STATUS_CONNECTING;
		}

		void setStatusInt(CharSequence status) {
		if (!status.equals(mStatus)) {
		mStatus = status;