OSDN Git Service
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."
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
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
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
Connor O'Brien [Thu, 27 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am:
06d83ad741 am:
12a04a524b am:
ea4dfd2f0d
am:
6bb878f9aa
Change-Id: I0be634aec218d99d57a81655397dac3f777e4565
Connor O'Brien [Thu, 27 Oct 2016 18:09:33 +0000 (18:09 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am:
06d83ad741 am:
12a04a524b
am:
ea4dfd2f0d
Change-Id: I3485f6010a1090e4d709fb920b06b68a7d1cbb0a
Treehugger Robot [Thu, 27 Oct 2016 18:05:46 +0000 (18:05 +0000)]
Merge "TextOutput log improvement"
Connor O'Brien [Thu, 27 Oct 2016 18:05:03 +0000 (18:05 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am:
06d83ad741
am:
12a04a524b
Change-Id: I4f5d47d6d239d0df4b8e994645cd5bde4e45b88f
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
Connor O'Brien [Thu, 27 Oct 2016 17:54:14 +0000 (17:54 +0000)]
Merge "Enable multiple concurrent binderLibTest instances"
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
Change-Id: Ic182810cbaacdfaf912c57667f5176d3e47941a9
Connor O'Brien [Thu, 27 Oct 2016 00:58:51 +0000 (17:58 -0700)]
Enable multiple concurrent binderLibTest instances
Each instance tries to register a service with the
same name, so suffix the service name with the
instance's PID to avoid collisions.
Test: Tests run and pass in 2 processes at once
Change-Id: I685b01fbfbad4e9bd3eb6ea06f46ffc157169909
Signed-off-by: Connor O'Brien <connoro@google.com>
Colin Cross [Wed, 26 Oct 2016 23:42:21 +0000 (23:42 +0000)]
Merge "Replace surfaceflinger protobufs with protobuf-lite"
Fabien Sanglard [Wed, 26 Oct 2016 22:34:54 +0000 (15:34 -0700)]
Surfaceflinger: Document DdmConnection usage
Change-Id: Iebb1448ea8421b6bc8e5aedff64dddc50dbb012a
Colin Cross [Wed, 26 Oct 2016 19:52:53 +0000 (12:52 -0700)]
Replace surfaceflinger protobufs with protobuf-lite
Use lite protobufs for surfaceflinger to remove dependency on
libprotobuf-cpp-full, which will be removed from the platform.
Bug:
32417805
Test: builds
Change-Id: Ie27b253a2f6c1b296c4ae7c7cb056cd3c4c0dde6
Etan Cohen [Wed, 26 Oct 2016 18:20:17 +0000 (11:20 -0700)]
[NAN-AWARE] Rename NAN to Aware [DO NOT MERGE]
Rename only (and any reformatting needed to pass lint) - no
functional changes!
Bug:
32263750
Test: All unit tests and integration (sl4a) tests pass.
Change-Id: I5088933ed615cab296a87e993a219b8c8626ed57
TreeHugger Robot [Wed, 26 Oct 2016 18:00:49 +0000 (18:00 +0000)]
Merge "TextOutput log improvement"
Ruben Brunk [Wed, 26 Oct 2016 00:35:09 +0000 (00:35 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am:
4e1d67bd32 am:
323f83ef75 am:
4466e11fd4
am:
82ecb9094c
Change-Id: I0af3a3da502c92d89fe56a83c35459460a81e431
Ruben Brunk [Wed, 26 Oct 2016 00:34:55 +0000 (00:34 +0000)]
Do not set VR mode feature as handset default. am:
5ce292f55b am:
f0f8f0a99d am:
f27cfdd82e
am:
b3d7a8c895
Change-Id: I9838611119c1b1ee75496548e6b2ad433ef2fdbe
Ruben Brunk [Wed, 26 Oct 2016 00:31:07 +0000 (00:31 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am:
4e1d67bd32 am:
323f83ef75
am:
4466e11fd4
Change-Id: I8577f7b46f6c53db78058c759fcfa0905ac73e8f
Ruben Brunk [Wed, 26 Oct 2016 00:30:52 +0000 (00:30 +0000)]
Do not set VR mode feature as handset default. am:
5ce292f55b am:
f0f8f0a99d
am:
f27cfdd82e
Change-Id: Ibe09a9e433ec8e18ce39d9369be3ce4e671a2e4d
Ruben Brunk [Wed, 26 Oct 2016 00:27:33 +0000 (00:27 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am:
4e1d67bd32
am:
323f83ef75
Change-Id: I7f7ba9248fb860fb82522920d9befb443ebea88a
Ruben Brunk [Wed, 26 Oct 2016 00:27:21 +0000 (00:27 +0000)]
Do not set VR mode feature as handset default. am:
5ce292f55b
am:
f0f8f0a99d
Change-Id: I9c6f99532804546911f81b3e03faed63b652c00f
Ruben Brunk [Wed, 26 Oct 2016 00:23:04 +0000 (00:23 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev
am:
4e1d67bd32
Change-Id: I951313d72530540077a777406754ab97a4566d72
Ruben Brunk [Wed, 26 Oct 2016 00:22:50 +0000 (00:22 +0000)]
Do not set VR mode feature as handset default.
am:
5ce292f55b
Change-Id: I913dc6997a275c90b0617c0a785e3991a947bc22
Ruben Brunk [Wed, 26 Oct 2016 00:15:11 +0000 (00:15 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev
Steve Pfetsch [Tue, 25 Oct 2016 22:31:15 +0000 (22:31 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am:
103ba31665 am:
b3f571bc1e am:
72b05e9e96
am:
479b9f9ddc
Change-Id: Ida277d532ddbb79bdbd44d98d2ec1e3cb8be54e9
Steve Pfetsch [Tue, 25 Oct 2016 22:31:03 +0000 (22:31 +0000)]
Revert "services: surfaceflinger: ASAN fix" am:
598f6d5429 am:
d5156b70ff am:
12924419de
am:
6d2eb659a5
Change-Id: I609bac956dff460334942bd348c0eedc53a42123
Steve Pfetsch [Tue, 25 Oct 2016 22:23:16 +0000 (22:23 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am:
103ba31665 am:
b3f571bc1e
am:
72b05e9e96
Change-Id: I57bc57e60f654471d92271796b6e099b544760fd
Steve Pfetsch [Tue, 25 Oct 2016 22:23:03 +0000 (22:23 +0000)]
Revert "services: surfaceflinger: ASAN fix" am:
598f6d5429 am:
d5156b70ff
am:
12924419de
Change-Id: I520fff2e1cc9b3a49478cbc9e783df081defc75d
Steve Pfetsch [Tue, 25 Oct 2016 22:13:39 +0000 (22:13 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am:
103ba31665
am:
b3f571bc1e
Change-Id: Iddae1b7f6acf45da61a74622947153cf282e6a91
Steve Pfetsch [Tue, 25 Oct 2016 22:13:26 +0000 (22:13 +0000)]
Revert "services: surfaceflinger: ASAN fix" am:
598f6d5429
am:
d5156b70ff
Change-Id: I35366694c5518390d49d803806955fc85bfc34f2
Steve Pfetsch [Tue, 25 Oct 2016 22:05:01 +0000 (22:05 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev
am:
103ba31665
Change-Id: Ic40bef2b672597ad00b4b106410c4347b556998b
Steve Pfetsch [Tue, 25 Oct 2016 22:05:00 +0000 (22:05 +0000)]
Revert "services: surfaceflinger: ASAN fix"
am:
598f6d5429
Change-Id: Ic7f8483308c1f553e1614c8d1624583c9c472423
Steve Pfetsch [Tue, 25 Oct 2016 21:54:41 +0000 (21:54 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev
Steve Pfetsch [Tue, 25 Oct 2016 21:47:58 +0000 (21:47 +0000)]
Revert "services: surfaceflinger: ASAN fix"
This reverts commit
1d3df546d5ee4dcc9e7cae6f8b8b790f741539af.
Original patch may have caused a stability issue caught in monkey testing.
Bug:
32312240
Change-Id: Ie8d291679590e624b8b90c4786b1c25c76cb2c9f
Felipe Leme [Tue, 25 Oct 2016 21:27:04 +0000 (21:27 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am:
7781eccbc3 am:
dca861e167 am:
f97bd91368
am:
98cf2f775d -s ours
Change-Id: Ie79e1b5076e45c2975a437b35852ca28e18f11e5
Felipe Leme [Tue, 25 Oct 2016 21:26:50 +0000 (21:26 +0000)]
resolve merge conflicts of
a97a282 to nyc-mr2-dev-plus-aosp
am:
257cdc33db -s ours
Change-Id: I57d67a5bf83f3f8385a6bef98ef8a5c63f577f79
Felipe Leme [Tue, 25 Oct 2016 21:18:59 +0000 (21:18 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am:
7781eccbc3 am:
dca861e167
am:
f97bd91368
Change-Id: Ie01cd86bfb242b2e02ba55ecffad9c99a2ab962b
Felipe Leme [Tue, 25 Oct 2016 21:13:13 +0000 (14:13 -0700)]
resolve merge conflicts of
a97a282 to nyc-mr2-dev-plus-aosp
BUG:
32365477
Change-Id: I8075346262e94ca64b144a42f2e886496ffff62c
Felipe Leme [Tue, 25 Oct 2016 20:54:39 +0000 (20:54 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am:
7781eccbc3
am:
dca861e167
Change-Id: I3f03bee749bde460029a6f27ad57897fe4b38115
Felipe Leme [Tue, 25 Oct 2016 20:54:26 +0000 (20:54 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time." am:
bb6b604623
am:
dfc9df466f
Change-Id: I811887b84ada7e44745548064926f0bfd9f3ad57
Felipe Leme [Tue, 25 Oct 2016 20:49:46 +0000 (20:49 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev
am:
7781eccbc3
Change-Id: If9f104497a20203c6fd854091082672826857b52
Felipe Leme [Tue, 25 Oct 2016 20:49:45 +0000 (20:49 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."
am:
bb6b604623
Change-Id: I08b640b8c1ffae80205be5dcf179403c335e43ba
TreeHugger Robot [Tue, 25 Oct 2016 20:44:14 +0000 (20:44 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev
Felipe Leme [Tue, 25 Oct 2016 18:18:24 +0000 (18:18 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."
This reverts commit
f87959e00732d7d737527f1248a71adea99ae29d.
BUG:
32402587
Fixes:
32365477
Change-Id: Ic4daec37efbaef1906450bf6609d5588d5c9a835
OSDN Git Service
