Commit Graph

50433 Commits

Author SHA1 Message Date
Mark Salyzyn
8f515ce1c5 libgui: 64 bit compile issues (part deux)
- nsecs_t printed with PRId64
- int64_t/uint64_t print issues
- some size_t printing issues.
- missing argument to BQ_LOGV

Change-Id: I493f2b578e801dc38c44f8c536faa45266720402
2014-06-09 15:42:26 -07:00
Adam Connors
cb29225a5e am 25e81681: API Review: Update managed profiles feature flag.
* commit '25e816818c1aa76c60533af9710c7f9166253e51':
  API Review: Update managed profiles feature flag.
2014-06-09 17:44:52 +00:00
Robin Lee
8400b2c6dd am 04eb4227: am c4193f1f: Merge "Migrate keychain directories to /data/misc/user/0"
* commit '04eb4227b0ee880141d6ffbf170e79b78affea15':
  Migrate keychain directories to /data/misc/user/0
2014-06-09 14:46:58 +00:00
Robin Lee
04eb4227b0 am c4193f1f: Merge "Migrate keychain directories to /data/misc/user/0"
* commit 'c4193f1fef52314b451f55cce48ce44f94b875b6':
  Migrate keychain directories to /data/misc/user/0
2014-06-09 12:51:06 +00:00
Robin Lee
c4193f1fef Merge "Migrate keychain directories to /data/misc/user/0" 2014-06-09 12:44:34 +00:00
Calin Juravle
95081df451 am fb617aa8: am 06642342: Merge "Don\'t always add profile-file option to dex2oat"
* commit 'fb617aa82ad2b6671aa1bc37afa115418cd9091c':
  Don't always add profile-file option to dex2oat
2014-06-09 10:05:06 +00:00
Calin Juravle
fb617aa82a am 06642342: Merge "Don\'t always add profile-file option to dex2oat"
* commit '066423423f04bf1c5972b1d611e01e2e17df3727':
  Don't always add profile-file option to dex2oat
2014-06-09 09:56:31 +00:00
Adam Connors
25e816818c API Review: Update managed profiles feature flag.
Feature flag renamed to FEATURE_MANAGED_PROFILES

Bug: 15025371

Change-Id: I999fd9484398da3266c7655d83e4266c2b76cf3a
(cherry picked from commit 17e4e6b62b)
2014-06-09 09:17:50 +00:00
Calin Juravle
066423423f Merge "Don't always add profile-file option to dex2oat" 2014-06-09 09:15:09 +00:00
Jesse Hall
0d7271527f am 17cbadf0: am 6fa169fa: Merge "Add aarch64 EGL/GLES trampolines"
* commit '17cbadf0f598b0d02179262ad5b6b270850ccb94':
  Add aarch64 EGL/GLES trampolines
2014-06-07 00:19:53 +00:00
Jesse Hall
17cbadf0f5 am 6fa169fa: Merge "Add aarch64 EGL/GLES trampolines"
* commit '6fa169faa955ecc47872557a5d4fd89a95190d5e':
  Add aarch64 EGL/GLES trampolines
2014-06-07 00:16:33 +00:00
Jesse Hall
6fa169faa9 Merge "Add aarch64 EGL/GLES trampolines" 2014-06-06 23:49:41 +00:00
Jesse Hall
30a41aa1cc Add aarch64 EGL/GLES trampolines
Change-Id: Ia90e18d26ff3bdb7e643aff8d77cbaddd2ac2a03
2014-06-06 16:31:53 -07:00
Calin Juravle
57c69c3964 Don't always add profile-file option to dex2oat
Add profile-file option to dex2oat only if the profiler is active and
the file exists.

Bug: 12877748
Bug: 15275634
Change-Id: Icef76514c912c88311ed108f2be7a6329131f741
2014-06-06 15:13:06 +01:00
Narayan Kamath
1bc1761d36 am 0c96c35f: am e86420e3: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."
* commit '0c96c35fe47cd84f7423f925917b5dde97155e34':
  Fix flattening/unflattening of android::Sensor.
