OSDN Git Service
Yifan Hong [Thu, 22 Dec 2016 18:04:15 +0000 (18:04 +0000)]
Merge "Update for hiding Status from Return<T> object."
Yifan Hong [Wed, 21 Dec 2016 18:47:56 +0000 (10:47 -0800)]
Update for hiding Status from Return<T> object.
Test: compiles
Change-Id: Ie32514f34efaa1188f34f662b194b60d83c20bf0
Jeff Sharkey [Wed, 21 Dec 2016 18:46:27 +0000 (18:46 +0000)]
Merge "Only log restorecon changes for existing dirs."
Jeff Sharkey [Wed, 21 Dec 2016 16:33:55 +0000 (09:33 -0700)]
Only log restorecon changes for existing dirs.
If we just created an app private data directory, we're always going
to be relabeling it, so don't log in that case. Continue logging if
something caused us to relabel an existing app data directory.
Test: builds, boots, only logs for existing dirs
Bug:
31958779
Change-Id: Id03f7c18aed191a4c7fb9dcf9380136c93798a4b
Treehugger Robot [Tue, 20 Dec 2016 01:06:22 +0000 (01:06 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."
Jeff Sharkey [Mon, 19 Dec 2016 23:39:18 +0000 (16:39 -0700)]
Remove ~1/3 of the installd calls at boot.
When preparing CE storage for an app, we always perform a second call
to extract any newly created CE directory inode. Let's simplify this
and just return the inode number from the createAppData() call.
Test: builds, boots, reads CE inodes after wipe
Bug:
33463450
Change-Id: I68485e4b9b49e9da7b3ac7c66f50c6abc750b7e3
Peng Xu [Sat, 17 Dec 2016 00:02:02 +0000 (00:02 +0000)]
Merge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function"
Jeff Sharkey [Thu, 15 Dec 2016 21:59:08 +0000 (21:59 +0000)]
Merge "Handle invalid shared GIDs."
Jeff Sharkey [Thu, 15 Dec 2016 21:50:11 +0000 (14:50 -0700)]
Handle invalid shared GIDs.
Shared GIDs are only available inside a range from 50000-59999, so
system UIDs (outside the normal app range) don't have a valid GID to
use. The best we can do is skip the profile setup in those cases.
Test: builds
Bug:
27948817
Change-Id: I8c38a0e3631eafd07e96da3e37e641b3cce195a6
Treehugger Robot [Thu, 15 Dec 2016 19:09:39 +0000 (19:09 +0000)]
Merge "libvulkan: add NULL check to DestroySwapchainKHR"
Daniel Koch [Tue, 13 Dec 2016 23:45:13 +0000 (18:45 -0500)]
libvulkan: add NULL check to DestroySwapchainKHR
vkDestroySwapchainKHR is required to silently ignore NULL handles
that are provided to it to destroy.
This adds an early return if swapchain_handle is NULL.
Test: dEQP-VK.wsi.android.swapchain.destroy.null_handle (VK 1.0.2 CTS)
Change-Id: Ic230f114a680210cb0e0de931b17e4d70fb27f44
Treehugger Robot [Thu, 15 Dec 2016 07:17:26 +0000 (07:17 +0000)]
Merge "Fix unused-parameter warning"
Colin Cross [Wed, 14 Dec 2016 23:58:54 +0000 (23:58 +0000)]
Merge "Fix more warnings in framworks/native/opengl/include"
Dan Willemsen [Wed, 14 Dec 2016 05:20:13 +0000 (21:20 -0800)]
Fix unused-parameter warning
This is exposed when frameworks/av/include is moved from being a system
include directory to a normal include directory.
Test: m -j checkbuild
Change-Id: I127ebe25162f3b6dbb9fc564a6c2c851d0c1636f
Colin Cross [Wed, 14 Dec 2016 20:45:27 +0000 (12:45 -0800)]
Fix more warnings in framworks/native/opengl/include
Remove two more visability attributes being applied to typedefs.
The warnings were being hidden by the use of -isystem to include
frameworks/native/opengl/include.
Bug:
31752268
Test: m -j native
Change-Id: Ic6854d934a8d0d03b23e596d5230a6deb69c86bc
Aniroop Mathur [Mon, 12 Dec 2016 18:34:06 +0000 (00:04 +0530)]
Sensor: Add more comments for ASensorEventQueue_registerSensor() function
Lets add more comments to clarify that ASensorEventQueue_disableSensor is
to be used same as before for deactivating the sensor with respect to
sensor activation with ASensorEventQueue_registerSensor function.
Test: Check clarification in comments / spell check
Change-Id: Id38c002b57154c1feedf099f45b0ed8ed004ca39
Signed-off-by: Aniroop Mathur <a.mathur@samsung.com>
Treehugger Robot [Tue, 13 Dec 2016 15:55:29 +0000 (15:55 +0000)]
Merge "egl: add EGL_IMG_context_priority to the whitelist"
Treehugger Robot [Tue, 13 Dec 2016 01:12:48 +0000 (01:12 +0000)]
Merge "Make atrace not depend on /dev/hwbinder."
Josh Gao [Tue, 13 Dec 2016 00:28:09 +0000 (00:28 +0000)]
Merge "atrace: introduce tracing category for adb."
Jeff Sharkey [Tue, 13 Dec 2016 00:01:23 +0000 (00:01 +0000)]
Merge "Split all dexopt-related code into dexopt.cpp."
Steven Moreland [Mon, 12 Dec 2016 23:18:06 +0000 (15:18 -0800)]
Make atrace not depend on /dev/hwbinder.
Bug:
31262344
Test: compiles
Change-Id: I2b4fa6815723507dd04afda19e99e5a15053dc66
Treehugger Robot [Mon, 12 Dec 2016 22:14:13 +0000 (22:14 +0000)]
Merge "Allow both RENDER and TEXTURE flags when creating native client buffers."
Treehugger Robot [Mon, 12 Dec 2016 22:06:43 +0000 (22:06 +0000)]
Merge "Minor shuffling of installd error reporting."
Jeff Sharkey [Mon, 12 Dec 2016 21:28:24 +0000 (14:28 -0700)]
Split all dexopt-related code into dexopt.cpp.
Only a few minor changes to return bool instead of binder::Status.
Test: builds, boots, apps install/uninstall fine
Change-Id: I538024c0e9da8ca2c0983a6e779c34bd40752053
Josh Gao [Tue, 29 Nov 2016 18:55:21 +0000 (10:55 -0800)]
atrace: introduce tracing category for adb.
Bug: http://b/
31289465
Test: systrace
Change-Id: Ida5e898206e5b224771393d2d2ba609183dc3b90
Jeff Sharkey [Mon, 12 Dec 2016 20:18:46 +0000 (13:18 -0700)]
Minor shuffling of installd error reporting.
We actually want to early-return when creating user data fails, and
we want to return an exception when getAppDataInode() is called with
unsupported flags.
Test: builds, boots, apps install/uninstall fine
Bug:
13758960,
30944031
Change-Id: I69816275a0be7a73a8ae7f3d90f2cdea80d8ebfc
Craig Donner [Fri, 9 Dec 2016 23:34:56 +0000 (15:34 -0800)]
Allow both RENDER and TEXTURE flags when creating native client buffers.
Bug:
33057441
Test: Cherrypick from internal repo.
Change-Id: I64ebf6bb5cb534d7f67a9338ebac4bf23a47d607
Jeff Sharkey [Mon, 12 Dec 2016 19:38:07 +0000 (19:38 +0000)]
Merge "Return real error strings from installd."
Jeff Sharkey [Sat, 10 Dec 2016 01:18:43 +0000 (18:18 -0700)]
Return real error strings from installd.
Now that we've moved installd to Binder, we can return nice detailed
error strings explaining why a call failed. This is particularly
valuable when we record the error message into the PackageManager
persistent log, because up until now those errors were limited to
an unhelpful "installd returned -1" message.
Also perform uniform enforcement of all incoming package name and
UUID arguments.
Test: builds, boots, apps install/uninstall fine
Bug:
13758960,
30944031
Change-Id: Ic1f65ce8c10b1329e01d6a49d72cafa879c4d8bc
Treehugger Robot [Mon, 12 Dec 2016 16:33:05 +0000 (16:33 +0000)]
Merge "service_manager.c: remove is_selinux_enabled calls"
Jeff Sharkey [Sat, 10 Dec 2016 22:57:22 +0000 (22:57 +0000)]
Merge "Filename refactoring, remove DEXOPT_OTA flag."
Jeff Sharkey [Sat, 10 Dec 2016 22:54:51 +0000 (22:54 +0000)]
Merge "Final push of installd to Binder; goodbye socket!"
Nick Kralevich [Sat, 10 Dec 2016 01:05:09 +0000 (17:05 -0800)]
service_manager.c: remove is_selinux_enabled calls
SELinux is always enabled. No need to check for it.
Test: Device boots and service manager works without errors.
Change-Id: I12be7336e7c31a5f5796ea1383f3dc934eb3c97c
Jeff Sharkey [Sat, 10 Dec 2016 00:06:57 +0000 (17:06 -0700)]
Filename refactoring, remove DEXOPT_OTA flag.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: Ib60899fc70b12f76fad9dfad596b513777752703
Jeff Sharkey [Wed, 7 Dec 2016 19:12:00 +0000 (12:12 -0700)]
Final push of installd to Binder; goodbye socket!
Move last two straggling installd commands to Binder and destroy the
socket-based communication channel forever.
Test: builds, boots, apps install fine, pre-OTA dexopt works
Bug:
13758960,
30944031
Change-Id: I2ecd604fb6627b9028a7e32f87d0367e4a4afde3
Jeff Sharkey [Wed, 7 Dec 2016 22:38:48 +0000 (22:38 +0000)]
Merge "Yet another set of installd Binder methods."
Jeff Sharkey [Wed, 7 Dec 2016 17:37:27 +0000 (10:37 -0700)]
Yet another set of installd Binder methods.
Pretty straightforward refactoring.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: I6e79fe1a3663807c24eb28dca684b539df398c13
Jeff Sharkey [Wed, 7 Dec 2016 06:39:27 +0000 (06:39 +0000)]
Merge "Move more installd methods to Binder."
Treehugger Robot [Wed, 7 Dec 2016 02:35:35 +0000 (02:35 +0000)]
Merge "Revert "Move installd back to Android.mk.""
Jeff Sharkey [Tue, 6 Dec 2016 06:39:32 +0000 (23:39 -0700)]
Move more installd methods to Binder.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: I1fcaaaaad34c2f9a3d6a15443ef1764186669865
Dan Willemsen [Tue, 6 Dec 2016 23:44:57 +0000 (15:44 -0800)]
Revert "Move installd back to Android.mk."
This reverts commit
00b6f68c5c72252542a1e8c5dda4b420ed02c947 and
converts the new entries to Android.bp now that Soong supports AIDL.
Test: mmma -j framework/native/cmds/installd
Test: /data/nativetest64/installd_utils_test/installd_utils_test; fails
the same before/after
Change-Id: I327eb0bc28fa84cda669ec0df59da82ee10caf1f
Bill Yi [Tue, 6 Dec 2016 23:07:48 +0000 (15:07 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Jeff Sharkey [Tue, 6 Dec 2016 22:24:25 +0000 (22:24 +0000)]
Merge "Shuffle installd Binder implementation around."
Jeff Sharkey [Tue, 6 Dec 2016 22:24:17 +0000 (22:24 +0000)]
Merge "DO NOT MERGE. Check and restorecon cache/code_cache directories."
Jeff Sharkey [Tue, 6 Dec 2016 16:58:09 +0000 (16:58 +0000)]
Merge changes I0c8d4018,Ic9dfb243,I7e442b06
am:
17892731ec
Change-Id: Iadd662bf024e3acd58cf5c747d1546e457483a7b
Jeff Sharkey [Tue, 6 Dec 2016 16:58:06 +0000 (16:58 +0000)]
DO NOT MERGE. Recursively restorecon when SELinux label changes.
am:
7db6041d15 -s ours
Change-Id: Ie64c33ed2eaded73fe043955e0f954bc76f166f7
Jeff Sharkey [Tue, 6 Dec 2016 16:57:57 +0000 (16:57 +0000)]
DO NOT MERGE. Ignore setxattr() failures on tmpfs.
am:
4ed6507cfb -s ours
Change-Id: I5a8fa5606aaeaa75539a38227e78420acd4bf5bc
Jeff Sharkey [Tue, 6 Dec 2016 16:57:49 +0000 (16:57 +0000)]
DO NOT MERGE. Record "cache" inodes to clear while CE is locked.
am:
9a998f4762 -s ours
Change-Id: Id413a5bceff13dc717fa82209302662b77276165
Treehugger Robot [Tue, 6 Dec 2016 16:53:04 +0000 (16:53 +0000)]
Merge changes I0c8d4018,Ic9dfb243,I7e442b06
* changes:
DO NOT MERGE. Recursively restorecon when SELinux label changes.
DO NOT MERGE. Ignore setxattr() failures on tmpfs.
DO NOT MERGE. Record "cache" inodes to clear while CE is locked.
Jeff Sharkey [Tue, 6 Dec 2016 16:32:04 +0000 (09:32 -0700)]
Shuffle installd Binder implementation around.
Instead of writing wrapper methods in InstalldNativeService.cpp,
this change shifts the Binder implementation over into the existing
commands.cpp file. This will let us migrate all methods over, and
then perform one final file rename to InstalldNativeService.cpp.
The downside of this approach is that we no longer have a giant kill
switch to quickly switch back.
Moves the moveCompleteApp() method over to Binder.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: I53550e05bc2b65155c3de18424f67b1a95450a6f
Jeff Sharkey [Mon, 31 Oct 2016 17:22:19 +0000 (11:22 -0600)]
DO NOT MERGE. Check and restorecon cache/code_cache directories.
To speed up boot times, we recently relaxed SELinux restorecon logic
to only consider relabeling app storage when the top level SELinux
label changed.
However, if an app manually deletes either their cache or code_cache
directories, installd will helpfully recreate those directories at
the next boot, but they'll be stuck with incorrect SELinux labels
which an app can't fix. (Our historically aggressive restorecons had
relabeled them, which is why we didn't observe until now.)
This change checks the labels of the cache/code_cache directories,
and runs a restorecon if needed, fixing the issue above.
Test: delete cache and verify recreated with correct label
Bug:
32504081
Change-Id: I0114ae4129223e5909b1075d56a9b1145ebc5ef4
Jeff Sharkey [Wed, 21 Sep 2016 00:21:42 +0000 (18:21 -0600)]
DO NOT MERGE. Recursively restorecon when SELinux label changes.
PackageManager has been pretty aggressive about asking installd to
restorecon over app data when it thinks something might have
changed. However, in the vast majority of cases these are no-op
requests, and we waste a bunch of time recursively walking all
private data, easily costing 60+ seconds on dogfooder devices.
This change updates the initial "create_app_data" command to kick off
a recursive restorecon if it detects that the top-level SELinux label
on the app private data directory changes. The "create_app_data"
command is designed to ensure that an app's storage is ready, so
PackageManager always calls it at least once per boot before apps
can run. (This change means that PackageManager no longer needs to
make separate "restorecon_app_data" calls.)
Test: booted, verified that a label change triggered restorecon
Bug:
30768146
Change-Id: I0c8d4018cf8ff888d0ae07a82adc3d61a6002aad
Jeff Sharkey [Fri, 22 Jul 2016 17:38:54 +0000 (11:38 -0600)]
DO NOT MERGE. Ignore setxattr() failures on tmpfs.
Bug:
30210614
Change-Id: Ic9dfb2439b4b1056e1a58552be2e84f4e524321e
Jeff Sharkey [Fri, 15 Jul 2016 00:16:22 +0000 (18:16 -0600)]
DO NOT MERGE. Record "cache" inodes to clear while CE is locked.
There are two situations where we need to clear cached data from
all users, including those whose CE storage might still be locked:
1. When PackageManager is clearing caches to try making room for
package updates.
2. When the device fingerprint changes, we need to clear code caches
for all apps.
To enable this, we now record the inode number of the "cache" and
"code_cache" directories in xattrs of the parent directory. This is
just enough information to find the cache directories to enable
deleting files inside. When preparing CE storage for an app, we now
create these two directories and immediately write the inode numbers.
Bug:
26056125
Change-Id: I7e442b0676a695acf962593469793a93b03c8aee
Yifan Hong [Tue, 6 Dec 2016 15:41:08 +0000 (15:41 +0000)]
Merge "Check and write some error in atrace."
am:
7b50c02030
Change-Id: I562794bbe7dc52268ad2b477e0dca58a7b79d365
Treehugger Robot [Tue, 6 Dec 2016 15:07:54 +0000 (15:07 +0000)]
Merge "Check and write some error in atrace."
Colin Cross [Tue, 6 Dec 2016 01:58:25 +0000 (01:58 +0000)]
Merge "Convert vulkan to Android.bp"
am:
e421c0710f
Change-Id: Icd0b77b032179c8e8ce5c6009848e23916c990d5
Colin Cross [Tue, 6 Dec 2016 01:52:13 +0000 (01:52 +0000)]
Merge "Convert vulkan to Android.bp"
Jeff Sharkey [Tue, 6 Dec 2016 00:24:17 +0000 (00:24 +0000)]
Merge changes from topic 'bind'
am:
7726057707
Change-Id: I6e0198eceaa85c97bf3b72791e4e5e1df5086091
Jeff Sharkey [Tue, 6 Dec 2016 00:24:08 +0000 (00:24 +0000)]
Initial Binder interface for installd.
am:
9087400f3c
Change-Id: I4912defb2edafb60d429d90679bffe88589fcad9
Colin Cross [Mon, 5 Dec 2016 21:26:22 +0000 (13:26 -0800)]
Convert vulkan to Android.bp
See build/soong/README.md for more information.
Test: mma -j
Change-Id: Ic7f0af683a5ef093df718ed746a73a7fa2a9ce0b
Jeff Sharkey [Tue, 6 Dec 2016 00:22:39 +0000 (00:22 +0000)]
Move installd back to Android.mk.
am:
00b6f68c5c
Change-Id: Iad4819473f6b25f6ac7aa31e23661b564cd49f0e
Jeff Sharkey [Tue, 6 Dec 2016 00:14:53 +0000 (00:14 +0000)]
Merge changes from topic 'bind'
* changes:
Initial Binder interface for installd.
Move installd back to Android.mk.
Yifan Hong [Mon, 5 Dec 2016 20:58:05 +0000 (12:58 -0800)]
Check and write some error in atrace.
Bug:
33305299
Test: compiles
Change-Id: I88c7ede6cbf68ca10d980e448456bb4ef2a73592
Jeff Sharkey [Mon, 5 Dec 2016 18:18:55 +0000 (11:18 -0700)]
Initial Binder interface for installd.
Define an AIDL for installd, starting with a single method. Publish
that interface for the system to start using. We'll circle back and
migrate more methods in future CLs.
Migrating installd to Binder will allow us to get rid of one of
the few lingering text-based command protocols, improving system
maintainability and security.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: Icdb5320082567e0355d8f76f413f01cfacf0fb99
Jeff Sharkey [Sun, 4 Dec 2016 21:02:00 +0000 (14:02 -0700)]
Move installd back to Android.mk.
An upcoming CL will be compiling an AIDL for installd, which the new
build system doesn't support yet.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: I47f9ef21eb6040072c402d40ae42a95d7bd0e61d
Yifan Hong [Sat, 3 Dec 2016 23:09:03 +0000 (23:09 +0000)]
Merge "Fix includes; use IBase instead of IBinder."
am:
bd5dc9df53
Change-Id: Ic75eab82059ff0d1bf483f11d55fb9a6a74dd539
Treehugger Robot [Sat, 3 Dec 2016 23:04:24 +0000 (23:04 +0000)]
Merge "Fix includes; use IBase instead of IBinder."
Yifan Hong [Tue, 29 Nov 2016 17:59:32 +0000 (09:59 -0800)]
Fix includes; use IBase instead of IBinder.
Test: mma
Change-Id: I2604772ff952ed451cc87be330ed131452db8eff
Yifan Hong [Fri, 2 Dec 2016 19:25:46 +0000 (19:25 +0000)]
Merge "Check for errors for IServiceManager::get and list."
am:
a09202e9ac
Change-Id: I530107b1067810c4107cf22f4408d910190c9f7b
Treehugger Robot [Fri, 2 Dec 2016 19:19:33 +0000 (19:19 +0000)]
Merge "Check for errors for IServiceManager::get and list."
Christian Poetzsch [Thu, 1 Dec 2016 16:34:39 +0000 (16:34 +0000)]
egl: add EGL_IMG_context_priority to the whitelist
In the CCD 7.0 document EGL_IMG_context_priority was added as an
mandatory egl extension devices must support. However, right now the
extension string is not returned to applications even if the graphics
driver supports it.
Fix this by adding the extension to the whitelist.
Test: check for the extension string returned by eglQueryString
Change-Id: I7833a4e1782e12d845207b234431e10e09c085dc
Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
Yifan Hong [Thu, 1 Dec 2016 01:28:58 +0000 (17:28 -0800)]
Check for errors for IServiceManager::get and list.
Test: compiles
Change-Id: I65b858b1ebd5d45739db05fcadb58ae48fd3337e
Jinguang Dong [Wed, 30 Nov 2016 06:22:31 +0000 (06:22 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
am:
2792ff4527
Change-Id: Ia8c1ac3f9eff3680ed64235cb01043d0b7c434b9
Treehugger Robot [Wed, 30 Nov 2016 06:11:21 +0000 (06:11 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
Jinguang Dong [Tue, 29 Nov 2016 05:55:57 +0000 (13:55 +0800)]
surfaceflinger:Fix potential crash issue when do AIDL FUZZ
test
There will be trigger exception when we provide invalid
inputs parameter for surfaceflinger JNI interface
Test: 1.Run adb shell and open AIDLer tools;
2.change to Dir /sdcard/elong.AIDLer
3.run commond service list > service_list.txt
4.Rerun AIDL FUZZ test
Change-Id: I0a63adc1e8ae5d9c9e43cb6df6aa13503c40a0c5
Nicolas Geoffray [Mon, 28 Nov 2016 13:25:26 +0000 (13:25 +0000)]
Merge "Adjust installd with new dexopt return values."
am:
b29c82b67e
Change-Id: Ib0f3811c5891d6871d7b9d44c615954b06f261c6
Nicolas Geoffray [Mon, 28 Nov 2016 13:15:55 +0000 (13:15 +0000)]
Merge "Adjust installd with new dexopt return values."
Nicolas Geoffray [Fri, 25 Nov 2016 11:33:31 +0000 (11:33 +0000)]
Adjust installd with new dexopt return values.
Bug:
30937355
Test: device boots, mimic system update, apps get updated.
Change-Id: I9539892dfcdd0cc722a292140accd7525ee132d0
Manoj Gupta [Wed, 23 Nov 2016 06:40:36 +0000 (06:40 +0000)]
Merge "Fix clang static analyzer warnings."
am:
b10d705f51
Change-Id: Ibdd7df4af9766b5d00515254cbb8d5e9370a4971
Treehugger Robot [Wed, 23 Nov 2016 06:35:32 +0000 (06:35 +0000)]
Merge "Fix clang static analyzer warnings."
Martijn Coenen [Tue, 22 Nov 2016 09:49:27 +0000 (09:49 +0000)]
Merge "atrace: support HAL services as well."
am:
1aea108920
Change-Id: Iac0430699cd15f59ed68b41d20010165a50a50e2
Treehugger Robot [Tue, 22 Nov 2016 09:43:23 +0000 (09:43 +0000)]
Merge "atrace: support HAL services as well."
Martijn Coenen [Wed, 16 Nov 2016 15:00:26 +0000 (16:00 +0100)]
atrace: support HAL services as well.
Also poke services that are only registered with
hwbinder, so that they update their props (trace
categories) immediately.
Bug:
31262344
Test: builds, atrace works
Change-Id: I355ddd5f950acc27d598cd972e63f9711426b943
Wei Wang [Sun, 20 Nov 2016 16:26:31 +0000 (16:26 +0000)]
Merge "atrace.rc: move to post-fs trigger"
am:
3749a60b42
Change-Id: Ib2675cf4047d6ce1b9b6285538bb7f7be7ed1649
Treehugger Robot [Sun, 20 Nov 2016 16:22:22 +0000 (16:22 +0000)]
Merge "atrace.rc: move to post-fs trigger"
Wei Wang [Sun, 20 Nov 2016 04:49:09 +0000 (20:49 -0800)]
atrace.rc: move to post-fs trigger
Test: manually
Bug:
32025203
Change-Id: I787984fc8ab7151ecce9e62a25fa03b0ecf263cd
Colin Cross [Fri, 18 Nov 2016 01:55:54 +0000 (01:55 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"
am:
d12c9369d5
Change-Id: Ifbbccbd890d3ab80910586c52f263e903e36dbbd
Treehugger Robot [Fri, 18 Nov 2016 01:50:49 +0000 (01:50 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"
Evgenii Stepanov [Mon, 14 Nov 2016 19:47:29 +0000 (19:47 +0000)]
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""
am:
5c58020c00
Change-Id: I107ce2043fd261b08413418825daf6c35f808228
Evgenii Stepanov [Mon, 14 Nov 2016 19:26:48 +0000 (19:26 +0000)]
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""
Nicolas Geoffray [Mon, 14 Nov 2016 09:34:11 +0000 (09:34 +0000)]
Merge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."""
am:
eda1ddf518
Change-Id: Idbc246744abd62d0bb647f569968457cf5b85583
Nicolas Geoffray [Mon, 14 Nov 2016 09:24:56 +0000 (09:24 +0000)]
Merge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."""
Evgenii Stepanov [Wed, 14 Sep 2016 00:50:46 +0000 (00:50 +0000)]
Revert "Workaround alloc-dealloc-mismatch error on ASan device boot."
This reverts commit
22819276b147e34a80e8ca696be5b3fda68764b9.
The underlying kernel bug has been fixed.
Test: SANITIZE_TARGET=address build should continue working
Change-Id: I6f3938047d9f60357e7bd9bccd3ef36d7686c73b
Nicolas Geoffray [Thu, 10 Nov 2016 10:50:03 +0000 (10:50 +0000)]
Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
Test: device boots, adb shell cmd package compile works.
This reverts commit
5373d3028d53df00c244802f89c8a31a8c1a55a6.
bug:
30937355
Change-Id: Iddab9cc8de866a281672fc3c509d43070c3f56de
Nicolas Geoffray [Wed, 9 Nov 2016 21:42:08 +0000 (21:42 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
am:
80a4f63d7e
Change-Id: I02271ca0bbb3ee1d6eb5a8f73d6af0f23e0ab058
Nicolas Geoffray [Wed, 9 Nov 2016 21:32:14 +0000 (21:32 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
Nicolas Geoffray [Wed, 9 Nov 2016 21:30:54 +0000 (21:30 +0000)]
Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
Mishandled create_vdex_filename.
bug:
30937355
This reverts commit
196539e9ea6b096826c3489700588c286d8ca9c2.
Change-Id: Idd1a9f9567240899a103547a36dd036219f303cd
Elliott Hughes [Wed, 9 Nov 2016 16:40:02 +0000 (16:40 +0000)]
Merge "Dumpstate's netstat call should use -W."
am:
0708c8355f
Change-Id: If0d15f407cb5cd080950c414135a1ebcdf712d77
Elliott Hughes [Wed, 9 Nov 2016 16:30:31 +0000 (16:30 +0000)]
Merge "Dumpstate's netstat call should use -W."