Commit Graph

6957 Commits

Author SHA1 Message Date
Elliott Hughes 260854c0b0 am ed20fef0: am a99f0b6e: am 5b8daae0: am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"
* commit 'ed20fef0630d02395abab6a073a5717ddfbfaa8d':
  Pixelflinger: Fix issue of pointers being stored in ints
2013-12-12 21:33:04 +00:00
Elliott Hughes ed20fef063 am a99f0b6e: am 5b8daae0: am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"
* commit 'a99f0b6e386f71ecfb8aca429693b4b44e346be4':
  Pixelflinger: Fix issue of pointers being stored in ints
2013-12-12 21:30:40 +00:00
Elliott Hughes a99f0b6e38 am 5b8daae0: am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"
* commit '5b8daae0440330097ed9d5f7bee24eea0ac0bb31':
  Pixelflinger: Fix issue of pointers being stored in ints
2013-12-12 21:28:02 +00:00
Elliott Hughes 5b8daae044 am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"
* commit 'a67b39cb612744764ad9cd9a78aabd6b5742a384':
  Pixelflinger: Fix issue of pointers being stored in ints
2013-12-12 13:25:36 -08:00
Elliott Hughes a67b39cb61 Merge "Pixelflinger: Fix issue of pointers being stored in ints" 2013-12-12 21:22:33 +00:00
Narayan Kamath 79582f1a61 am b4d662dc: am de39957b: am 3a5ab80d: am 7d92b7cc: Merge "Get rid of some log spam."
* commit 'b4d662dc0acaa1c7b00fe278222d1acfb4e5695f':
  Get rid of some log spam.
2013-12-12 17:31:41 +00:00
Ashok Bhat d10afb1748 Pixelflinger: Fix issue of pointers being stored in ints
Pixelflinger's code makes assumptions, at certain places,
that pointers can be stored as ints. This patch makes use
of uintptr_t wherever pointers are stored as int or cast
to int.

Change-Id: Ie76f425cbc82ac038a747f77a95bd31774f4a8e8
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-12 17:30:13 +00:00
Narayan Kamath b4d662dc0a am de39957b: am 3a5ab80d: am 7d92b7cc: Merge "Get rid of some log spam."
* commit 'de39957ba115b1e31b3b991fa09c958a0ba601c5':
  Get rid of some log spam.
2013-12-12 17:29:07 +00:00
Narayan Kamath de39957ba1 am 3a5ab80d: am 7d92b7cc: Merge "Get rid of some log spam."
* commit '3a5ab80d0f2a70b2e39ffcc6eebf876b04ff5cdd':
  Get rid of some log spam.
2013-12-12 17:27:53 +00:00
Narayan Kamath 3a5ab80d0f am 7d92b7cc: Merge "Get rid of some log spam."
* commit '7d92b7cc6580285ab7f8ef86be7512eafda89354':
  Get rid of some log spam.
2013-12-12 09:25:29 -08:00
Narayan Kamath 7d92b7cc65 Merge "Get rid of some log spam." 2013-12-12 17:19:40 +00:00
Narayan Kamath f6a196522a Get rid of some log spam.
We don't need a warning if an entry isn't found in a zip
file. It can happen as part of normal operation.

Change-Id: I86c132a040371f36f0dd981b49c02b3173821439
2013-12-12 10:29:31 +00:00
Nick Kralevich 2f06ba6122 am bfb1d8a2: am af9e9d97: am f0a68b54: am 8779c4ea: Merge "Minor cleanups."
* commit 'bfb1d8a27532180dd08fc48190aed464abbdd8b8':
  Minor cleanups.
2013-12-11 23:05:12 +00:00
Nick Kralevich bfb1d8a275 am af9e9d97: am f0a68b54: am 8779c4ea: Merge "Minor cleanups."
* commit 'af9e9d97ee7a53fd5f315ac16b63cc41a3207c33':
  Minor cleanups.
2013-12-11 22:56:29 +00:00
Nick Kralevich af9e9d97ee am f0a68b54: am 8779c4ea: Merge "Minor cleanups."
* commit 'f0a68b54be5ba78466a7075a6d9a72438c25e645':
  Minor cleanups.
