Commit Graph

51505 Commits

Author SHA1 Message Date
Jeff Davidson eb329c07c1 am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6.""
* commit '83f14309f17af398ec8ff7f82d9b2f010ea7cd5f':
  Revert "Update protobuf library from 2.3 to 2.6."
2015-01-12 20:10:05 +00:00
Jeff Davidson 83f14309f1 Merge "Revert "Update protobuf library from 2.3 to 2.6."" 2015-01-12 20:00:51 +00:00
Jeff Davidson bca4262dac Revert "Update protobuf library from 2.3 to 2.6."
This reverts commit a42cdf1690.

Change-Id: I8f75e6fcc921041ebdfd35c4724134fcb2c739c6
2015-01-12 20:00:33 +00:00
Jeff Davidson 7581a96bfd am 9200d4e3: Merge "Update protobuf library from 2.3 to 2.6."
* commit '9200d4e3bf0bf9bf21d9bb335e04818364bf12a8':
  Update protobuf library from 2.3 to 2.6.
2015-01-12 19:46:11 +00:00
Jeff Davidson 9200d4e3bf Merge "Update protobuf library from 2.3 to 2.6." 2015-01-12 19:37:20 +00:00
Christopher Ferris d8dc9405c3 am 4f9bfffe: Merge "Fix message when a command times out."
* commit '4f9bfffe23d40fdaabe91ea7c7691e52800edb79':
  Fix message when a command times out.
2015-01-12 18:48:23 +00:00
Christopher Ferris 4f9bfffe23 Merge "Fix message when a command times out." 2015-01-12 18:41:07 +00:00
Rachad 2f70741547 am 806f23de: OpenMax IL: Added support for E-AC3 codec configuration params
* commit '806f23de71be2494cfabbe08d11c09606966a5d5':
  OpenMax IL: Added support for E-AC3 codec configuration params
2015-01-10 02:00:07 +00:00
Christopher Ferris 67c5a8af9e Fix message when a command times out.
The previous version printed out the nanoseconds elapsed, not seconds.

Change-Id: I10f6d7bf7b7a4647658313ed83781fda6fd744a5
2015-01-09 16:42:56 -08:00
Elliott Hughes 23958e1436 am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the openssl headers."
* commit 'a7dcab6954467fa3726824a099b83d0e7490d6d5':
  We have POSIX clocks, and we don't need to ask for the openssl headers.
2015-01-10 00:14:12 +00:00
Elliott Hughes a7dcab6954 Merge "We have POSIX clocks, and we don't need to ask for the openssl headers." 2015-01-10 00:03:46 +00:00
Elliott Hughes 5ea47f7a32 We have POSIX clocks, and we don't need to ask for the openssl headers.
This code doesn't need to run on the Mac, and the BoringSSL transition
will be easier without references to external/openssl.

Change-Id: I14ea11fa2911af0f4e95e69636e6a2c26126cbe0
2015-01-09 15:56:15 -08:00
Jeff Davidson a42cdf1690 Update protobuf library from 2.3 to 2.6.
Remove generated cpp/h files for gltrace.proto as we can use the build
system to generate these dynamically.

Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
2015-01-08 16:12:02 -08:00
Andreas Gampe ee7ed02077 am 96e4409e: Merge "Installd: Disallow relocation for decryption"
* commit '96e4409e8c38b1d79285eca9886d44ff850b5748':
  Installd: Disallow relocation for decryption
2015-01-07 22:12:26 +00:00
Andreas Gampe 96e4409e8c Merge "Installd: Disallow relocation for decryption" 2015-01-07 22:04:29 +00:00
neo.chae 14e084d39a Installd: Disallow relocation for decryption
When decrypting a device, a tmpfs is temporarily mounted as /data,
the size of which is usually small. When the zygote, system server
and necessary apps are brought up, they will be compiled into the
tmpfs.

If the system image contains prebuilts, they will be relocated instead
of compiled. This is unnecessary. In this special situation it is
acceptable to run out of the prebuilt oat files without relocation,
which can save space in the tmpfs.

