OSDN Git Service

android-x86/frameworks-native.git
7 years agoMerge "Make atrace not depend on /dev/hwbinder."
Treehugger Robot [Tue, 13 Dec 2016 01:12:48 +0000 (01:12 +0000)]
Merge "Make atrace not depend on /dev/hwbinder."

7 years agoMerge "atrace: introduce tracing category for adb."
Josh Gao [Tue, 13 Dec 2016 00:28:09 +0000 (00:28 +0000)]
Merge "atrace: introduce tracing category for adb."

7 years agoMerge "Split all dexopt-related code into dexopt.cpp."
Jeff Sharkey [Tue, 13 Dec 2016 00:01:23 +0000 (00:01 +0000)]
Merge "Split all dexopt-related code into dexopt.cpp."

7 years agoMake atrace not depend on /dev/hwbinder.
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

7 years agoMerge "Allow both RENDER and TEXTURE flags when creating native client buffers."
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."

7 years agoMerge "Minor shuffling of installd error reporting."
Treehugger Robot [Mon, 12 Dec 2016 22:06:43 +0000 (22:06 +0000)]
Merge "Minor shuffling of installd error reporting."

7 years agoSplit all dexopt-related code into dexopt.cpp.
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

7 years agoatrace: introduce tracing category for adb.
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

7 years agoMinor shuffling of installd error reporting.
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: 1375896030944031
Change-Id: I69816275a0be7a73a8ae7f3d90f2cdea80d8ebfc

7 years agoAllow both RENDER and TEXTURE flags when creating native client buffers.
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

7 years agoMerge "Return real error strings from installd."
Jeff Sharkey [Mon, 12 Dec 2016 19:38:07 +0000 (19:38 +0000)]
Merge "Return real error strings from installd."

7 years agoReturn 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: 1375896030944031
Change-Id: Ic1f65ce8c10b1329e01d6a49d72cafa879c4d8bc

7 years agoMerge "service_manager.c: remove is_selinux_enabled calls"
Treehugger Robot [Mon, 12 Dec 2016 16:33:05 +0000 (16:33 +0000)]
Merge "service_manager.c: remove is_selinux_enabled calls"

7 years agoMerge "Filename refactoring, remove DEXOPT_OTA flag."
Jeff Sharkey [Sat, 10 Dec 2016 22:57:22 +0000 (22:57 +0000)]
Merge "Filename refactoring, remove DEXOPT_OTA flag."

7 years agoMerge "Final push of installd to Binder; goodbye socket!"
Jeff Sharkey [Sat, 10 Dec 2016 22:54:51 +0000 (22:54 +0000)]
Merge "Final push of installd to Binder; goodbye socket!"

7 years agoservice_manager.c: remove is_selinux_enabled calls
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

7 years agoFilename refactoring, remove DEXOPT_OTA flag.
Jeff Sharkey [Sat, 10 Dec 2016 00:06:57 +0000 (17:06 -0700)]
Filename refactoring, remove DEXOPT_OTA flag.

Test: builds, boots
Bug: 1375896030944031
Change-Id: Ib60899fc70b12f76fad9dfad596b513777752703

7 years agoFinal push of installd to Binder; goodbye socket!
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: 1375896030944031
Change-Id: I2ecd604fb6627b9028a7e32f87d0367e4a4afde3

7 years agoMerge "Yet another set of installd Binder methods."
Jeff Sharkey [Wed, 7 Dec 2016 22:38:48 +0000 (22:38 +0000)]
Merge "Yet another set of installd Binder methods."

7 years agoYet 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: 1375896030944031
Change-Id: I6e79fe1a3663807c24eb28dca684b539df398c13

7 years agoMerge "Move more installd methods to Binder."
Jeff Sharkey [Wed, 7 Dec 2016 06:39:27 +0000 (06:39 +0000)]
Merge "Move more installd methods to Binder."

7 years agoMerge "Revert "Move installd back to Android.mk.""
Treehugger Robot [Wed, 7 Dec 2016 02:35:35 +0000 (02:35 +0000)]
Merge "Revert "Move installd back to Android.mk.""

7 years agoMove more installd methods to Binder.
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: 1375896030944031
Change-Id: I1fcaaaaad34c2f9a3d6a15443ef1764186669865

7 years agoRevert "Move installd back to Android.mk."
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

