Merge "ContextHubManager: Rename Callback class." into nyc-dev (6c2af2f2) · Commits · e / os / android_frameworks_base

api/system-current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -15279,19 +15279,19 @@ package android.hardware.location {
		method public android.hardware.location.ContextHubInfo getContextHubInfo(int);
		method public android.hardware.location.NanoAppInstanceInfo getNanoAppInstanceInfo(int);
		method public int loadNanoApp(int, android.hardware.location.NanoApp);
		method public int registerContextHubCallback(android.hardware.location.ContextHubManager.ContextHubCallback);
		method public int registerContextHubCallback(android.hardware.location.ContextHubManager.ContextHubCallback, android.os.Handler);
		method public int registerCallback(android.hardware.location.ContextHubManager.Callback);
		method public int registerCallback(android.hardware.location.ContextHubManager.Callback, android.os.Handler);
		method public int sendMessage(int, int, android.hardware.location.ContextHubMessage);
		method public int unloadNanoApp(int);
		method public int unregisterContextHubCallback(android.hardware.location.ContextHubManager.ContextHubCallback);
		method public int unregisterCallback(android.hardware.location.ContextHubManager.Callback);
		field public static final int ANY_HUB = -1; // 0xffffffff
		field public static final int MSG_DATA_SEND = 3; // 0x3
		field public static final int MSG_LOAD_NANO_APP = 1; // 0x1
		field public static final int MSG_UNLOAD_NANO_APP = 2; // 0x2
		}

		public static abstract class ContextHubManager.ContextHubCallback {
		ctor protected ContextHubManager.ContextHubCallback();
		public static abstract class ContextHubManager.Callback {
		ctor protected ContextHubManager.Callback();
		method public abstract void onMessageReceipt(int, int, android.hardware.location.ContextHubMessage);
		}

core/java/android/hardware/location/ContextHubManager.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ public final class ContextHubManager {

		private final Looper mMainLooper;
		private IContextHubService mContextHubService;
		private ContextHubCallback mCallback;
		private Callback mCallback;
		private Handler mCallbackHandler;

		/**
		@@ -62,8 +62,8 @@ public final class ContextHubManager {
		/**
		* An interface to receive asynchronous communication from the context hub.
		*/
		public abstract static class ContextHubCallback {
		protected ContextHubCallback() {}
		public abstract static class Callback {
		protected Callback() {}

		/**
		* Callback function called on message receipt from context hub.
		@@ -226,12 +226,12 @@ public final class ContextHubManager {
		*
		* @param callback Callback object
		*
		* @see ContextHubCallback
		* @see Callback
		*
		* @return int 0 on success, -1 otherwise
		*/
		public int registerContextHubCallback(ContextHubCallback callback) {
		return registerContextHubCallback(callback, null);
		public int registerCallback(Callback callback) {
		return registerCallback(callback, null);
		}

		/**
		@@ -240,11 +240,11 @@ public final class ContextHubManager {
		* @param callback Callback object
		* @param handler Handler object
		*
		* @see ContextHubCallback
		* @see Callback
		*
		* @return int 0 on success, -1 otherwise
		*/
		public int registerContextHubCallback(ContextHubCallback callback, Handler handler) {
		public int registerCallback(Callback callback, Handler handler) {
		synchronized(this) {
		if (mCallback != null) {
		Log.e(TAG, "Max number of callbacks reached!");
		@@ -259,13 +259,13 @@ public final class ContextHubManager {
		/**
		* Unregister a callback for receive messages from the context hub.
		*
		* @see ContextHubCallback
		* @see Callback
		*
		* @param callback method to deregister
		*
		* @return int 0 on success, -1 otherwise
		*/
		public int unregisterContextHubCallback(ContextHubCallback callback) {
		public int unregisterCallback(Callback callback) {
		synchronized(this) {
		if (callback != mCallback) {
		Log.e(TAG, "Cannot recognize callback!");
		@@ -284,7 +284,7 @@ public final class ContextHubManager {
		final ContextHubMessage message) {
		if (mCallback != null) {
		synchronized(this) {
		final ContextHubCallback callback = mCallback;
		final Callback callback = mCallback;
		Handler handler = mCallbackHandler == null ?
		new Handler(mMainLooper) : mCallbackHandler;
		handler.post(new Runnable() {