Commit Graph

10242 Commits

Author SHA1 Message Date
Andrew Hsieh
fcc2452b51 Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S." 2012-08-28 23:08:56 -07:00
Raphael Moll
4d64923bb8 Windows USB Driver for generic + Q, rev 7.
(Cherry-picked from master c9533ad3cf)

Change-Id: Ia18fe5f08a6e2c6040e61f3105cff71cb3f4f8e5
2012-08-28 13:23:47 -07:00
Chao-Ying Fu
75f8d8217e Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
Change-Id: I9b2d28c7c189d0f3a2ded694fadd0380cfd8e6e5
2012-08-28 13:21:42 -07:00
Adam Koch
a4877aed76 Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom) -Use copied AsyncTask from system (to keep behavior consistent) -Ensure no strict mode violations or lint errors -Other misc bug fixes -Move single-use static methods in Utils to corresponding class" into jb-dev 2012-08-28 07:42:11 -07:00
The Android Open Source Project
0c8806a484 Reconcile with jb-mr0-release - do not merge
Change-Id: Iaa7372f223059e828c2f256c83b8d6e7d39bd74a
2012-08-27 14:11:00 -07:00
The Android Automerger
bda8a3659a merge in jb-mr0-release history after reset to jb-dev 2012-08-23 21:30:13 -07:00
Adam Koch
03ceb37f79 Updating code sample for "displaying bitmaps efficiently" training class.
Changes:
 -Use updated versions of ImageWorker & ImageCache from I/O 2012 app
 -Use copied DiskLruCache from system (rather than custom)
 -Use copied AsyncTask from system (to keep behavior consistent)
 -Ensure no strict mode violations or lint errors
 -Other misc bug fixes
 -Move single-use static methods in Utils to corresponding class

Change-Id: If21e045db1e1a80391169f3c9c9258d48345ab6b
2012-08-23 16:41:05 -04:00
Andrew Hsieh
82043724c4 am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
* commit '9cf4d01b7c46401ba632db2efa471bb262bc30aa':
  Support asm/sockios.h for MIPS.
2012-08-22 16:52:58 -07:00
Andrew Hsieh
9cf4d01b7c am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
* commit '51f72cc1bdd6f2624d5d625716ca3767cd3c3a63':
  Support asm/sockios.h for MIPS.
2012-08-22 16:51:01 -07:00
Andrew Hsieh
51f72cc1bd Merge "Support asm/sockios.h for MIPS." 2012-08-22 16:38:02 -07:00
Roman Nurik
e7df2e3f6e am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
* commit 'f6457d0548f499f77c996d13cc43115e448aa437':
  Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-22 16:21:36 -07:00
Chao-Ying Fu
4cad8d6fdf Support asm/sockios.h for MIPS.
Change-Id: I5ae75b0a8c2ff5698ca46f02bb371e710fb1fee0
2012-08-22 13:37:26 -07:00
Roman Nurik
f6457d0548 Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev 2012-08-22 11:50:43 -07:00
Roman Nurik
d80ee02011 Retroactively add EffectiveNavigation and TabCompat sample code.
This sample code was launched with the Implementing Effective Navigation and
Creating Backward-Compatible UIs training classes, but the source was never
added to AOSP. This retroactively adds the source, unmodified.

Change-Id: If6face5a0548107f7fd273e466b1ced2790f4f3a
2012-08-22 08:05:28 -07:00
Andrew Hsieh
c80c3a8fd8 am 17f2af7e: am a2b32b34: Merge "Update malloc.h"
* commit '17f2af7e1f08440814ade84898f6506e15fea15c':
  Update malloc.h
2012-08-22 01:21:14 -07:00
Andrew Hsieh
17f2af7e1f am a2b32b34: Merge "Update malloc.h"
* commit 'a2b32b34220a1bdea566502da1e3254c90f62f16':
  Update malloc.h
