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

Commit dfaa392f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I1a61a5c9,I7e0dc28f,If0c923b3 

* changes:
  Rethrow RemoteException instead of log in ContextHubManager
  Remove unnecessary log from ContextHubManager
  Remove legacy bug comment in NanoAppInstanceInfo
parents def6d70a c8728e96

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

+1 −3
Original line number Diff line number Diff line
@@ -744,8 +744,6 @@ public final class ContextHubManager { 
                synchronized (this) {

                    mLocalCallback.onMessageReceipt(hubId, nanoAppId, message);

                }

            } else {

                Log.d(TAG, "Context hub manager client callback is NULL");

            }

        }

    };
@@ -759,7 +757,7 @@ public final class ContextHubManager { 
        try {

            mService.registerCallback(mClientCallback);

        } catch (RemoteException e) {

            Log.w(TAG, "Could not register callback:" + e);

            throw e.rethrowFromSystemServer();

        }

    }

}

core/java/android/hardware/location/NanoAppInstanceInfo.java

+0 −5
Original line number Diff line number Diff line
@@ -90,11 +90,6 @@ public class NanoAppInstanceInfo { 
    /**

     * Get the application version

     *

     * NOTE: There is a race condition where shortly after loading, this

     * may return -1 instead of the correct version.

     *

     * TODO(b/30970527): Fix this race condition.

     *

     * @return int - version of the app

     */

    public int getAppVersion() {