OSDN Git Service
Nicolas Geoffray [Wed, 9 Nov 2016 21:59:43 +0000 (21:59 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."" am:
80a4f63d7e am:
d5417da67b am:
b741705b55
am:
35639b68d3
Change-Id: Id2976272c43aa04a92da3ee7024cf7b38574a84a
Nicolas Geoffray [Wed, 9 Nov 2016 21:53:40 +0000 (21:53 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."" am:
80a4f63d7e am:
d5417da67b
am:
b741705b55
Change-Id: I7752cd4a894e08f189992afaf35bbbf8b92b1a7b
Nicolas Geoffray [Wed, 9 Nov 2016 21:48:10 +0000 (21:48 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."" am:
80a4f63d7e
am:
d5417da67b
Change-Id: I532508a618531080f687dfbf7818cd5ec11b3d9e
Chris Tate [Wed, 9 Nov 2016 21:42:52 +0000 (21:42 +0000)]
Merge "Correct overflow check in Parcel resize code"
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 17:03:58 +0000 (09:03 -0800)]
resolve merge conflicts of
7d66892 to master
Change-Id: I74a7c622e9d082e506beec150a2ccdf43483b530
Elliott Hughes [Wed, 9 Nov 2016 16:52:33 +0000 (16:52 +0000)]
Merge "Dumpstate's netstat call should use -W." am:
0708c8355f am:
ae4d6a6c8b
am:
7783703006
Change-Id: Ic37a4911434aa7bc2e1a9ed5dcf3fc1488c9776c
Elliott Hughes [Wed, 9 Nov 2016 16:46:04 +0000 (16:46 +0000)]
Merge "Dumpstate's netstat call should use -W." am:
0708c8355f
am:
ae4d6a6c8b
Change-Id: Ia44bef0d5dcb530ee17bcd7467f067ed1ef4b3cb
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."
Nicolas Geoffray [Wed, 9 Nov 2016 14:22:09 +0000 (14:22 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat." am:
229d3c289b am:
6da66c1bf1 am:
eeb8729f9c
am:
555d08ed44
Change-Id: I2351b61e70f9d393f61002ae5703454616283b63
Nicolas Geoffray [Wed, 9 Nov 2016 14:16:07 +0000 (14:16 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat." am:
229d3c289b am:
6da66c1bf1
am:
eeb8729f9c
Change-Id: I9651b38c104dae1d26e306aefb683556f54aaf84
Nicolas Geoffray [Wed, 9 Nov 2016 14:10:35 +0000 (14:10 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat." am:
229d3c289b
am:
6da66c1bf1
Change-Id: Id4b58e3f19f7a93e0947bda20fefb1015ae4c346
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
Nicolas Geoffray [Wed, 9 Nov 2016 13:57:23 +0000 (13:57 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
Romain Guy [Wed, 9 Nov 2016 01:11:57 +0000 (01:11 +0000)]
Merge "Merge Filament's math library"
Romain Guy [Tue, 8 Nov 2016 17:49:25 +0000 (09:49 -0800)]
Merge Filament's math library
This math library was derived from Android's and is API compatible.
It adds new useful types (quat and half) as well as many missing
functions and optimizations.
The half type (fp16) is going to be used for HDR/color management.
Test: mat_test, quat_test, half_test and vec_test
Change-Id: I4c61efb085d6aa2cf5b43cdd194719b3e855aa9b
TreeHugger Robot [Tue, 8 Nov 2016 21:07:44 +0000 (21:07 +0000)]
Merge "Delete surfacefinger Layer::latchBuffer code"
TreeHugger Robot [Tue, 8 Nov 2016 20:59:33 +0000 (20:59 +0000)]
Merge "Refactor surfacefinger latchBuffer: Create method"
Craig Donner [Tue, 8 Nov 2016 20:30:11 +0000 (20:30 +0000)]
Merge "Keep protected content in EGLImage attrs as needed." am:
5a03327fa8 am:
e86b7fb0cf am:
54dd92287d
am:
7f612d4830
Change-Id: I3e26e9d5cb164154c3408a165c90ec534542c2c0
Craig Donner [Tue, 8 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Merge "Keep protected content in EGLImage attrs as needed." am:
5a03327fa8 am:
e86b7fb0cf
am:
54dd92287d
Change-Id: I8d7dd4c285303b4ae69e758feb7cebd6f4bafa65
Craig Donner [Tue, 8 Nov 2016 20:19:40 +0000 (20:19 +0000)]
Merge "Keep protected content in EGLImage attrs as needed." am:
5a03327fa8
am:
e86b7fb0cf
Change-Id: I6838c4f9c3885a0cc7e27355b5163c132e9f7b3e
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
Treehugger Robot [Tue, 8 Nov 2016 20:06:32 +0000 (20:06 +0000)]
Merge "Keep protected content in EGLImage attrs as needed."
Fabien Sanglard [Thu, 13 Oct 2016 20:01:25 +0000 (13:01 -0700)]
Delete surfacefinger Layer::latchBuffer code
Delete unreachable code.
Change-Id: I6d895838cc4e0b84642f2c67d44306ba23696329
Fabien Sanglard [Tue, 8 Nov 2016 18:18:10 +0000 (18:18 +0000)]
Merge "Refactor surfacefinger Layer::latchBuffer"
Michael Schwartz [Tue, 18 Oct 2016 17:22:23 +0000 (10:22 -0700)]
Remove unused dependencies
Also export libui headers since files like ConsumerBase.h depend on
symbols from that library.
Bug:
32208916
Test: Compiles for bullhead_treble-userdebug
Change-Id: I7148ee908f8115f6125b2d6971788709fbcf6202
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
Fabien Sanglard [Thu, 13 Oct 2016 19:47:39 +0000 (12:47 -0700)]
Refactor surfacefinger latchBuffer: Create method
Shortens latchBuffer method, extracting transaction
credential verification to dedicated function.
Test: On device
Change-Id: Ia7c2f977a85d1c1afd87425588c07eb756b00f15
Fabien Sanglard [Thu, 13 Oct 2016 19:05:28 +0000 (12:05 -0700)]
Refactor surfacefinger Layer::latchBuffer
Take out Rejecter class declaration out of the method. This
increases readability and shortens latchBuffer method by 200 lines.
Change-Id: I8b07c63f8ed6408e68d5696d0666e65a3b14bd4c
Steven Moreland [Tue, 8 Nov 2016 03:19:26 +0000 (19:19 -0800)]
Fix include dir for sensorservice.
Breaking angler_treble build currently.
Test: compiles
Change-Id: I3ef965d3cac798e0f8c9118c2c7095ce1abfd307
Etan Cohen [Sun, 6 Nov 2016 03:38:32 +0000 (03:38 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware" am:
ab180e53b9 am:
3aa7f61eba am:
53cb11bcdc
am:
23c8e1345c -s ours
Change-Id: I214f10149fc5656b20c58689142558af225ac33d
Etan Cohen [Sun, 6 Nov 2016 03:29:53 +0000 (03:29 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware" am:
ab180e53b9 am:
3aa7f61eba
am:
53cb11bcdc
Change-Id: Iec7bfcf8d55a6735d43630686dc2e4a8b4d8c895
Etan Cohen [Sun, 6 Nov 2016 03:21:54 +0000 (03:21 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware" am:
ab180e53b9
am:
3aa7f61eba
Change-Id: I28cc8ef7a2589683fb16b9498ae1c2abfe2bf925
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
Etan Cohen [Sun, 6 Nov 2016 03:05:39 +0000 (03:05 +0000)]
Merge "[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
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)
(cherry-pick of commit
93852c97c636beaf6f9db0ab3994cac59cc83bf4)
Bug:
32263750
Test: All unit tests and integration (sl4a) tests pass.
Change-Id: I00700206c90c9e6a1a0a2a79248dd571fe43ec26
liangweikang [Fri, 4 Nov 2016 01:57:51 +0000 (01:57 +0000)]
Merge "binder: print the bad cmd error to android log" am:
2e9ff8c5be am:
564e686168 am:
521f992ae8
am:
abffee11a8
Change-Id: Ib94eeb78d50607b6644d04422879abb738c8d111
liangweikang [Fri, 4 Nov 2016 01:54:04 +0000 (01:54 +0000)]
Merge "binder: print the bad cmd error to android log" am:
2e9ff8c5be am:
564e686168
am:
521f992ae8
Change-Id: I19ad71ec63036a6e4db2477cd6c2a2f75d975fc2
liangweikang [Fri, 4 Nov 2016 01:50:04 +0000 (01:50 +0000)]
Merge "binder: print the bad cmd error to android log" am:
2e9ff8c5be
am:
564e686168
Change-Id: Ic6de8bae8f3b138214785e856911d1eef6b4541b
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
Treehugger Robot [Fri, 4 Nov 2016 01:43:14 +0000 (01:43 +0000)]
Merge "binder: print the bad cmd error to android log"
Marco Nelissen [Thu, 3 Nov 2016 22:56:11 +0000 (22:56 +0000)]
Merge "Remove unneeded dependencies from libui and libgui"
TreeHugger Robot [Thu, 3 Nov 2016 21:01:23 +0000 (21:01 +0000)]
Merge "Created a dumpstate service."
Christopher Tate [Thu, 3 Nov 2016 20:32:41 +0000 (13:32 -0700)]
Correct overflow check in Parcel resize code
Bug
31929765
Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467
Etan Cohen [Thu, 3 Nov 2016 20:04:17 +0000 (20:04 +0000)]
[NAN-AWARE] Rename NAN to Aware [DO NOT MERGE]
am:
49f8c84e18 -s ours
Change-Id: I2f40874f0725a699c1f7f846463c0a74791910c8
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
Dan Stoza [Thu, 3 Nov 2016 19:02:06 +0000 (19:02 +0000)]
SF: Request SF wakeup for pending transactions am:
d9d1817e9a
am:
c00aecf67a
Change-Id: Id2dde94687948d251fab8edcb2ed4fbbff087f37
Dan Stoza [Thu, 3 Nov 2016 18:58:36 +0000 (18:58 +0000)]
SF: Request SF wakeup for pending transactions
am:
d9d1817e9a
Change-Id: I9d84ef9636acd4359dad908241bac0a5a560cd00
TreeHugger Robot [Thu, 3 Nov 2016 17:54:33 +0000 (17:54 +0000)]
Merge "SensorService: delete unused include."
Dan Stoza [Wed, 2 Nov 2016 23:27:47 +0000 (16:27 -0700)]
SF: Request SF wakeup for pending transactions
When a Layer receives a pending transaction, it sets a flag on itself
that it needs a transaction to be handled, but it doesn't notify
SurfaceFlinger to iterate through the layers and check for that flag.
In some cases, this led to transactions never being processed, which
can hang an application trying to push buffers that are part of a
synchronized transaction. This change pokes SurfaceFlinger when setting
the Layer flag so that it doesn't slip through the cracks.
Bug:
32541494
Bug:
32629397
Test: Two successful monkey runs
Change-Id: I4b906eee8004fad1938aa94a1aa0a0c7ea289102
Marco Nelissen [Tue, 1 Nov 2016 21:45:07 +0000 (14:45 -0700)]
Remove unneeded dependencies from libui and libgui
Test: build/boot
Change-Id: I3714e0c081837060ac6a6b28a32117d29b95e3d0
Dan Stoza [Thu, 3 Nov 2016 16:44:21 +0000 (16:44 +0000)]
Merge "SF: Request SF wakeup for pending transactions"
Steven Moreland [Thu, 3 Nov 2016 15:34:58 +0000 (08:34 -0700)]
SensorService: delete unused include.
Test: compiles
Change-Id: I2b44e3734c9919ea156124f5a0306d7f52996f5e
Janis Danisevskis [Thu, 3 Nov 2016 11:41:42 +0000 (11:41 +0000)]
Fix build error when building with ENABLE_TREBLE=true
Fixes use of renamed header file hidl/IServiceManager.h
Test: builds with ENALBE_TREBLE=true
Change-Id: I519e081a003bfd5b909522660df84a1f3450d2ef
Dan Stoza [Wed, 2 Nov 2016 23:27:47 +0000 (16:27 -0700)]
SF: Request SF wakeup for pending transactions
When a Layer receives a pending transaction, it sets a flag on itself
that it needs a transaction to be handled, but it doesn't notify
SurfaceFlinger to iterate through the layers and check for that flag.
In some cases, this led to transactions never being processed, which
can hang an application trying to push buffers that are part of a
synchronized transaction. This change pokes SurfaceFlinger when setting
the Layer flag so that it doesn't slip through the cracks.
Bug:
32541494
Test: Two successful monkey runs
Change-Id: I4b906eee8004fad1938aa94a1aa0a0c7ea289102
Felipe Leme [Thu, 27 Oct 2016 23:31:27 +0000 (16:31 -0700)]
Created a dumpstate service.
For now this is still a limited service:
- It's only created when running an interactive bugreport.
- It only provides a listener to get updates.
- It will be just used by Shell to get updates.
Test: dumpstate_test passes
BUG:
31636879
Change-Id: Iae820261d220523c979bf905030456fcf0b2b618
TreeHugger Robot [Wed, 2 Nov 2016 04:25:31 +0000 (04:25 +0000)]
Merge "Moved libdumpstate.default back to Android.mk"
TreeHugger Robot [Tue, 1 Nov 2016 23:12:00 +0000 (23:12 +0000)]
Merge "Refactor SurfaceFlinger::onTransact"
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>
TreeHugger Robot [Mon, 31 Oct 2016 21:00:46 +0000 (21:00 +0000)]
Merge "Document FlattenableHelper design decision"
TreeHugger Robot [Mon, 31 Oct 2016 21:00:18 +0000 (21:00 +0000)]
Merge "Fix fd leak in Binder"
Jeff Sharkey [Mon, 31 Oct 2016 19:38:59 +0000 (19:38 +0000)]
Check and restorecon cache/code_cache directories. am:
397ec26675 am:
6437218b85 am:
c981bfb460
am:
faf9f4c017
Change-Id: I7d75922094a6c561c9ae99b14916b09c18840678
Jeff Sharkey [Mon, 31 Oct 2016 19:23:37 +0000 (19:23 +0000)]
Check and restorecon cache/code_cache directories. am:
397ec26675 am:
6437218b85
am:
c981bfb460
Change-Id: Iad65eeae8cdd82e86d62ecc8490046765c1f6b48
Fabien Sanglard [Fri, 21 Oct 2016 17:58:26 +0000 (10:58 -0700)]
Fix fd leak in Binder
Bug:
29982873
Test: Ran poc executable provided with bug report. After this
patch, the device is able to use the Camera after the DoS attemp.
Change-Id: I5990a25c76e9d78616caec4fc98fb5547f37a0de
Jeff Sharkey [Mon, 31 Oct 2016 19:17:36 +0000 (19:17 +0000)]
Check and restorecon cache/code_cache directories. am:
397ec26675
am:
6437218b85
Change-Id: I5fed67126cbcb03ac946507eada3fd66ada6c266
Jeff Sharkey [Mon, 31 Oct 2016 19:11:06 +0000 (19:11 +0000)]
Check and restorecon cache/code_cache directories.
am:
397ec26675
Change-Id: Ifd0ffc94a328f75148c24ff4e266461855c38965
Felipe Leme [Mon, 31 Oct 2016 18:41:05 +0000 (11:41 -0700)]
Moved libdumpstate.default back to Android.mk
When this module was moved to Android.bp it had no dependencies, but now
it depends on modules defined on Android.mk.
BUG:
26379932
BUG:
31636879
Test: m libdumpstate.default
Change-Id: I577ef5ca16738854dd03adf5d0b090ac10ef5d28
Fabien Sanglard [Fri, 28 Oct 2016 03:04:11 +0000 (20:04 -0700)]
Refactor SurfaceFlinger::onTransact
Reduce length of SurfaceFlinger::onTransact by moving credential
code to dedicated function.
Change-Id: I0fa30439443295b4a807e0eeae4f113d7b0534c4
Fabien Sanglard [Fri, 28 Oct 2016 02:05:29 +0000 (19:05 -0700)]
Document FlattenableHelper design decision
Change-Id: I163979c7b1b868e4396a9c70b262d0c4815f4e40
Jeff Sharkey [Mon, 31 Oct 2016 17:22:19 +0000 (11:22 -0600)]
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 [Mon, 31 Oct 2016 17:22:19 +0000 (11:22 -0600)]
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
Felipe Leme [Sat, 29 Oct 2016 17:44:12 +0000 (10:44 -0700)]
Re-added dumpstate.h to libdumpstate_default.cpp.
Without it, the sdk builds fail because they cannot link to
dumpstate_board().
BUG:
32512875
BUG:
31982882
BUG:
26379932
Test: manually built it
Change-Id: I3138f86a7747a09887c231f6c36767913249868e
Felipe Leme [Thu, 27 Oct 2016 22:58:27 +0000 (15:58 -0700)]
Encapsulates zip_writer_ on Dumpstate class.
BUG:
26379932
Test: DumpstateTest passes and manual verification of zip file.
Change-Id: I0113bec61cd32015fdd625afd2dca026bbf0ceab
Felipe Leme [Thu, 27 Oct 2016 22:51:12 +0000 (15:51 -0700)]
Uses DISALLOW_COPY_AND_ASSIGN.
BUG:
26379932
Test: DumpstateTest passes
Change-Id: I544929fdd1f9777d6e2e6c602ca75d00fee358b9
Naveen Kalla [Fri, 28 Oct 2016 23:16:48 +0000 (23:16 +0000)]
Merge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev am:
2a221ffc01
am:
9552bc0597 -s ours
Change-Id: I9c3e9782b2cd3d0fba98b5f81455511e7f4553be
Naveen Kalla [Fri, 28 Oct 2016 23:16:34 +0000 (23:16 +0000)]
resolve merge conflicts of
de591df to nyc-mr2-dev-plus-aosp
am:
27de3fc0a1 -s ours
Change-Id: I6184d22117a81ba5a7b0a8b18108eb9f178d08f9
Naveen Kalla [Fri, 28 Oct 2016 22:34:19 +0000 (22:34 +0000)]
Merge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev
am:
2a221ffc01
Change-Id: I45a190ea17a413250c9d9ec9fab0a8e44696be2c
Naveen Kalla [Fri, 28 Oct 2016 22:22:47 +0000 (15:22 -0700)]
resolve merge conflicts of
de591df to nyc-mr2-dev-plus-aosp
Test: Resolved merge conflict and make sure change compiles
Change-Id: I341d3be774687f6cc62f9abb5998ebd6389d07ee
TreeHugger Robot [Fri, 28 Oct 2016 21:46:11 +0000 (21:46 +0000)]
Merge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev
TreeHugger Robot [Fri, 28 Oct 2016 21:21:30 +0000 (21:21 +0000)]
Merge "Creates a libdumpstateheaders module to export headers."
TreeHugger Robot [Fri, 28 Oct 2016 20:21:59 +0000 (20:21 +0000)]
Merge "Dumpstate's netstat call should use -W."
TreeHugger Robot [Fri, 28 Oct 2016 19:29:12 +0000 (19:29 +0000)]
Merge "Add ANR traces to their own zip entries."
Felipe Leme [Thu, 27 Oct 2016 23:58:06 +0000 (16:58 -0700)]
Creates a libdumpstateheaders module to export headers.
Currently, the device-specific dumpstate projects uses dumpstate.h
by importing just the header in the their makefiles:
LOCAL_C_INCLUDES := frameworks/native/cmds/dumpstate
But this approach makes it hard to include external stuff on
dumpstate.h (like common macros) because it breaks the device-specific
builds (unless they are changed to include the proper shared library
dependency).
A better approach is to define a libdumpstateheaders that contains the
proper dependencies, and let the projects use it instead:
LOCAL_STATIC_LIBRARIES := libdumpstateheaders
BUG:
26379932
BUG:
31982882
Test: DumpstateTest passes and manual verification
Change-Id: Iaabff379aded412f33cda1f93f3253866aff9f25
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
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
Craig Donner [Fri, 28 Oct 2016 01:06:08 +0000 (01:06 +0000)]
Keep protected content in EGLImage attrs as needed. am:
a94d940c75
am:
78d93fcd28
Change-Id: Ifde3502241127dc24e2d16e100e304e07b44c619
Craig Donner [Fri, 28 Oct 2016 01:01:07 +0000 (01:01 +0000)]
Keep protected content in EGLImage attrs as needed.
am:
a94d940c75
Change-Id: I3376d949d387b4d0f70698b26dfd9f66755db88f
Fabien Sanglard [Thu, 27 Oct 2016 22:09:58 +0000 (22:09 +0000)]
Merge "Surfaceflinger: Document DdmConnection usage"
TreeHugger Robot [Thu, 27 Oct 2016 22:09:21 +0000 (22:09 +0000)]
Merge "Add modem logs to the bugreport"
Naveen Kalla [Thu, 20 Oct 2016 04:38:44 +0000 (21:38 -0700)]
DO NOT MERGE. Add modem logs to the bugreport
When user takes bug report, collect modem logs and add it to the
bugreport zip file.
Test: Take Bugreport and ensure that the modem logs are present
in userdebug builds. Also check that bug reports are collected
normally if there are no modem logs.
BUG=
32219165
Change-Id: Ia20fc95ceee95972e17ac4193d350bbae36b3630
Naveen Kalla [Thu, 20 Oct 2016 04:38:44 +0000 (21:38 -0700)]
Add modem logs to the bugreport
When user takes bug report, collect modem logs and add it to the
bugreport zip file.
Test: Take Bugreport and ensure that the modem logs are present
in userdebug builds. Also check that bug reports are collected
normally if there are no modem logs.
BUG=
32219165
Change-Id: Ia20fc95ceee95972e17ac4193d350bbae36b3630
Felipe Leme [Thu, 27 Oct 2016 17:04:47 +0000 (10:04 -0700)]
Add ANR traces to their own zip entries.
These files can be very large (O(20k) lines), so it makes more sense to
add them to their own zip entry.
Since this change could break tools that are expecting that section,
it's only enabled when setting the dumpstate version to 2.0-dev-1:
adb shell setprop dumpstate.version 2.0-dev-1
Test: DumpstateTest passes; manual verification
Bug:
32470528
Bug:
32064548
Change-Id: I4726b2209b15722c22defa87bffb24dc633d5bcd
Wei Wang [Thu, 27 Oct 2016 18:29:35 +0000 (18:29 +0000)]
Merge "TextOutput log improvement" am:
3e9e757437 am:
1ccb872a9e am:
1136e487b7
am:
a38cde50db
Change-Id: Id31e8949a2d8aa6edaae816c790c955e335bd56a
Wei Wang [Thu, 27 Oct 2016 18:24:35 +0000 (18:24 +0000)]
Merge "TextOutput log improvement" am:
3e9e757437 am:
1ccb872a9e
am:
1136e487b7
Change-Id: I29c8813ea1bcac32971925f53b277682ed2f948a
Wei Wang [Thu, 27 Oct 2016 18:19:05 +0000 (18:19 +0000)]
Merge "TextOutput log improvement" am:
3e9e757437
am:
1ccb872a9e
Change-Id: Ic9efec9193ed37c7bbfca966c07224b9e96349fb
Wei Wang [Thu, 27 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Merge "TextOutput log improvement"
am:
3e9e757437
Change-Id: I88fec0002898ec7da19d579d0aa4679b73bfcd53