Skip to content
Browse files

Merge remote branch 'upstream/gingerbread' into gingerbread

Conflicts:
	include/private/android_filesystem_config.h

Change-Id: I5b30c86ea0442e764ea35acc8e10048b7d14eae7
  • Loading branch information...
2 parents 3d4c5a9 + 073b6b1 commit e9ee5729766948ed1a1885e5558aba49675e9248 @nadlabak committed Nov 15, 2011
View
26 include/private/android_filesystem_config.h
@@ -71,10 +71,17 @@
#define AID_NET_ADMIN 3005 /* can configure interfaces and routing tables. */
#define AID_QCOM_ONCRPC 3006 /* can read/write /dev/oncrpc files */
-#define AID_MOT_ACCY 9000 /* motorola: accessory */
-#define AID_MOT_PWRIC 9001 /* motorola: power IC */
-#define AID_MOT_USB 9002 /* motorola: usb */
-#define AID_MOT_TCMD 9003 /* motorola: tcmd */
+#if defined(MOTOROLA_UIDS)
+#define AID_MOT_ACCY 9000 /* access to accessory */
+#define AID_MOT_PWRIC 9001 /* power IC */
+#define AID_MOT_USB 9002 /* mot usb */
+#define AID_MOT_DRM 9003 /* can access DRM resource. */
+#define AID_MOT_TCMD 9004 /* mot_tcmd */
+#define AID_MOT_SEC_RTC 9005 /* mot cpcap rtc */
+#define AID_MOT_TOMBSTONE 9006
+#define AID_MOT_TPAPI 9007 /* mot_tpapi */
+#define AID_MOT_SECCLKD 9008 /* mot_secclkd */
+#endif // MOTOROLA_UIDS
#define AID_MISC 9998 /* access to misc storage */
#define AID_NOBODY 9999
@@ -119,6 +126,17 @@ static const struct android_id_info android_ids[] = {
{ "inet", AID_INET, },
{ "net_raw", AID_NET_RAW, },
{ "net_admin", AID_NET_ADMIN, },
+#if defined(MOTOROLA_UIDS)
+ { "mot_accy", AID_MOT_ACCY, },
+ { "mot_pwric", AID_MOT_PWRIC, },
+ { "mot_usb", AID_MOT_USB, },
+ { "mot_drm", AID_MOT_DRM, },
+ { "mot_tcmd", AID_MOT_TCMD, },
+ { "mot_sec_rtc", AID_MOT_SEC_RTC, },
+ { "mot_tombstone", AID_MOT_TOMBSTONE, },
+ { "mot_tpapi", AID_MOT_TPAPI, },
+ { "mot_secclkd", AID_MOT_SECCLKD, },
+#endif
{ "misc", AID_MISC, },
{ "mot_accy", AID_MOT_ACCY, },
{ "mot_pwric", AID_MOT_PWRIC, },
View
2 liblog/logd_write.c
@@ -150,6 +150,8 @@ int __android_log_write(int prio, const char *tag, const char *msg)
!strcmp(tag, "KINETO") ||
!strncmp(tag, "KIPC", 4) ||
!strncmp(tag, "Kineto", 6) ||
+ !strncmp(tag, "GAN", 3) ||
+ !strcmp(tag, "NAS") ||
!strncmp(tag, "QCRIL", 5) ||
!strncmp(tag, "QC-RIL", 6) ||
!strncmp(tag, "QC-QMI", 6) ||
View
2 libpixelflinger/scanline.cpp
@@ -353,7 +353,7 @@ static void pick_scanline(context_t* c)
}
}
-#ifdef DEBUG_NEEDS
+#if DEBUG_NEEDS
LOGI("Needs: n=0x%08x p=0x%08x t0=0x%08x t1=0x%08x",
c->state.needs.n, c->state.needs.p,
c->state.needs.t[0], c->state.needs.t[1]);
View
5 libsysutils/src/FrameworkListener.cpp
@@ -101,7 +101,7 @@ void FrameworkListener::dispatchCommand(SocketClient *cli, char *data) {
}
*q = *p++;
- if (!quote && *q == ' ') {
+ if (!quote && *q == ' ' && argc<FrameworkListener::CMD_ARGS_MAX) {
*q = '\0';
argv[argc++] = strdup(tmp);
memset(tmp, 0, sizeof(tmp));
@@ -111,6 +111,9 @@ void FrameworkListener::dispatchCommand(SocketClient *cli, char *data) {
q++;
}
+ if (argc >= FrameworkListener::CMD_ARGS_MAX)
+ goto out;
+
argv[argc++] = strdup(tmp);
#if 0
for (k = 0; k < argc; k++) {

0 comments on commit e9ee572

Please sign in to comment.
Something went wrong with that request. Please try again.