Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote branch 'upstream/gingerbread' into gingerbread

Conflicts:
	include/private/android_filesystem_config.h

Change-Id: I5b30c86ea0442e764ea35acc8e10048b7d14eae7
  • Loading branch information...
commit e9ee5729766948ed1a1885e5558aba49675e9248 2 parents 3d4c5a9 + 073b6b1
Pavel authored
26 include/private/android_filesystem_config.h
@@ -71,10 +71,17 @@
71 71 #define AID_NET_ADMIN 3005 /* can configure interfaces and routing tables. */
72 72 #define AID_QCOM_ONCRPC 3006 /* can read/write /dev/oncrpc files */
73 73
74   -#define AID_MOT_ACCY 9000 /* motorola: accessory */
75   -#define AID_MOT_PWRIC 9001 /* motorola: power IC */
76   -#define AID_MOT_USB 9002 /* motorola: usb */
77   -#define AID_MOT_TCMD 9003 /* motorola: tcmd */
  74 +#if defined(MOTOROLA_UIDS)
  75 +#define AID_MOT_ACCY 9000 /* access to accessory */
  76 +#define AID_MOT_PWRIC 9001 /* power IC */
  77 +#define AID_MOT_USB 9002 /* mot usb */
  78 +#define AID_MOT_DRM 9003 /* can access DRM resource. */
  79 +#define AID_MOT_TCMD 9004 /* mot_tcmd */
  80 +#define AID_MOT_SEC_RTC 9005 /* mot cpcap rtc */
  81 +#define AID_MOT_TOMBSTONE 9006
  82 +#define AID_MOT_TPAPI 9007 /* mot_tpapi */
  83 +#define AID_MOT_SECCLKD 9008 /* mot_secclkd */
  84 +#endif // MOTOROLA_UIDS
78 85
79 86 #define AID_MISC 9998 /* access to misc storage */
80 87 #define AID_NOBODY 9999
@@ -119,6 +126,17 @@ static const struct android_id_info android_ids[] = {
119 126 { "inet", AID_INET, },
120 127 { "net_raw", AID_NET_RAW, },
121 128 { "net_admin", AID_NET_ADMIN, },
  129 +#if defined(MOTOROLA_UIDS)
  130 + { "mot_accy", AID_MOT_ACCY, },
  131 + { "mot_pwric", AID_MOT_PWRIC, },
  132 + { "mot_usb", AID_MOT_USB, },
  133 + { "mot_drm", AID_MOT_DRM, },
  134 + { "mot_tcmd", AID_MOT_TCMD, },
  135 + { "mot_sec_rtc", AID_MOT_SEC_RTC, },
  136 + { "mot_tombstone", AID_MOT_TOMBSTONE, },
  137 + { "mot_tpapi", AID_MOT_TPAPI, },
  138 + { "mot_secclkd", AID_MOT_SECCLKD, },
  139 +#endif
122 140 { "misc", AID_MISC, },
123 141 { "mot_accy", AID_MOT_ACCY, },
124 142 { "mot_pwric", AID_MOT_PWRIC, },
2  liblog/logd_write.c
@@ -150,6 +150,8 @@ int __android_log_write(int prio, const char *tag, const char *msg)
150 150 !strcmp(tag, "KINETO") ||
151 151 !strncmp(tag, "KIPC", 4) ||
152 152 !strncmp(tag, "Kineto", 6) ||
  153 + !strncmp(tag, "GAN", 3) ||
  154 + !strcmp(tag, "NAS") ||
153 155 !strncmp(tag, "QCRIL", 5) ||
154 156 !strncmp(tag, "QC-RIL", 6) ||
155 157 !strncmp(tag, "QC-QMI", 6) ||
2  libpixelflinger/scanline.cpp
@@ -353,7 +353,7 @@ static void pick_scanline(context_t* c)
353 353 }
354 354 }
355 355
356   -#ifdef DEBUG_NEEDS
  356 +#if DEBUG_NEEDS
357 357 LOGI("Needs: n=0x%08x p=0x%08x t0=0x%08x t1=0x%08x",
358 358 c->state.needs.n, c->state.needs.p,
359 359 c->state.needs.t[0], c->state.needs.t[1]);
5 libsysutils/src/FrameworkListener.cpp
@@ -101,7 +101,7 @@ void FrameworkListener::dispatchCommand(SocketClient *cli, char *data) {
101 101 }
102 102
103 103 *q = *p++;
104   - if (!quote && *q == ' ') {
  104 + if (!quote && *q == ' ' && argc<FrameworkListener::CMD_ARGS_MAX) {
105 105 *q = '\0';
106 106 argv[argc++] = strdup(tmp);
107 107 memset(tmp, 0, sizeof(tmp));
@@ -111,6 +111,9 @@ void FrameworkListener::dispatchCommand(SocketClient *cli, char *data) {
111 111 q++;
112 112 }
113 113
  114 + if (argc >= FrameworkListener::CMD_ARGS_MAX)
  115 + goto out;
  116 +
114 117 argv[argc++] = strdup(tmp);
115 118 #if 0
116 119 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.