This patch ensures that apps are not being relocated.

Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
2015-01-07 22:03:07 +00:00
Narayan Kamath 106547c1e3 am 033f7e8e: Merge "InputDispatcher: Optimize count()"
* commit '033f7e8e35ac76404fe823a67e07ba7c42bc357c':
  InputDispatcher: Optimize count()
2014-12-24 10:32:20 +00:00
Narayan Kamath 033f7e8e35 Merge "InputDispatcher: Optimize count()" 2014-12-24 10:25:43 +00:00
Rachad 806f23de71 OpenMax IL: Added support for E-AC3 codec configuration params
Bug: 17883772
Change-Id: Ibf00534607db4bba14c935cf1eaa80eb740297f9
2014-12-23 16:04:59 -08:00
Andreas Gampe 4fb9f9377e am d3255076: Merge "Installd: Swap file for dex2oat"
* commit 'd325507698d8379e431a8c8fefcfafe59956bd88':
  Installd: Swap file for dex2oat
2014-12-22 18:39:37 +00:00
Andreas Gampe d325507698 Merge "Installd: Swap file for dex2oat" 2014-12-22 18:30:58 +00:00
Brian Carlstrom 21def9a0a5 am 42740668: (-s ours) Merge "Installd: Swap file for dex2oat" into lmp-mr1-dev
* commit '42740668423d6cd9d0a3b406c3e5c160dbbdabca':
  Installd: Swap file for dex2oat
2014-12-19 04:24:04 +00:00
Riley Andrews 68047ffd43 am 53186a4d: Merge "Add binder tests"
* commit '53186a4d78479ba21213b6e055c7a85faeb318e2':
  Add binder tests
2014-12-19 03:52:36 +00:00
Riley Andrews bf247a3d37 am dbd252ea: Merge "Add binder driver interface test"
* commit 'dbd252eab09d669a7d4b917890d75408193a85d3':
  Add binder driver interface test
2014-12-19 03:52:35 +00:00
Andreas Gampe e1c01353c4 Installd: Swap file for dex2oat
Add swap file support for dex2oat to installd. Only use in low-memory
mode.

Bug: 18596910

(cherry picked from commit f68ce4de7f)

Change-Id: I131448f3907115054a592af73db86d2b9257ea33
2014-12-18 17:23:34 -08:00
Riley Andrews 53186a4d78 Merge "Add binder tests" 2014-12-19 00:39:40 +00:00
Riley Andrews 06b01adcb8 Add binder tests
Change-Id: Ib0b38708dd6387fc4d5a4857ca74a217f3edad1a
2014-12-19 00:39:31 +00:00
Riley Andrews dbd252eab0 Merge "Add binder driver interface test" 2014-12-19 00:38:41 +00:00
Riley Andrews dc9b148985 Add binder driver interface test
Test ioctls and some binder commands without using libbinder.

Change-Id: I86dde56ff1380bca17d086021ac5324dc5210354
2014-12-19 00:38:27 +00:00
Brian Carlstrom 4274066842 Merge "Installd: Swap file for dex2oat" into lmp-mr1-dev 2014-12-19 00:38:07 +00:00
Andreas Gampe f68ce4de7f Installd: Swap file for dex2oat
Add swap file support for dex2oat to installd. Only use in low-memory
mode.

Bug: 18596910
Change-Id: I131448f3907115054a592af73db86d2b9257ea33
2014-12-18 16:28:39 -08:00
Andreas Gampe 37321282ec am 1be4021c: Merge "Installd: Remove dalvik paths"
* commit '1be4021c2a867c7e067a3c5b937a054f0eb7817f':
  Installd: Remove dalvik paths
2014-12-16 20:34:31 +00:00
Andreas Gampe 1be4021c2a Merge "Installd: Remove dalvik paths" 2014-12-16 02:29:12 +00:00
Andreas Gampe bd872e4956 Installd: Remove dalvik paths
Dalvik is dead. Dexopt is dead.

