Calin Juravle
4fdff46166
Pass --top-k-profile-threshold to dex2oat if available.
...
Also, don't pass --profile-file if the file is empty.
Bug: 12877748
Change-Id: I587d198e64da709930e2cea50a87fed1525281e5
2014-06-10 14:33:15 +01:00
Michael Wright
e3b129d4ff
Merge "Bump axis limit"
2014-06-10 03:12:27 +00:00
Michael Wright
25be048729
Merge "Fix warning in logging string interpolation"
2014-06-10 03:12:19 +00:00
Michael Wright
d0a4a6234f
Fix warning in logging string interpolation
...
Change-Id: I86623083f68664d31ea277958837a4c2985037b4
2014-06-09 19:03:32 -07:00
Michael Wright
8f6710fdeb
Bump axis limit
...
Change-Id: I53d18646be2b884c5022f10c7c4ea8f6cda176c8
2014-06-09 18:56:43 -07:00
Ying Wang
0cea0a2210
am d284c4cd
: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."
...
* commit 'd284c4cd78e0d42a8ee7af6e8f61c5e66cae6318':
Don't set LOCAL_MODULE_PATH for native tests.
2014-06-09 23:00:04 +00:00
Ying Wang
d284c4cd78
Merge "Don't set LOCAL_MODULE_PATH for native tests."
2014-06-09 22:52:48 +00:00
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
Ying Wang
8baf4fcabd
Don't set LOCAL_MODULE_PATH for native tests.
...
The build system will set it up automatically.
Change-Id: Id5ed9eff88dab2349c3b357ee09f7da9479d7d2d
2014-06-09 15:23:46 -07:00
Mark Salyzyn
72676e7d0d
am 0e1313cd
: Merge "libgui: 64-bit compile issues"
...
* commit '0e1313cdb1d5d21e4d6123f77b4238f1c8c2d564':
libgui: 64-bit compile issues
2014-06-09 21:46:25 +00:00
Mark Salyzyn
0e1313cdb1
Merge "libgui: 64-bit compile issues"
2014-06-09 21:38:00 +00:00
Mark Salyzyn
911004506d
libgui: 64-bit compile issues
...
Change-Id: I29961c1567b8431518a7d032ea43385e23b7bb37
2014-06-09 14:27:45 -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
Prashant Malani
2c9b11f029
surfaceflinger: Replace blank/unblank with setPowerMode
...
We replace the blank/unblank calls in surfaceFlinger with a more generic
setPowerMode() routine.
Some displays support different power modes (for example, with reduced
color palettes). Depending on the use case we should be able to toggle
these modes, so as to achieve incremental power savings.
Initially, three power modes will be supported:
- HWC_POWER_MODE_OFF
- HWC_POWER_MODE_DOZE
- HWC_POWER_MODE_NORMAL
HWC_POWER_MODE_OFF will correspond to blanking the display, while
HWC_POWER_MODE_NORMAL will correspond to unblanking. HWC_POWER_MODE_DOZE
will put the display into a low power setting, if it is supported in
hardware.
If such a low power mode is not supported, it should be treated as a
call to set the mode to HWC_POWER_MODE_NORMAL.
As a consequence of adding the mPowerMode field, the mScreenAcquired is
no longer required, and thus references to it are removed and replaced
equivalent references to mPowerMode.
We also add the glue code to connect the services invocation of setting
a power mode and the HAL implementation in HWComposer.
Bug: 13472578
Change-Id: I431595ecf16d2f2c94259272db3dd42f29636204
Signed-off-by: Prashant Malani <pmalani@google.com>
2014-06-05 16:35:52 -07: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