use only string type in the log source whitelist.
+ predefined "AID_X" will be provided as string type to statsd, and we will translate
to integer uid using the static map.
Test: statsd_test
Change-Id: Ie47d8481e0c456457e6881ebb9cb4ce008e772b8
diff --git a/cmds/statsd/src/packages/UidMap.cpp b/cmds/statsd/src/packages/UidMap.cpp
index 416b87b..517d21d 100644
--- a/cmds/statsd/src/packages/UidMap.cpp
+++ b/cmds/statsd/src/packages/UidMap.cpp
@@ -402,6 +402,79 @@
return results;
}
+// Note not all the following AIDs are used as uids. Some are used only for gids.
+// It's ok to leave them in the map, but we won't ever see them in the log's uid field.
+// App's uid starts from 10000, and will not overlap with the following AIDs.
+const std::map<string, uint32_t> UidMap::sAidToUidMapping = {{"AID_ROOT", 0},
+ {"AID_SYSTEM", 1000},
+ {"AID_RADIO", 1001},
+ {"AID_BLUETOOTH", 1002},
+ {"AID_GRAPHICS", 1003},
+ {"AID_INPUT", 1004},
+ {"AID_AUDIO", 1005},
+ {"AID_CAMERA", 1006},
+ {"AID_LOG", 1007},
+ {"AID_COMPASS", 1008},
+ {"AID_MOUNT", 1009},
+ {"AID_WIFI", 1010},
+ {"AID_ADB", 1011},
+ {"AID_INSTALL", 1012},
+ {"AID_MEDIA", 1013},
+ {"AID_DHCP", 1014},
+ {"AID_SDCARD_RW", 1015},
+ {"AID_VPN", 1016},
+ {"AID_KEYSTORE", 1017},
+ {"AID_USB", 1018},
+ {"AID_DRM", 1019},
+ {"AID_MDNSR", 1020},
+ {"AID_GPS", 1021},
+ // {"AID_UNUSED1", 1022},
+ {"AID_MEDIA_RW", 1023},
+ {"AID_MTP", 1024},
+ // {"AID_UNUSED2", 1025},
+ {"AID_DRMRPC", 1026},
+ {"AID_NFC", 1027},
+ {"AID_SDCARD_R", 1028},
+ {"AID_CLAT", 1029},
+ {"AID_LOOP_RADIO", 1030},
+ {"AID_MEDIA_DRM", 1031},
+ {"AID_PACKAGE_INFO", 1032},
+ {"AID_SDCARD_PICS", 1033},
+ {"AID_SDCARD_AV", 1034},
+ {"AID_SDCARD_ALL", 1035},
+ {"AID_LOGD", 1036},
+ {"AID_SHARED_RELRO", 1037},
+ {"AID_DBUS", 1038},
+ {"AID_TLSDATE", 1039},
+ {"AID_MEDIA_EX", 1040},
+ {"AID_AUDIOSERVER", 1041},
+ {"AID_METRICS_COLL", 1042},
+ {"AID_METRICSD", 1043},
+ {"AID_WEBSERV", 1044},
+ {"AID_DEBUGGERD", 1045},
+ {"AID_MEDIA_CODEC", 1046},
+ {"AID_CAMERASERVER", 1047},
+ {"AID_FIREWALL", 1048},
+ {"AID_TRUNKS", 1049},
+ {"AID_NVRAM", 1050},
+ {"AID_DNS", 1051},
+ {"AID_DNS_TETHER", 1052},
+ {"AID_WEBVIEW_ZYGOTE", 1053},
+ {"AID_VEHICLE_NETWORK", 1054},
+ {"AID_MEDIA_AUDIO", 1055},
+ {"AID_MEDIA_VIDEO", 1056},
+ {"AID_MEDIA_IMAGE", 1057},
+ {"AID_TOMBSTONED", 1058},
+ {"AID_MEDIA_OBB", 1059},
+ {"AID_ESE", 1060},
+ {"AID_OTA_UPDATE", 1061},
+ {"AID_AUTOMOTIVE_EVS", 1062},
+ {"AID_LOWPAN", 1063},
+ {"AID_HSM", 1064},
+ {"AID_SHELL", 2000},
+ {"AID_CACHE", 2001},
+ {"AID_DIAG", 2002}};
+
} // namespace statsd
} // namespace os
} // namespace android
\ No newline at end of file