Change-Id: I9ff6b638a3e2c52ae7aec33d7b08a7bee012854f
2014-12-15 11:41:11 -08:00
Mathieu Chartier 714a2cd398 am 472d2afb: Increase growth limit from 64m to 80m for 1024mb hdpi tablet
* commit '472d2afb19b8194075d72c318e01a4760e5dbe82':
  Increase growth limit from 64m to 80m for 1024mb hdpi tablet
2014-12-12 14:41:23 +00:00
Chih-Hung Hsieh 2965dab909 am bceb29c8: Merge "Fix clang -Wc++11-narrowing warnings."
* commit 'bceb29c83ea54d38b38e40d66402e56364cff56b':
  Fix clang -Wc++11-narrowing warnings.
2014-12-11 23:02:01 +00:00
Chih-Hung Hsieh bceb29c83e Merge "Fix clang -Wc++11-narrowing warnings." 2014-12-11 22:48:18 +00:00
Chih-Hung Hsieh 3bded9177b Fix clang -Wc++11-narrowing warnings.
Clang compiler gives warning to implicit conversions of
literal structure fields, although the compiler generated
implicit conversions are what we want in these cases.

Change-Id: I8f04e7f2fa1db0ed1d1937135d9091532eec3d5b
2014-12-11 14:45:56 -08:00
Mathieu Chartier 472d2afb19 Increase growth limit from 64m to 80m for 1024mb hdpi tablet
Prevents apps hitting oome due to old linear alloc objects being
allocated in the java heap causing the heap to be larger than it
used to be.

Bug: 18707227

Change-Id: Ia49a7e6b24ae9fba1961d600d4599c17313b556b
2014-12-11 13:40:37 -08:00
Dmitriy Ivanov d9799072de resolved conflicts for merge of e9b6f1f7 to lmp-mr1-dev-plus-aosp
Change-Id: I87618573198d1f476b1680dbf9163a7dc90a66f8
2014-12-10 16:10:44 -08:00
Dmitriy Ivanov e9b6f1f7bb Switch to libsigchain.a
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
  to export symbols from the static library.

(cherry picked from commit 4340a14fbf)

Bug: 18701723
Change-Id: I70f6fdb64b0d1adbadf96c8de85870a903ec186a
2014-12-10 10:28:50 -08:00
Andreas Gampe b93bca5d08 am a59d7a6a: Merge "GUI: Remove unused variables"
* commit 'a59d7a6a66a2b8dcb2d00dbd6371fa89ae45ab04':
  GUI: Remove unused variables
2014-12-09 20:09:18 +00:00
Andreas Gampe a59d7a6a66 Merge "GUI: Remove unused variables" 2014-12-09 19:57:05 +00:00
Dan Stoza 807f94409f am e22262ff: (-s ours) Merge "libgui: Enable -Weverything and -Werror"
* commit 'e22262ffd0bbed53e6d964f2fbcd5ecd85c04403':
  libgui: Enable -Weverything and -Werror
2014-12-09 13:18:36 +00:00
Andreas Gampe 5d11a72bcd am 8fd567b1: Merge "Libui: Remove unused variables"
* commit '8fd567b127170a3962bc9de637eb7987cee71810':
  Libui: Remove unused variables
2014-12-09 11:25:32 +00:00
Andreas Gampe 7398a5af38 GUI: Remove unused variables
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: I79fdcf830683d7278f4bf114cfb76a26da1b88ff
2014-12-08 20:42:40 -08:00
Michael Lentine 397703119b am e329be2e: am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev
* commit 'e329be2e0004216474fe0545ab7a2cb1863d387a':
  Fix for corruption when numFds or numInts is too large.
2014-12-08 19:10:21 +00:00
Dan Stoza e22262ffd0 Merge "libgui: Enable -Weverything and -Werror" 2014-12-08 18:46:08 +00:00
Andreas Gampe 8fd567b127 Merge "Libui: Remove unused variables" 2014-12-08 18:23:15 +00:00
Andreas Gampe ff78750c64 Libui: Remove unused variables
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: Ib78912ae442ddc6410960ab1efb4fb2faa1a9208
2014-12-05 20:52:16 -08:00