2012-08-22 01:19:57 -07:00
Andrew Hsieh
a2b32b3422 Merge "Update malloc.h" 2012-08-22 01:08:42 -07:00
Andrew Hsieh
68d8ac7ce5 am ad00822f: am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
* commit 'ad00822fd4b907da9162c9c1497bebc534c95315':
  Support getrlimit and setrlimit for MIPS.
2012-08-21 19:57:15 -07:00
Andrew Hsieh
9f4549c7db am bfb39384: am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
* commit 'bfb393846b99f4c5f7f3c5a661b64985cda39c78':
  Add a .note.android.ident section to Android ELF binaries
2012-08-21 19:57:14 -07:00
Andrew Hsieh
ad00822fd4 am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
* commit '581a749fb1c313dcc3d80303bcc9e129e89fdec1':
  Support getrlimit and setrlimit for MIPS.
2012-08-21 19:55:57 -07:00
Andrew Hsieh
bfb393846b am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
* commit '143949daba4c1f040753a9456a5e8d7e505e5045':
  Add a .note.android.ident section to Android ELF binaries
2012-08-21 19:55:56 -07:00
Andrew Hsieh
581a749fb1 Merge "Support getrlimit and setrlimit for MIPS." 2012-08-21 19:48:50 -07:00
Andrew Hsieh
143949daba Merge "Add a .note.android.ident section to Android ELF binaries" 2012-08-21 19:48:16 -07:00
Andrew Hsieh
d8326f3e34 am 6395d994: am d27250b2: Merge "Support poll for MIPS."
* commit '6395d9941e681ea4b1ebdd5a1d099ca6177c51bd':
  Support poll for MIPS.
2012-08-21 17:31:46 -07:00
Andrew Hsieh
6395d9941e am d27250b2: Merge "Support poll for MIPS."
* commit 'd27250b2635ad3d115983f7308cfd87ee2c3a056':
  Support poll for MIPS.
2012-08-21 17:29:12 -07:00
Chao-Ying Fu
9f49f16bdf Support getrlimit and setrlimit for MIPS.
Change-Id: Iff030a0eb2444bd1ba75dff9ba6b76c7cf9e0e7d
2012-08-21 17:24:01 -07:00
Andrew Hsieh
d27250b263 Merge "Support poll for MIPS." 2012-08-21 17:17:57 -07:00
Chao-Ying Fu
4cd3283046 Support poll for MIPS.
Change-Id: I1299817ea06c9f9ff5701dce0c6166370ef9e87d
2012-08-21 15:27:38 -07:00
Andrew Hsieh
fc638f96ae Add a .note.android.ident section to Android ELF binaries
See related CL:
  https://android-review.googlesource.com/#/c/37590

Change-Id: I1d5ab2f754731e9995061de560389c0efa121dea
2012-08-21 18:50:08 +08:00
Andrew Hsieh
75dc23dfef am ef423edc: am e3cfaa6d: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
* commit 'ef423edc2c4123db56dff07d809652c6234873be':
  Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:29:13 -07:00
Andrew Hsieh
ef423edc2c am e3cfaa6d: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
* commit 'e3cfaa6d4251136ad6f3221d881ac12786169663':
  Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:27:39 -07:00
Andrew Hsieh
e3cfaa6d42 Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS" 2012-08-21 03:25:11 -07:00
Andrew Hsieh
58a4918b94 Update malloc.h
Remove functions never implemented in bionic from malloc.h

Related CLs:
  https://android-review.googlesource.com/#/c/41728
  https://android-review.googlesource.com/#/c/41731
  https://android-review.googlesource.com/#/c/41717

Change-Id: I06639071e3fb442e2389a932382a88a7318606b9
2012-08-21 18:18:00 +08:00
Andrew Hsieh
a5280d312d Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
Those are C funcitons

Change-Id: I8f481f29b278b8f28d9ce04635d0f04e9e148cb5
2012-08-21 10:41:51 +08:00
Andrew Hsieh
2f05a2da37 am 459e3389: am 99791042: Merge "Support fcntl for MIPS with different cmd."
* commit '459e3389fdd0ecd0bc94dd4f6650fbb0f8d5499c':
  Support fcntl for MIPS with different cmd.
