From 5817ce0c13c4d190845b0cc74a4232cc845c31e3 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Thu, 25 Aug 2016 22:06:08 -0700 Subject: [PATCH] ContextHubService: Hack in Google vendor value To workaround b/30808791 without changing the NanoApp API, we make the assumption that if the most significant byte of our four-byte app ID is a lower-case 'L', then this is a Google Nanoapp and thus we should use "Googl" for our vendor ID, and set the most significant four bytes of our eight byte app ID accordingly. Bug: 30922112 Change-Id: I155dff58cdda1ef36a68e6d25df1e9059b1252f1 --- .../hardware/location/ContextHubService.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/core/java/android/hardware/location/ContextHubService.java b/core/java/android/hardware/location/ContextHubService.java index a699b687918b7..eea2387d7dea1 100644 --- a/core/java/android/hardware/location/ContextHubService.java +++ b/core/java/android/hardware/location/ContextHubService.java @@ -162,6 +162,28 @@ public class ContextHubService extends IContextHubService.Stub { msgHeader[HEADER_FIELD_MSG_TYPE] = MSG_LOAD_NANO_APP; long appId = app.getAppId(); + // TODO(b/30808791): Remove this hack when the NanoApp API is fixed. + // Due to a bug in the NanoApp API, only the least significant four + // bytes of the app ID can be stored. The most significant five + // bytes of a normal app ID are the "vendor", and thus the most + // significant of the bytes we have is the least significant byte + // of the vendor. In the case that byte is the ASCII value for + // lower-case 'L', we assume the vendor is supposed to be "Googl" + // and fill in the four most significant bytes accordingly. + if ((appId >> 32) != 0) { + // We're unlikely to notice this warning, but at least + // we can avoid running our hack logic. + Log.w(TAG, "Code has not been updated since API fix."); + } else { + // Note: Lower-case 'L', not the number 1. + if (((appId >> 24) & 0xFF) == (long)'l') { + // Assume we're a Google nanoapp. + appId |= ((long)'G') << 56; + appId |= ((long)'o') << 48; + appId |= ((long)'o') << 40; + appId |= ((long)'g') << 32; + } + } msgHeader[HEADER_FIELD_LOAD_APP_ID_LO] = (int)(appId & 0xFFFFFFFF); msgHeader[HEADER_FIELD_LOAD_APP_ID_HI] = (int)((appId >> 32) & 0xFFFFFFFF);