2013-12-11 22:53:39 +00:00
Nick Kralevich f0a68b54be am 8779c4ea: Merge "Minor cleanups."
* commit '8779c4eab43956ecf626bbece3f6f3bc54970d6a':
  Minor cleanups.
2013-12-11 14:50:20 -08:00
Nick Kralevich 8779c4eab4 Merge "Minor cleanups." 2013-12-11 22:46:35 +00:00
Narayan Kamath f5f50b727c am 5d7cd375: am bac8ae4d: am 841ef3bd: am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."
* commit '5d7cd375e853aca670d01d92308f178145e0d0e8':
  Use FileMap from libcutil instead of rolling our own.
2013-12-11 21:09:54 +00:00
Narayan Kamath 5d7cd375e8 am bac8ae4d: am 841ef3bd: am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."
* commit 'bac8ae4d1de90e4d01f3782465a02e1ef989e030':
  Use FileMap from libcutil instead of rolling our own.
2013-12-11 21:06:37 +00:00
Narayan Kamath bac8ae4d1d am 841ef3bd: am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."
* commit '841ef3bd2081a74bf95be83211e92a653df61541':
  Use FileMap from libcutil instead of rolling our own.
2013-12-11 21:02:22 +00:00
Narayan Kamath 841ef3bd20 am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."
* commit 'bcf1454cf6a2fadc30c5189c3756b3cb96149745':
  Use FileMap from libcutil instead of rolling our own.
2013-12-11 09:40:03 -08:00
Narayan Kamath bcf1454cf6 Merge "Use FileMap from libcutil instead of rolling our own." 2013-12-11 17:33:58 +00:00
Narayan Kamath eaf988532b Use FileMap from libcutil instead of rolling our own.
Adds windows support as a side effect.

Change-Id: I912c1f980f284d01d4f3936291999646ddf6250a
2013-12-11 15:17:06 +00:00
Sasha Levitskiy 1dd77487ab Merge "Getevent: make sure the monotonic timestamp is displayed; warning cleanup." 2013-12-11 02:43:08 +00:00
Todd Poynor cd7c10438a healthd: charger mode dump previous console from pstore
Change-Id: Id65ffe4f80aa870a1d1f3f3d67c3bb687490c27f
2013-12-10 22:22:43 +00:00
Todd Poynor 4b2a57697d am fc092653: (-s ours) am 0af90f6f: (-s ours) charger: dump pstore ram console DO NOT MERGE
* commit 'fc092653856579437da9807aea2567e90a2ffb09':
  charger: dump pstore ram console DO NOT MERGE
2013-12-10 22:05:21 +00:00
Todd Poynor fc09265385 am 0af90f6f: (-s ours) charger: dump pstore ram console DO NOT MERGE
* commit '0af90f6f750300e54409c251682e86d90401d0ab':
  charger: dump pstore ram console DO NOT MERGE
2013-12-10 22:01:40 +00:00
Todd Poynor 0af90f6f75 charger: dump pstore ram console DO NOT MERGE
Change-Id: I7f612d49418272e2ac867f64c10149ad616391cd
2013-12-10 21:58:34 +00:00
Mark Salyzyn aa25ede607 Merge "adb: deprecate legacy log service interface" 2013-12-10 21:21:11 +00:00
Nick Kralevich 3909b78f2c am 81b488e6: am a91a47c3: am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit '81b488e6876ca5af1258473c244b4b64036fb458':
  Fix overflow in adb_client
2013-12-10 21:09:07 +00:00
Nick Kralevich 81b488e687 am a91a47c3: am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'a91a47c30c7c6672137d5f43cffe87ed34dae04a':
  Fix overflow in adb_client
2013-12-10 20:47:21 +00:00
Nick Kralevich a91a47c30c am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'b2dfa7ece7fb69d2ce5ae517eb35492beb646385':
  Fix overflow in adb_client