2012-08-20 19:27:22 -07:00
Andrew Hsieh
459e3389fd am 99791042: Merge "Support fcntl for MIPS with different cmd."
* commit '99791042b17e0d20adafe3d14a3197306520beb2':
  Support fcntl for MIPS with different cmd.
2012-08-20 19:24:54 -07:00
Andrew Hsieh
99791042b1 Merge "Support fcntl for MIPS with different cmd." 2012-08-20 19:16:35 -07:00
Chao-Ying Fu
5f79ffb271 Support fcntl for MIPS with different cmd.
Change-Id: I8d180ab9e18d69f0fd2748ad317319b691a86f35
2012-08-20 18:08:30 -07:00
Andrew Hsieh
7ffead69aa am 16fc5540: am 57d7c468: Merge "Fix flags to *_PORTABLE in open_portable(), and support openat_portable()."
* commit '16fc554082d640fd051e703115ecdf9753a03ffc':
  Fix flags to *_PORTABLE in open_portable(), and support openat_portable().
2012-08-20 17:33:38 -07:00
Andrew Hsieh
16fc554082 am 57d7c468: Merge "Fix flags to *_PORTABLE in open_portable(), and support openat_portable()."
* commit '57d7c46837c8a0a64e8b339d45fdc2ebd09648d5':
  Fix flags to *_PORTABLE in open_portable(), and support openat_portable().
2012-08-20 17:31:53 -07:00
Andrew Hsieh
57d7c46837 Merge "Fix flags to *_PORTABLE in open_portable(), and support openat_portable()." 2012-08-20 17:28:46 -07:00
Chao-Ying Fu
1d34dd0c27 Fix flags to *_PORTABLE in open_portable(), and support openat_portable().
Change-Id: Ib889899250fdfc6e7caded2506228f640fcdff3a
2012-08-20 17:07:27 -07:00
Andrew Hsieh
02fb9c0f99 am c8ad44c4: am 4d39411f: Merge "Support mprotect."
* commit 'c8ad44c4f3226c1e3669dd39c001976f550923be':
  Support mprotect.
2012-08-20 16:29:46 -07:00
Andrew Hsieh
c8ad44c4f3 am 4d39411f: Merge "Support mprotect."
* commit '4d39411f7d41e3c931f8be6b1455ba9627fa71b9':
  Support mprotect.
2012-08-20 16:27:38 -07:00
Andrew Hsieh
4d39411f7d Merge "Support mprotect." 2012-08-20 16:26:07 -07:00
Chao-Ying Fu
f43f982232 Support mprotect.
Change-Id: Ic786eb35f69d44379129faec02b1023ab2c3282a
2012-08-20 16:02:41 -07:00
Jean-Baptiste Queru
10d5a0885d am c2d80e96: am 90b4e80e: Merge "Update path to telephonytests directory."
* commit 'c2d80e96922c9cad7831c6c951f7be949faf37f9':
  Update path to telephonytests directory.
2012-08-20 10:28:14 -07:00
Jean-Baptiste Queru
c2d80e9692 am 90b4e80e: Merge "Update path to telephonytests directory."
* commit '90b4e80ee9193884a6e53410770f6022110bea3c':
  Update path to telephonytests directory.
2012-08-20 10:26:28 -07:00
Jean-Baptiste Queru
90b4e80ee9 Merge "Update path to telephonytests directory." 2012-08-20 10:20:55 -07:00
Jean-Baptiste Queru
8d6a35c1ca am f36d0119: am f2b91719: Merge "Fix Eclipse .classpath file for JB."
* commit 'f36d011911afcfb7e774da3d23f0a8583e24429b':
  Fix Eclipse .classpath file for JB.
2012-08-20 10:12:16 -07:00