Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add dumpsys capabilities for context hub service" into nyc-dev

Browse Source
This commit is contained in:
Ashutosh Joshi
2016-04-07 14:00:48 +00:00
committed by Android (Google) Code Review
parent a5ec16e367 6239cc6fe1
commit 7d4a7fa333
6 changed files with 117 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/hardware/location/ContextHubInfo.java
View File

@@ -345,6 +345,24 @@ public class ContextHubInfo {
mMemoryRegions = Arrays.copyOf(memoryRegions, memoryRegions.length);
}
@Override
public String toString() {
String retVal = "";
retVal += "Id : " + mId;
retVal += ", Name : " + mName;
retVal += "\n\tVendor : " + mVendor;
retVal += ", ToolChain : " + mToolchain;
retVal += "\n\tPlatformVersion : " + mPlatformVersion;
retVal += ", StaticSwVersion : " + mStaticSwVersion;
retVal += "\n\tPeakMips : " + mPeakMips;
retVal += ", StoppedPowerDraw : " + mStoppedPowerDrawMw + " mW";
retVal += ", PeakPowerDraw : " + mPeakPowerDrawMw + " mW";
retVal += "\n\tSupported sensors : " + Arrays.toString(mSupportedSensors);
retVal += "\n\tMemory Regions : " + Arrays.toString(mMemoryRegions);
return retVal;
}
private ContextHubInfo(Parcel in) {
mId = in.readInt();
mName = in.readString();

66
core/java/android/hardware/location/ContextHubService.java
View File

@@ -18,9 +18,12 @@ package android.hardware.location;
import android.Manifest;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.RemoteException;
import android.util.Log;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
@@ -28,13 +31,12 @@ import java.util.HashMap;
* @hide
*/
public class ContextHubService extends IContextHubService.Stub {
public static final String CONTEXTHUB_SERVICE = "contexthub_service";
private static final String TAG = "ContextHubService";
private static final String HARDWARE_PERMISSION = Manifest.permission.LOCATION_HARDWARE;
private static final String ENFORCE_HW_PERMISSION_MESSAGE = "Permission '"
+ HARDWARE_PERMISSION + "' not granted to access ContextHub Hardware";
+ HARDWARE_PERMISSION + "' not granted to access ContextHub Hardware";
public static final int ANY_HUB = -1;
@@ -78,8 +80,8 @@ public class ContextHubService extends IContextHubService.Stub {
@Override
public int registerCallback(IContextHubCallback callback) throws RemoteException {
checkPermissions();
synchronized(this) {
mCallback = callback;
synchronized (this) {
mCallback = callback;
}
return 0;
}
@@ -87,10 +89,10 @@ public class ContextHubService extends IContextHubService.Stub {
@Override
public int[] getContextHubHandles() throws RemoteException {
checkPermissions();
int [] returnArray = new int[mContextHubInfo.length];
int[] returnArray = new int[mContextHubInfo.length];
for (int i = 0; i < returnArray.length; ++i) {
returnArray[i] = i + 1; //valid handles from 1...n
returnArray[i] = i;
Log.d(TAG, String.format("Hub %s is mapped to %d",
mContextHubInfo[i].getName(), returnArray[i]));
}
@@ -101,7 +103,6 @@ public class ContextHubService extends IContextHubService.Stub {
@Override
public ContextHubInfo getContextHubInfo(int contextHubHandle) throws RemoteException {
checkPermissions();
contextHubHandle -= 1;
if (!(contextHubHandle >= 0 && contextHubHandle < mContextHubInfo.length)) {
return null; // null means fail
}
@@ -112,13 +113,12 @@ public class ContextHubService extends IContextHubService.Stub {
@Override
public int loadNanoApp(int contextHubHandle, NanoApp app) throws RemoteException {
checkPermissions();
contextHubHandle -= 1;
if (!(contextHubHandle >= 0 && contextHubHandle < mContextHubInfo.length)) {
return -1; // negative handle are invalid, means failed
Log.e(TAG, "Invalid contextHubhandle " + contextHubHandle);
return -1;
}
// Call Native interface here
int[] msgHeader = new int[MSG_HEADER_SIZE];
msgHeader[MSG_FIELD_HUB_HANDLE] = contextHubHandle;
msgHeader[MSG_FIELD_APP_INSTANCE] = OS_APP_INSTANCE;
@@ -147,7 +147,7 @@ public class ContextHubService extends IContextHubService.Stub {
msgHeader[MSG_FIELD_VERSION] = 0;
msgHeader[MSG_FIELD_TYPE] = MSG_UNLOAD_NANO_APP;
if(nativeSendMessage(msgHeader, null) != 0) {
if (nativeSendMessage(msgHeader, null) != 0) {
return -1;
}
@@ -157,7 +157,7 @@ public class ContextHubService extends IContextHubService.Stub {
@Override
public NanoAppInstanceInfo getNanoAppInstanceInfo(int nanoAppInstanceHandle)
throws RemoteException {
throws RemoteException {
checkPermissions();
// This assumes that all the nanoAppInfo is current. This is reasonable
// for the use cases for tightly controlled nanoApps.
@@ -173,10 +173,10 @@ public class ContextHubService extends IContextHubService.Stub {
checkPermissions();
ArrayList<Integer> foundInstances = new ArrayList<Integer>();
for(Integer nanoAppInstance : mNanoAppHash.keySet()) {
for (Integer nanoAppInstance: mNanoAppHash.keySet()) {
NanoAppInstanceInfo info = mNanoAppHash.get(nanoAppInstance);
if (filter.testMatch(info)){
if (filter.testMatch(info)) {
foundInstances.add(nanoAppInstance);
}
}
@@ -191,7 +191,7 @@ public class ContextHubService extends IContextHubService.Stub {
@Override
public int sendMessage(int hubHandle, int nanoAppHandle, ContextHubMessage msg)
throws RemoteException {
throws RemoteException {
checkPermissions();
int[] msgHeader = new int[MSG_HEADER_SIZE];
@@ -203,6 +203,32 @@ public class ContextHubService extends IContextHubService.Stub {
return nativeSendMessage(msgHeader, msg.getData());
}
@Override
protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
if (mContext.checkCallingOrSelfPermission("android.permission.DUMP")
!= PackageManager.PERMISSION_GRANTED) {
pw.println("Permission Denial: can't dump contexthub_service");
return;
}
pw.println("Dumping ContextHub Service");
pw.println("");
// dump ContextHubInfo
pw.println("=================== CONTEXT HUBS ====================");
for (int i = 0; i < mContextHubInfo.length; i++) {
pw.println("Handle " + i + " : " + mContextHubInfo[i].toString());
}
pw.println("");
pw.println("=================== NANOAPPS ====================");
// Dump nanoAppHash
for (Integer nanoAppInstance: mNanoAppHash.keySet()) {
pw.println(nanoAppInstance + " : " + mNanoAppHash.get(nanoAppInstance).toString());
}
// dump eventLog
}
private void checkPermissions() {
mContext.enforceCallingPermission(HARDWARE_PERMISSION, ENFORCE_HW_PERMISSION_MESSAGE);
}
@@ -212,16 +238,16 @@ public class ContextHubService extends IContextHubService.Stub {
return -1;
}
synchronized(this) {
synchronized (this) {
if (mCallback != null) {
ContextHubMessage msg = new ContextHubMessage(header[MSG_FIELD_TYPE],
header[MSG_FIELD_VERSION],
data);
header[MSG_FIELD_VERSION],
data);
try {
mCallback.onMessageReceipt(header[MSG_FIELD_HUB_HANDLE],
header[MSG_FIELD_APP_INSTANCE],
msg);
header[MSG_FIELD_APP_INSTANCE],
msg);
} catch (Exception e) {
Log.w(TAG, "Exception " + e + " when calling remote callback");
return -1;

27
core/java/android/hardware/location/MemoryRegion.java
View File

@@ -78,6 +78,33 @@ public class MemoryRegion implements Parcelable{
return mIsExecutable;
}
@Override
public String toString() {
String mask = "";
if (isReadable()) {
mask += "r";
} else {
mask += "-";
}
if (isWritable()) {
mask += "w";
} else {
mask += "-";
}
if (isExecutable()) {
mask += "x";
} else {
mask += "-";
}
String retVal = "[ " + mSizeBytesFree + "/ " + mSizeBytes + " ] : " + mask;
return retVal;
}
@Override
public int describeContents() {
return 0;

10
core/java/android/hardware/location/NanoApp.java
View File

@@ -284,4 +284,14 @@ public class NanoApp {
return new NanoApp[size];
}
};
@Override
public String toString() {
String retVal = "Id : " + mAppId;
retVal += ", Version : " + mAppVersion;
retVal += ", Name : " + mName;
retVal += ", Publisher : " + mPublisher;
return retVal;
}
}

11
core/java/android/hardware/location/NanoAppInstanceInfo.java
View File

@@ -320,4 +320,15 @@ public class NanoAppInstanceInfo {
return new NanoAppInstanceInfo[size];
}
};
@Override
public String toString() {
String retVal = "handle : " + mHandle;
retVal += ", Id : 0x" + Long.toHexString(mAppId);
retVal += ", Version : " + mAppVersion;
retVal += ", Name : " + mName;
retVal += ", Publisher : " + mPublisher;
return retVal;
}
}

7
core/jni/android_hardware_location_ContextHubService.cpp
View File

@@ -382,6 +382,9 @@ int handle_os_message(uint32_t msgType, uint32_t hubHandle,
char *msg, int msgLen) {
int retVal;
//ALOGD("Rcd OS message from hubHandle %" PRIu32 " type %" PRIu32 " length %d",
// hubHandle, msgType, msgLen);
switch(msgType) {
case CONTEXT_HUB_APPS_ENABLE:
retVal = 0;
@@ -633,7 +636,7 @@ static jint nativeSendMessage(JNIEnv *env, jobject instance, jintArray header_,
if (numHeaderElements >= MSG_HEADER_SIZE) {
int setAddressSuccess;
bool setAddressSuccess;
int hubId;
hub_message_t msg;
@@ -654,7 +657,7 @@ static jint nativeSendMessage(JNIEnv *env, jobject instance, jintArray header_,
ALOGD("Could not find app instance %d on hubHandle %d, setAddress %d",
header[HEADER_FIELD_APP_INSTANCE],
header[HEADER_FIELD_HUB_HANDLE],
setAddressSuccess);
(int)setAddressSuccess);
}
} else {
ALOGD("Malformed header len");