2013-12-10 12:42:20 -08:00
Mark Salyzyn c66a7537df adb: deprecate legacy log service interface
Change-Id: If96019cc13b3d7a4dcd7785c7137e0cbcc622981
2013-12-10 12:39:40 -08:00
Nick Kralevich b2dfa7ece7 am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit '02d90b92ce65ad4e7f49565f0e97373e1d8b0fbf':
  Fix overflow in adb_client
2013-12-10 12:39:32 -08:00
Nick Kralevich 02d90b92ce am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit '33e7f915d6a27880dd4c4c0709dcc921f549eea2':
  Fix overflow in adb_client
2013-12-10 12:37:32 -08:00
Nick Kralevich 33e7f915d6 am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit '54a80bcf88060b21f527c631c7ec911171bdb13f':
  Fix overflow in adb_client
2013-12-10 12:31:17 -08:00
Nick Kralevich 54a80bcf88 am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'cd072e94cf7e546cd6d333cd65641edcd69402b7':
  Fix overflow in adb_client
2013-12-10 12:29:05 -08:00
Nick Kralevich cd072e94cf am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'ba104fb7f1f0acad99a0d3a1cf7153aab57ea450':
  Fix overflow in adb_client
2013-12-10 12:25:59 -08:00
Nick Kralevich ba104fb7f1 am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'e975716e36c9ad6aa80be2b54ee2cc63eadbdc44':
  Fix overflow in adb_client
2013-12-10 12:22:50 -08:00
Nick Kralevich e975716e36 am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit '03d4eb29003a712c28733646588fafc8939fc1fe':
  Fix overflow in adb_client
2013-12-10 12:20:08 -08:00
Nick Kralevich 03d4eb2900 am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'd63fb078aea697c536b19c03d29d4dde4ac087fc':
  Fix overflow in adb_client
2013-12-10 12:17:45 -08:00
Nick Kralevich d63fb078ae am e89e09dd: Fix overflow in adb_client
* commit 'e89e09dd2b9b42184973e3ade291186a2737bced':
  Fix overflow in adb_client
2013-12-10 12:14:44 -08:00
Nick Kralevich e89e09dd2b Fix overflow in adb_client
Change-Id: I7f8582bd8a69d61ce47d11a9ffd0e901fc371037
Credit: Joshua Drake
Bug: 12060953
2013-12-10 10:18:10 -08:00
Narayan Kamath 2810cb2b27 am 03560967: am 44eb1357: am a183f45f: Merge "Add unit tests for libziparchive."
* commit '03560967709ca25f8086c793b568f5c82651d0d6':
  Add unit tests for libziparchive.
2013-12-10 18:06:53 +00:00
Narayan Kamath 0356096770 am 44eb1357: am a183f45f: Merge "Add unit tests for libziparchive."
* commit '44eb13570f7c60c5bd4d92f1c9c9c0ea567cf8e4':
  Add unit tests for libziparchive.
2013-12-10 18:03:49 +00:00
Narayan Kamath 44eb13570f am a183f45f: Merge "Add unit tests for libziparchive."
* commit 'a183f45f7aaee721a9c1cde14cdd47e47a1592e4':
  Add unit tests for libziparchive.
2013-12-10 09:58:08 -08:00
Narayan Kamath b0e08c0d81 am 9fde6246: am 0c2e454c: am 404c5408: Merge "Fix return code for ended iteration."
* commit '9fde6246f84967914e0820895863bd7011058d1c':
  Fix return code for ended iteration.
2013-12-10 17:56:02 +00:00
Nick Kralevich 81fcdd250e am b470d404: am b988e95c: am 6fec3a23: Merge "Log a warning on services that lack SELinux domains."
* commit 'b470d404e58bbe89c5c2822120b220e45ff72b42':
  Log a warning on services that lack SELinux domains.
2013-12-10 17:56:01 +00:00
Qiwen Zhao 11905774ec am d5d68f12: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit 'd5d68f12f524c710a42625ec17261c822bc96acd':
2013-12-10 17:56:01 +00:00
Narayan Kamath 9fde6246f8 am 0c2e454c: am 404c5408: Merge "Fix return code for ended iteration."
* commit '0c2e454cf4945233ec3ddb106a2e74bb23805f74':
  Fix return code for ended iteration.
2013-12-10 17:54:02 +00:00