2014-06-06 10:36:08 +00:00
Narayan Kamath
0c96c35fe4 am e86420e3: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."
* commit 'e86420e399993e0f49e5d7733b5fc87eb9fe179b':
  Fix flattening/unflattening of android::Sensor.
2014-06-06 10:33:18 +00:00
Narayan Kamath
e86420e399 Merge "Fix flattening/unflattening of android::Sensor." 2014-06-06 10:05:09 +00:00
Lajos Molnar
6445efde47 am 64f5ec51: fix compiler warning in OMX_VideoExt.h
* commit '64f5ec51ad3a9aea5a849d51139e605815b42d75':
  fix compiler warning in OMX_VideoExt.h
2014-06-06 06:58:39 +00:00
Lajos Molnar
64f5ec51ad fix compiler warning in OMX_VideoExt.h
Bug: 11969958
Change-Id: I6dbc1c5a56c5f8db0af931c9391299aaaf1b536a
2014-06-05 22:33:52 -07:00
Aravind Akella
2e7bfff5e5 am e75b7b49: Remove getRequiredPermission from NDK.
* commit 'e75b7b491e9e345801c8f3cb72bca08b0f153abf':
  Remove getRequiredPermission from NDK.
2014-06-06 02:01:09 +00:00
Aravind Akella
e75b7b491e Remove getRequiredPermission from NDK.
Bug: 15089664
Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3
(cherry picked from commit 1236710bcc)
2014-06-05 22:24:49 +00:00
wsmlby
80b3d8fce2 Merge "Add dual mode to flatland" 2014-06-05 21:16:47 +00:00
wsmlby
57c9a00616 Add dual mode to flatland
Change-Id: I3544e12c9c911cfdd73fa20d038068c9eccb4161
2014-06-05 14:12:41 -07:00
Robin Lee
958ad9181a am 53b49268: am 8adb5a82: Merge "Add installd command to create /data/misc user dir"
* commit '53b4926828fae0e78b467d49a6084b324bcbdcb7':
  Add installd command to create /data/misc user dir
2014-06-05 17:56:59 +00:00
Robin Lee
53b4926828 am 8adb5a82: Merge "Add installd command to create /data/misc user dir"
* commit '8adb5a822d44ed43aa0ec9a8948a7820fdfcd375':
  Add installd command to create /data/misc user dir
2014-06-05 17:53:31 +00:00
Robin Lee
07053fcb61 Migrate keychain directories to /data/misc/user/0
With new CA certificates being stored in /data/misc/user/<userid>/
existing ones need to be moved into the same place.

After this update only the owner user will have custom trusted CAs; all
other users will revert to the default set.

Change-Id: I14a4cd6048685902ad5dd3b53494b03fadc41c04
2014-06-05 17:35:50 +00:00
Robin Lee
8adb5a822d Merge "Add installd command to create /data/misc user dir" 2014-06-05 17:18:23 +00:00
Robin Lee
095c763dd9 Add installd command to create /data/misc user dir
New command 'mkuser <id>' sets up a user directory in /data/misc/user/,
readable by all apps within that user and writeable by the local system
process.

Change-Id: I5ddde8c4a80f606e723bb41aa64581a0720842d5
2014-06-05 14:34:15 +00:00
Adam Connors
9afbf0c799 Merge "API Review: Update managed profiles feature flag." 2014-06-05 13:07:32 +00:00
Adam Connors
17e4e6b62b API Review: Update managed profiles feature flag.
Feature flag renamed to FEATURE_MANAGED_PROFILES

Bug: 15025371

Change-Id: I999fd9484398da3266c7655d83e4266c2b76cf3a
2014-06-05 12:57:54 +00:00
Eric Laurent
634220ea26 Merge "add sound trigger native service" 2014-06-05 01:34:47 +00:00
Narayan Kamath
aefb0179a5 am c2ac5897: am 065e9c86: Merge "Fix mips build for libbinder."
* commit 'c2ac5897eccc681c8642095d4f8af13115de3ffb':
  Fix mips build for libbinder.