7 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Bill Yi [Tue, 6 Dec 2016 23:07:48 +0000 (15:07 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

7 years agoMerge "Shuffle installd Binder implementation around."
Jeff Sharkey [Tue, 6 Dec 2016 22:24:25 +0000 (22:24 +0000)]
Merge "Shuffle installd Binder implementation around."

7 years agoMerge "DO NOT MERGE. Check and restorecon cache/code_cache directories."
Jeff Sharkey [Tue, 6 Dec 2016 22:24:17 +0000 (22:24 +0000)]
Merge "DO NOT MERGE. Check and restorecon cache/code_cache directories."

7 years agoMerge changes I0c8d4018,Ic9dfb243,I7e442b06
Jeff Sharkey [Tue, 6 Dec 2016 16:58:09 +0000 (16:58 +0000)]
Merge changes I0c8d4018,Ic9dfb243,I7e442b06
am: 17892731ec

Change-Id: Iadd662bf024e3acd58cf5c747d1546e457483a7b

7 years agoDO NOT MERGE. Recursively restorecon when SELinux label changes.
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

7 years agoDO NOT MERGE. Ignore setxattr() failures on tmpfs.
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

7 years agoDO NOT MERGE. Record "cache" inodes to clear while CE is locked.
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

7 years agoMerge changes I0c8d4018,Ic9dfb243,I7e442b06
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.

7 years agoShuffle installd Binder implementation around.
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: 1375896030944031
Change-Id: I53550e05bc2b65155c3de18424f67b1a95450a6f

7 years agoDO NOT MERGE. Check and restorecon cache/code_cache directories.
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

7 years agoDO NOT MERGE. Recursively restorecon when SELinux label changes.
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

7 years agoDO NOT MERGE. Ignore setxattr() failures on tmpfs.
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

7 years agoDO NOT MERGE. Record "cache" inodes to clear while CE is locked.
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

7 years agoMerge "Check and write some error in atrace."
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

7 years agoMerge "Check and write some error in atrace."
Treehugger Robot [Tue, 6 Dec 2016 15:07:54 +0000 (15:07 +0000)]
Merge "Check and write some error in atrace."

7 years agoMerge "Convert vulkan to Android.bp"
Colin Cross [Tue, 6 Dec 2016 01:58:25 +0000 (01:58 +0000)]
Merge "Convert vulkan to Android.bp"
am: e421c0710f

Change-Id: Icd0b77b032179c8e8ce5c6009848e23916c990d5

7 years agoMerge "Convert vulkan to Android.bp"
Colin Cross [Tue, 6 Dec 2016 01:52:13 +0000 (01:52 +0000)]
Merge "Convert vulkan to Android.bp"

7 years agoMerge changes from topic 'bind'
Jeff Sharkey [Tue, 6 Dec 2016 00:24:17 +0000 (00:24 +0000)]
Merge changes from topic 'bind'
am: 7726057707

Change-Id: I6e0198eceaa85c97bf3b72791e4e5e1df5086091

7 years agoInitial Binder interface for installd.
Jeff Sharkey [Tue, 6 Dec 2016 00:24:08 +0000 (00:24 +0000)]
Initial Binder interface for installd.
am: 9087400f3c

Change-Id: I4912defb2edafb60d429d90679bffe88589fcad9

7 years agoConvert vulkan to Android.bp
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

7 years agoMove installd back to Android.mk.
Jeff Sharkey [Tue, 6 Dec 2016 00:22:39 +0000 (00:22 +0000)]
Move installd back to Android.mk.
am: 00b6f68c5c

Change-Id: Iad4819473f6b25f6ac7aa31e23661b564cd49f0e

7 years agoMerge changes from topic 'bind'
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.

7 years agoCheck and write some error in atrace.
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

7 years agoInitial Binder interface for installd.
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: 1375896030944031
Change-Id: Icdb5320082567e0355d8f76f413f01cfacf0fb99

7 years agoMove installd back to Android.mk.
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: 1375896030944031
Change-Id: I47f9ef21eb6040072c402d40ae42a95d7bd0e61d

7 years agoMerge "Fix includes; use IBase instead of IBinder."
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

7 years agoMerge "Fix includes; use IBase instead of IBinder."
Treehugger Robot [Sat, 3 Dec 2016 23:04:24 +0000 (23:04 +0000)]
Merge "Fix includes; use IBase instead of IBinder."

7 years agoFix 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

7 years agoMerge "Check for errors for IServiceManager::get and list."
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

7 years agoMerge "Check for errors for IServiceManager::get and list."
Treehugger Robot [Fri, 2 Dec 2016 19:19:33 +0000 (19:19 +0000)]
Merge "Check for errors for IServiceManager::get and list."

7 years agoCheck for errors for IServiceManager::get and list.
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

7 years agoMerge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
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

7 years agoMerge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
Treehugger Robot [Wed, 30 Nov 2016 06:11:21 +0000 (06:11 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"

7 years agosurfaceflinger:Fix potential crash issue when do AIDL FUZZ
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

7 years agoMerge "Adjust installd with new dexopt return values."
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

7 years agoMerge "Adjust installd with new dexopt return values."
Nicolas Geoffray [Mon, 28 Nov 2016 13:15:55 +0000 (13:15 +0000)]
Merge "Adjust installd with new dexopt return values."

7 years agoAdjust 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

7 years agoMerge "Fix clang static analyzer warnings."
Manoj Gupta [Wed, 23 Nov 2016 06:40:36 +0000 (06:40 +0000)]
Merge "Fix clang static analyzer warnings."
am: b10d705f51

Change-Id: Ibdd7df4af9766b5d00515254cbb8d5e9370a4971

7 years agoMerge "Fix clang static analyzer warnings."
Treehugger Robot [Wed, 23 Nov 2016 06:35:32 +0000 (06:35 +0000)]
Merge "Fix clang static analyzer warnings."

7 years agoMerge "atrace: support HAL services as well."
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

7 years agoMerge "atrace: support HAL services as well."
Treehugger Robot [Tue, 22 Nov 2016 09:43:23 +0000 (09:43 +0000)]
Merge "atrace: support HAL services as well."

7 years agoatrace: 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

7 years agoMerge "atrace.rc: move to post-fs trigger"
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

7 years agoMerge "atrace.rc: move to post-fs trigger"
Treehugger Robot [Sun, 20 Nov 2016 16:22:22 +0000 (16:22 +0000)]
Merge "atrace.rc: move to post-fs trigger"

7 years agoatrace.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

7 years agoMerge "Fix warnings in framworks/native/opengl/include"
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

7 years agoMerge "Fix warnings in framworks/native/opengl/include"
Treehugger Robot [Fri, 18 Nov 2016 01:50:49 +0000 (01:50 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"

7 years agoMerge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""
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

7 years agoMerge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""
Evgenii Stepanov [Mon, 14 Nov 2016 19:26:48 +0000 (19:26 +0000)]
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""

7 years agoMerge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."""
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

7 years agoMerge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."""
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."""

7 years agoRevert "Workaround alloc-dealloc-mismatch error on ASan device boot."
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

7 years agoRevert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
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

7 years agoMerge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
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

7 years agoMerge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
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.""

7 years agoRevert "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

7 years agoMerge "Dumpstate's netstat call should use -W."
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

7 years agoMerge "Dumpstate's netstat call should use -W."
Elliott Hughes [Wed, 9 Nov 2016 16:30:31 +0000 (16:30 +0000)]
Merge "Dumpstate's netstat call should use -W."

7 years agoMerge "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
Nicolas Geoffray [Wed, 9 Nov 2016 14:04:35 +0000 (14:04 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
am: 229d3c289b

Change-Id: Iab57ff0465b7e72b48c2d93b13e3930160a08704

7 years agoMerge "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
Nicolas Geoffray [Wed, 9 Nov 2016 13:57:23 +0000 (13:57 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat."

7 years agoMerge "Keep protected content in EGLImage attrs as needed."
Craig Donner [Tue, 8 Nov 2016 20:14:09 +0000 (20:14 +0000)]
Merge "Keep protected content in EGLImage attrs as needed."
am: 5a03327fa8

Change-Id: Id79a4a1548e5c7f4cb504d474f856727bf0b51ee

7 years agoMerge "Keep protected content in EGLImage attrs as needed."
Treehugger Robot [Tue, 8 Nov 2016 20:06:32 +0000 (20:06 +0000)]
Merge "Keep protected content in EGLImage attrs as needed."

7 years agoPass --output-vdex-fd and input-vdex-fd to dex2oat.
Nicolas Geoffray [Mon, 7 Nov 2016 16:24:05 +0000 (16:24 +0000)]
Pass --output-vdex-fd and input-vdex-fd to dex2oat.

Adjust to new dex2oat flags.

bug:30937355
Test: device boots

Change-Id: Ieab2b2102a7b9c17b77618538608c47d8ad52e2d

7 years agoMerge "[NAN-AWARE] Rename NAN to Aware"
Etan Cohen [Sun, 6 Nov 2016 03:13:51 +0000 (03:13 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
am: ab180e53b9

Change-Id: I75b3722f37d606e42effc9dee731210df958c7bd

7 years agoMerge "[NAN-AWARE] Rename NAN to Aware"
Etan Cohen [Sun, 6 Nov 2016 03:05:39 +0000 (03:05 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"

7 years ago[NAN-AWARE] Rename NAN to Aware
Etan Cohen [Wed, 26 Oct 2016 18:20:17 +0000 (11:20 -0700)]
[NAN-AWARE] Rename NAN to Aware

Rename only (and any reformatting needed to pass lint) - no
functional changes!

(cherry-pick of commit 49f8c84e1872c47716ebc2c04acdc8e3f6192734)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: I00700206c90c9e6a1a0a2a79248dd571fe43ec26
Change-Id: I6b4b146a470ccbe081fb2f18d75e261a843978e2

7 years agoMerge "binder: print the bad cmd error to android log"
liangweikang [Fri, 4 Nov 2016 01:46:34 +0000 (01:46 +0000)]
Merge "binder: print the bad cmd error to android log"
am: 2e9ff8c5be

Change-Id: I3849ae9043c52305798448b89cb82920a4ec13e4

7 years agoMerge "binder: print the bad cmd error to android log"
Treehugger Robot [Fri, 4 Nov 2016 01:43:14 +0000 (01:43 +0000)]
Merge "binder: print the bad cmd error to android log"

7 years agoFix warnings in framworks/native/opengl/include
Colin Cross [Fri, 4 Nov 2016 00:36:46 +0000 (17:36 -0700)]
Fix warnings in framworks/native/opengl/include

Fix old-style cast warnings by using a macro to do C or C++ style
casts.  Remove a visibility attribute being applied to a typedef.
The warnings were being hidden by the use of -isystem to include
frameworks/native/opengl/include.

Bug: 31752268
Test: m -j native

Change-Id: I7db3f7181e3542fc7194e1f18010dd2df5d4c57e

7 years agoKeep protected content in EGLImage attrs as needed.
Craig Donner [Thu, 20 Oct 2016 00:18:17 +0000 (17:18 -0700)]
Keep protected content in EGLImage attrs as needed.

When image_crop isn't supported, we also throw away the
protected_content_ext attrs in GLConsumer. Instead, keep them
around if they're used.

Bug: 32222880
Test: manual (cp from internal)
Change-Id: Ic182810cbaacdfaf912c57667f5176d3e47941a9

7 years agoFix clang static analyzer warnings.
Manoj Gupta [Wed, 2 Nov 2016 00:30:24 +0000 (17:30 -0700)]
Fix clang static analyzer warnings.

frameworks/native/cmds/flatland/GLHelper.cpp:366:9: warning: Potential
leak of memory pointed to by 'src'

Test: Warning no longer appears
Change-Id: I2721d292cf1f387f34fb2e69f8370f1abff3f01f

7 years agobinder: print the bad cmd error to android log
liangweikang [Tue, 25 Oct 2016 08:37:54 +0000 (16:37 +0800)]
binder: print the bad cmd error to android log

https://code.google.com/p/android/issues/detail?id=226068

Signed-off-by: liangweikang <liangweikang900911@gmail.com>
7 years agoDumpstate's netstat call should use -W.
Elliott Hughes [Fri, 28 Oct 2016 15:53:02 +0000 (08:53 -0700)]
Dumpstate's netstat call should use -W.

IPv6 addresses (which are quite normal on a real device connected to a
mobile network) are truncated by netstat by default. (80 columns!)

Supplying -W says "I care about seeing the IP addresses more than I
care about fitting on a VT100".

Bug: noticed in bugreport in http://b/32463933
Test: manual dumpstate run
Change-Id: I6f8b9ee258ceaa2beeca588fc95adb17fe07d0c4

7 years agoMerge "TextOutput log improvement"
Wei Wang [Thu, 27 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Merge "TextOutput log improvement"
am: 3e9e757437

Change-Id: I88fec0002898ec7da19d579d0aa4679b73bfcd53

7 years agoMerge "TextOutput log improvement"
Treehugger Robot [Thu, 27 Oct 2016 18:05:46 +0000 (18:05 +0000)]
Merge "TextOutput log improvement"

7 years agoMerge "Enable multiple concurrent binderLibTest instances"
Connor O'Brien [Thu, 27 Oct 2016 18:00:33 +0000 (18:00 +0000)]
Merge "Enable multiple concurrent binderLibTest instances"
am: 06d83ad741

Change-Id: I4df9c55a81801972f1b4cbb56f11d24f5bbc9e1d