2014-06-04 17:32:14 +00:00
Narayan Kamath
c2ac5897ec am 065e9c86: Merge "Fix mips build for libbinder."
* commit '065e9c86e249beac08783c7e9334d5709e2c9080':
  Fix mips build for libbinder.
2014-06-04 17:28:38 +00:00
Narayan Kamath
065e9c86e2 Merge "Fix mips build for libbinder." 2014-06-04 14:53:08 +00:00
Narayan Kamath
2f1f742b90 Fix mips build for libbinder.
Mips specific code was using an uninitialized variable.

(cherry picked from commit 2c68d380c9)

Change-Id: I6b562b3f6d2084b72e747736cbf43684c2049f8e
2014-06-04 15:34:16 +01:00
Narayan Kamath
87947be618 Merge "Fix mips build for libbinder." 2014-06-04 14:32:59 +00:00
Narayan Kamath
2c68d380c9 Fix mips build for libbinder.
Mips specific code was using an uninitialized variable.

Change-Id: I445043c76ebfa420b26376ade60f8068b4ea0b11
2014-06-04 15:05:13 +01:00
Mark Salyzyn
b09b936d8e am f0a24759: am a28750ee: Merge "binder: Turn on -Werror"
* commit 'f0a2475905786d5457e7af838ac714acbfdafa4f':
  binder: Turn on -Werror
2014-06-03 20:54:48 +00:00
Mark Salyzyn
f0a2475905 am a28750ee: Merge "binder: Turn on -Werror"
* commit 'a28750eec38c848230adfeef28725b29cc36a9da':
  binder: Turn on -Werror
2014-06-03 20:48:35 +00:00
Mark Salyzyn
a28750eec3 Merge "binder: Turn on -Werror" 2014-06-03 19:40:01 +00:00
Mark Salyzyn
d4ecccfd20 binder: Turn on -Werror
Change-Id: I0ee785927a7ae5f731b02176b0b781b87c22a24e
2014-06-03 11:11:45 -07:00
Eric Laurent
9882be8960 add sound trigger native service
Change-Id: I5d6fe1ecacca3a941317f841009322bafdf6adcd
2014-06-03 08:20:07 -07:00
Narayan Kamath
db1972bd8e am 26063a91: am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
* commit '26063a9155ddd18d858cea7fac7c1ddf71e1bcb7':
  x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:58:40 +00:00
Narayan Kamath
26063a9155 am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
* commit 'f1dd859baa114995bcbcfb7119e939d0b4f45ed5':
  x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:29:00 +00:00
Narayan Kamath
f1dd859baa Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes" 2014-06-03 10:06:55 +00:00
Mark Salyzyn
edcf7f4d3a binder: rm utils/Debug.h as unutilized
Change-Id: I52eb8b64b71cec7ffd4560e902daf358fda98b4a
2014-05-30 16:51:18 +00:00
Narayan Kamath
403ec9f15a Fix flattening/unflattening of android::Sensor.
Write string lengths as uint32_t so that their width is
the same on 32 and 64 bit processes.

Note that this fixes another bug as a side effect; getFlattenedSize
was assuming that sizeof(uint32_t) == sizeof(size_t).

Change-Id: I7b6e3993e1f1ac45c14832ce59c59e0772855a2f
2014-05-30 14:40:13 +01:00
Fengwei Yin
83e0e425c6 x86_64: Align uint64_t/int64_t structure member to 8 bytes
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.

Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
2014-05-30 14:13:29 +01:00
Mark Salyzyn
b8b3c536f4 am ea3f1da9: am 1ce5ecbe: am 63645c69: Merge "binder: rm utils/Debug.h"
* commit 'ea3f1da9013b33ecf3f3f8771393c1754a9aec59':
  binder: rm utils/Debug.h
2014-05-29 21:09:57 +00:00
Brian Carlstrom
f1e77f1a99 am 823bcce3: am 4ae6a267: am f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '823bcce3abf536ee130a50551130d10589547cf4':
  Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 21:09:39 +00:00