OSDN Git Service
Dan Albert [Wed, 5 Oct 2016 20:37:09 +0000 (20:37 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef
am:
900da7b14a
Change-Id: I8d50ffcdaff60b51a81c0648a0087d645e99ee1d
Dan Albert [Wed, 5 Oct 2016 20:37:08 +0000 (20:37 +0000)]
Migrate libGLESv3 to ndk_library.
am:
d7d8efa471
Change-Id: I86f06ebcaa1e2dd860d61ff9cd9b5503158735ba
Dan Albert [Wed, 5 Oct 2016 20:36:58 +0000 (20:36 +0000)]
Migrate libGLESv2 to ndk_library.
am:
00500c798a
Change-Id: I3031e4a938bbfbd97b51735707bf5fe0bc884b37
Dan Albert [Wed, 5 Oct 2016 20:36:49 +0000 (20:36 +0000)]
Migrate libGLESv1_CM to ndk_library.
am:
7facb1db6e
Change-Id: I777d5d8b08ff11491aabdb4166d7c0d38b09f20c
Treehugger Robot [Wed, 5 Oct 2016 20:31:38 +0000 (20:31 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef
* changes:
Migrate libGLESv3 to ndk_library.
Migrate libGLESv2 to ndk_library.
Migrate libGLESv1_CM to ndk_library.
Colin Cross [Wed, 5 Oct 2016 18:56:41 +0000 (18:56 +0000)]
Merge "Fix anonymous struct and union warnings"
am:
87e72cb237
Change-Id: I1ace0ad7d2f175b6d6cc42a0ce6845c76ba032b3
Treehugger Robot [Wed, 5 Oct 2016 18:52:25 +0000 (18:52 +0000)]
Merge "Fix anonymous struct and union warnings"
Dan Albert [Wed, 5 Oct 2016 18:30:40 +0000 (18:30 +0000)]
Merge "Migrate libEGL to ndk_library."
am:
ce1bc304a2
Change-Id: If048759fd60754bd0c7df9c02f33f28a800eaace
Treehugger Robot [Wed, 5 Oct 2016 18:24:16 +0000 (18:24 +0000)]
Merge "Migrate libEGL to ndk_library."
Colin Cross [Sat, 1 Oct 2016 00:24:06 +0000 (17:24 -0700)]
Fix anonymous struct and union warnings
gui/BufferItem.h and android/sensor.h uses anymous structs and nested
anonymous unions, which are GNU extensions. sensor.h uses them as part
of its API, so disable the warnings in libgui, the only module that
tries to use it with -Weverything. BufferItem.h only uses the unioned
fields inside libgui, remove the union and do the 64-bit to 32-bit
slicing manually so libvulkan doesn't need the warnings disabled.
Bug:
31752268
Test: m -j
Change-Id: I92d59b1202f4d6e5419edaa6d27b6e1c50ac0042
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv3 to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I6a2f4df7f409596f487879eb7d43a7774dced894
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv2 to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I62e108bdd27b6dc40fdf7ede7d579a286cbf3b9b
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv1_CM to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: Icd83a5ef5d6afcde9441f49de14a8e645d15da2f
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libEGL to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I154a95c6fde9c34d770b6fe65bfd71ac51e05574
Colin Cross [Fri, 30 Sep 2016 23:43:18 +0000 (23:43 +0000)]
Merge "Rename dump methods to dumpState"
am:
c72b9a3ce4
Change-Id: I41cc42a6838c6e42bf257d8304f99d5ca8d74ab0
Colin Cross [Fri, 30 Sep 2016 23:30:24 +0000 (23:30 +0000)]
Merge "Rename dump methods to dumpState"
Colin Cross [Fri, 30 Sep 2016 20:09:27 +0000 (20:09 +0000)]
Merge changes I2ce11db5,Idba8278b
am:
dd3f863499
Change-Id: I811fb4b61aed0ee6324b48aff2a8b3dfa4581b86
Colin Cross [Fri, 30 Sep 2016 20:09:26 +0000 (20:09 +0000)]
Fix logging implicit sign conversions
am:
8bafabf1f6
Change-Id: I5bdd64dddd845b3ffc910bc2161363e27d4f83ba
Colin Cross [Fri, 30 Sep 2016 20:09:18 +0000 (20:09 +0000)]
Fix libgui warnings
am:
6c5a17dd26
Change-Id: I463a190d7830dbdc5817c753f57fa9b5cdecd404
Colin Cross [Tue, 27 Sep 2016 01:10:16 +0000 (18:10 -0700)]
Rename dump methods to dumpState
The dump methods shadow the IBinder dump method. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.
Bug:
31752268
Test: m -j
Merged-in: Iafc64da43032d5d9d84b64640e70d93fd7051bcf
Change-Id: Iafc64da43032d5d9d84b64640e70d93fd7051bcf
Colin Cross [Fri, 30 Sep 2016 19:56:38 +0000 (19:56 +0000)]
Merge changes I2ce11db5,Idba8278b
* changes:
Fix logging implicit sign conversions
Fix libgui warnings
Dan Stoza [Fri, 30 Sep 2016 17:52:19 +0000 (17:52 +0000)]
Merge changes I1c6a271f,I1e41e5f5,Ib2f48895,Ia8af95d2,Ie966e37d, ...
am:
2b23374b45
Change-Id: Ic74060aa51fe814d5033e9014059791a1e5cdd8c
Dan Stoza [Fri, 30 Sep 2016 17:52:16 +0000 (17:52 +0000)]
SF: Fix a couple of Layer ref count issues
am:
de84eb6b82
Change-Id: I779b869d340ce5320f7924ccd6579cada3227899
Dan Stoza [Fri, 30 Sep 2016 17:52:02 +0000 (17:52 +0000)]
Build SF executable with USE_HWC2 when needed
am:
f9f7f6931f
Change-Id: Icda54608b691f84969709a20fa7272abc045bd04
Dan Stoza [Fri, 30 Sep 2016 17:51:54 +0000 (17:51 +0000)]
HWC2: Clear transform for SolidColor layers
am:
f1098abecf
Change-Id: Iff664310ed2275c0ce9b7afaf8041b8a30ea3a6c
Dan Stoza [Fri, 30 Sep 2016 17:51:47 +0000 (17:51 +0000)]
HWC2: Use SolidColor composition for DimLayer
am:
0183f7acac
Change-Id: If9accf1d6ce13c34892ca72bda1778a624542337
Dan Stoza [Fri, 30 Sep 2016 17:51:39 +0000 (17:51 +0000)]
HWC2: Kill logspam for non-HWC virtual displays
am:
179533d107
Change-Id: Ib8398383cb606990920033538938855eda248071
Dan Stoza [Fri, 30 Sep 2016 17:51:32 +0000 (17:51 +0000)]
HWC2: Fix virtual displays
am:
5450fe5268
Change-Id: I6710be1bb5c5fb998143b4ad898c94a6eee98382
Dan Stoza [Fri, 30 Sep 2016 17:51:24 +0000 (17:51 +0000)]
HWC2: Don't set null handle for client layers
am:
6be002845f
Change-Id: I1fc9959536c40511c4fc49fa613d6fd7a97d43ad
Dan Stoza [Fri, 30 Sep 2016 17:51:16 +0000 (17:51 +0000)]
HWC2: Hook up to BoardConfig variable
am:
8beb15f220
Change-Id: I012809dac02ab2d87ac1650be2fc619f2b68fbbf
Dan Stoza [Fri, 30 Sep 2016 17:51:07 +0000 (17:51 +0000)]
HWC2: Skip validate/present if display is off
am:
00ac359a3b
Change-Id: I31fad8a631fc6b52cb4b6b4cfc26185ebb0214f2
Dan Stoza [Fri, 30 Sep 2016 17:44:52 +0000 (17:44 +0000)]
Merge changes I1c6a271f,I1e41e5f5,Ib2f48895,Ia8af95d2,Ie966e37d, ...
* changes:
SF: Fix a couple of Layer ref count issues
Build SF executable with USE_HWC2 when needed
HWC2: Clear transform for SolidColor layers
HWC2: Use SolidColor composition for DimLayer
HWC2: Kill logspam for non-HWC virtual displays
HWC2: Fix virtual displays
HWC2: Don't set null handle for client layers
HWC2: Hook up to BoardConfig variable
HWC2: Skip validate/present if display is off
Colin Cross [Fri, 30 Sep 2016 17:40:35 +0000 (17:40 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
am:
1d6c149d89
Change-Id: Iba83f822a72416e0b63b796f16065e8a672d66d9
Colin Cross [Tue, 27 Sep 2016 21:08:19 +0000 (14:08 -0700)]
Fix logging implicit sign conversions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Merged-in: I2ce11db524ee9d8f846fdf3ed6fb882d5ef57956
Change-Id: I2ce11db524ee9d8f846fdf3ed6fb882d5ef57956
Colin Cross [Tue, 27 Sep 2016 21:12:48 +0000 (14:12 -0700)]
Fix libgui warnings
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Merged-in: Idba8278bc0a73886ecb7978617854b433c0b5875
Change-Id: Idba8278bc0a73886ecb7978617854b433c0b5875
Colin Cross [Fri, 30 Sep 2016 17:33:29 +0000 (17:33 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
Colin Cross [Fri, 30 Sep 2016 00:46:51 +0000 (17:46 -0700)]
Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I46208cec43599f775f7e2cb22b39d19b0ea762e1
Colin Cross [Thu, 29 Sep 2016 23:44:40 +0000 (23:44 +0000)]
Merge "Fix weak vtable warnings"
am:
d93a40c920
Change-Id: I54d2cad55131ac3a8786012d692d4627f188a0a7
Colin Cross [Thu, 29 Sep 2016 23:44:30 +0000 (23:44 +0000)]
Merge "Rewrite multicharacter constant using constexpr"
am:
991667ba8c
Change-Id: Iecaee1af6b787187f971e57d8ca3d4d223c79627
Colin Cross [Thu, 29 Sep 2016 23:44:19 +0000 (23:44 +0000)]
Merge "Fix rule of three warnings"
am:
dfd195160a
Change-Id: Ifcc0ef0c71f465ada5c62cbcccd40580df802a51
Colin Cross [Thu, 29 Sep 2016 23:36:22 +0000 (23:36 +0000)]
Merge "Fix weak vtable warnings"
Colin Cross [Mon, 26 Sep 2016 20:48:02 +0000 (13:48 -0700)]
Fix weak vtable warnings
Move virtual destructors into cpp file so that the compiler knows which
translation unit to put the vtable into. Hide the warning for
DeathRecipient, which has no virtual methods to move. The warnings were
being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I25329d66bfc1f6a5064d05ce7d12ad9b090601f8
Colin Cross [Thu, 29 Sep 2016 23:35:54 +0000 (23:35 +0000)]
Merge "Rewrite multicharacter constant using constexpr"
Colin Cross [Tue, 27 Sep 2016 01:11:51 +0000 (18:11 -0700)]
Rewrite multicharacter constant using constexpr
Multi character constants are implementation defined behavior, use a
constexpr instead. The warnings were being hidden by the use of
-isystem to include frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I22435d1f66a073c303202da7a1940cb14b0b9fd8
Colin Cross [Thu, 29 Sep 2016 23:35:27 +0000 (23:35 +0000)]
Merge "Fix rule of three warnings"
Colin Cross [Tue, 27 Sep 2016 01:11:41 +0000 (18:11 -0700)]
Fix rule of three warnings
Sensor and BufferItem have destructors, the copy constructor and
assignment operators should not be implicit. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: If375d85cd3d6ded4ee6b27b841bf10f563254682
Dan Stoza [Tue, 9 Aug 2016 20:21:03 +0000 (13:21 -0700)]
SF: Fix a couple of Layer ref count issues
This is an attempt at fixing two reference counting issues for Layers.
The first issue is that since we were holding an sp<IBinder> (really a
reference to a LayerCleaner) inside the layer state for deferred
transactions, there was a possibility that it could end up being the
last strong reference to the LayerCleaner such that when it was
destroyed while applying a non-deferred transaction, it would attempt
to grab the SurfaceFlinger main lock to destroy its Layer. Since this
occurred in the main SurfaceFlinger loop, which was already holding
the lock to process transactions, this would cause a deadlock.
To fix this, the sp<IBinder> inside the layer state was changed to a
wp<IBinder>, only being promoted when it actually needs to be accessed
(i.e., when the deferred transaction is created).
The second issue is that we were promoting and holding a strong
reference to a Layer before calling into SurfaceFlinger to destroy it
on the onLayerDestroyed path (triggered when a LayerCleaner is
destroyed). After returning from the attempt to grab the SurfaceFlinger
main lock, it was possible that this strong reference was the last one
keeping the Layer alive, and destroying it at this point could cause
the HWC2 version of the layer to be destroyed at effectively any point,
even between validate/present.
To fix this, the promotion of the weak Layer reference was moved inside
the critical section where the SurfaceFlinger main lock is held.
Test: Cherry-pick from internal branch
Bug:
30503916
Bug:
30281222
Change-Id: I1c6a271f9a7b5d6eea9a9db61d971f262d0cfe84
Dan Stoza [Wed, 27 Jul 2016 22:05:38 +0000 (15:05 -0700)]
Build SF executable with USE_HWC2 when needed
The SurfaceFlinger executable wasn't picking up the USE_HWC2 flag when
enabled by the TARGET_USES_HWC2 BoardConfig, causing a mismatch in the
size of the SurfaceFlinger object. This fixes that by also passing
USE_HWC2 when building the executable.
Test: Cherry-pick from internal branch
Bug:
30302693
Change-Id: I1e41e5f548d4b8329590a082d9b69155ba365be9
Dan Stoza [Wed, 27 Jul 2016 17:16:52 +0000 (10:16 -0700)]
HWC2: Clear transform for SolidColor layers
Clears the transform for SolidColor layers, since it doesn't make sense
to transform layers without a buffer.
Test: Cherry-pick from internal branch
Bug:
30429522
Change-Id: Ib2f4889531556c7ab00e3b270319c321e9f32c84
Dan Stoza [Wed, 20 Jul 2016 19:52:38 +0000 (12:52 -0700)]
HWC2: Use SolidColor composition for DimLayer
Switches SurfaceFlinger to try to use SolidColor HWC device
composition for DimLayers instead of always falling back to client
composition.
Test: Cherry-pick from internal branch
Bug:
30216498
Change-Id: Ia8af95d214ba72b5657f32f7827a1e6278629f17
Dan Stoza [Thu, 21 Jul 2016 18:09:40 +0000 (11:09 -0700)]
HWC2: Kill logspam for non-HWC virtual displays
Removes some logspam and fixes some non-errors which were reported as
errors when running a virtual display that is not backed by hardware
composer.
Test: Cherry-pick from internal branch
Bug:
30022738
Change-Id: Ie966e37d95f53bcc050eef064d24bbe26748b7fd
Dan Stoza [Wed, 13 Jul 2016 22:48:58 +0000 (15:48 -0700)]
HWC2: Fix virtual displays
Close the output buffer release fence per the contract in
hwcomposer2.h.
Also changes the HWC2 device to hold a weak pointer to the display,
which allows it to properly remove it when it gets torn down.
Test: Cherry-pick from internal branch
Bug:
29945684
Change-Id: Ib1b5d81e42a63d0e65b189f7c6c62e661e0ab6ae
Dan Stoza [Tue, 21 Jun 2016 22:02:23 +0000 (15:02 -0700)]
HWC2: Don't set null handle for client layers
Removes the code that explicitly set a null buffer handle for client
layers.
Test: Cherry-pick from internal branch
Bug:
29463310
Change-Id: I570e6041ba72d64971bb6c364e8e7b6f84eeff08
Dan Stoza [Tue, 21 Jun 2016 17:00:37 +0000 (10:00 -0700)]
HWC2: Hook up to BoardConfig variable
Uses TARGET_USES_HWC2 to enable the HWC2 code path in SurfaceFlinger
Test: Cherry-pick from internal branch
Bug:
27211042
Change-Id: I7b7e3e3f7a918e74df0be27418196c81b4332564
Dan Stoza [Fri, 17 Jun 2016 18:29:01 +0000 (11:29 -0700)]
HWC2: Skip validate/present if display is off
Adds checks to ensure that the display is still on before attempting
to call into prepareFrame/commit (which in turn call into
validate/present).
Test: Cherry-pick from internal branch
Bug:
28596387
Change-Id: Iad87f02c3e44e86db43a15c258ee66b0cde14faa
Colin Cross [Thu, 29 Sep 2016 17:32:11 +0000 (17:32 +0000)]
Merge "Fix implicit sign casts in Parcel.h"
am:
9984fa0ed0
Change-Id: I7a5fb0652ccfd88094ceb2e48a8ff2291166f7f7
Colin Cross [Thu, 29 Sep 2016 17:20:07 +0000 (17:20 +0000)]
Merge "Fix implicit sign casts in Parcel.h"
Colin Cross [Tue, 27 Sep 2016 20:58:30 +0000 (13:58 -0700)]
Fix implicit sign casts in Parcel.h
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I20d9a5712c77894f9048ef78264d7dc9f59208ea
Andreas Gampe [Thu, 29 Sep 2016 00:20:22 +0000 (00:20 +0000)]
Merge "Installd: Add a delete_odex command"
am:
d6df7e33ad
Change-Id: Ife9a2c8c7ee8339dc4e416a397519590fca2cdf6
Treehugger Robot [Thu, 29 Sep 2016 00:00:49 +0000 (00:00 +0000)]
Merge "Installd: Add a delete_odex command"
Colin Cross [Wed, 28 Sep 2016 23:21:31 +0000 (23:21 +0000)]
Merge "Fix libinput warnings"
am:
a4767442e3
Change-Id: I2bf4442e4785a3a15331d7c0482925326a9f38c4
Colin Cross [Wed, 28 Sep 2016 23:13:54 +0000 (23:13 +0000)]
Merge "Fix libinput warnings"
Colin Cross [Tue, 27 Sep 2016 21:12:09 +0000 (14:12 -0700)]
Fix libinput warnings
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I13f03892c75ea3c3139ca676666b0d403871d241
Chih-hung Hsieh [Wed, 28 Sep 2016 23:02:33 +0000 (23:02 +0000)]
Merge "Fix google-explicit-constructor warnings in HardwareAPI."
am:
c8de4a06ab
Change-Id: Ic8d39038699dd9bfa56bbdeb6f29293bad47d4f5
Chih-hung Hsieh [Wed, 28 Sep 2016 23:02:20 +0000 (23:02 +0000)]
Merge "Fix google-explicit-constructor warnings in gui and ui."
am:
170454b0fa
Change-Id: I1b95e35d622827f27b1637af00e312c055fd2c27
Chih-Hung Hsieh [Wed, 28 Sep 2016 23:02:07 +0000 (23:02 +0000)]
Merge "Fix google-explicit-constructor warnings in opengl."
am:
9ccba3c090
Change-Id: Icf73c478090ef837c24aa3b4b75152ad4eef3480
Chih-hung Hsieh [Wed, 28 Sep 2016 22:55:30 +0000 (22:55 +0000)]
Merge "Fix google-explicit-constructor warnings in HardwareAPI."
Chih-hung Hsieh [Wed, 28 Sep 2016 22:55:23 +0000 (22:55 +0000)]
Merge "Fix google-explicit-constructor warnings in gui and ui."
Treehugger Robot [Wed, 28 Sep 2016 22:55:16 +0000 (22:55 +0000)]
Merge "Fix google-explicit-constructor warnings in opengl."
Colin Cross [Wed, 28 Sep 2016 21:02:00 +0000 (21:02 +0000)]
Merge "Fix order of operations warning in libui"
am:
73d4186757
Change-Id: Ib93a8ddcb912b05cd38db1dea7ac0ff21a788bcd
Colin Cross [Wed, 28 Sep 2016 20:59:31 +0000 (20:59 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
am:
8cdcd15c38
Change-Id: If6768b8a9468833f0fec5025f95c1796dc2869ca
Andreas Gampe [Sat, 10 Sep 2016 00:07:04 +0000 (17:07 -0700)]
Installd: Add a delete_odex command
Add a command to delete odex files.
Bug:
31347757
Change-Id: I29bca8751bcee8d6981c682fbbc816c73b78ac68
(cherry picked from commit
3964da0636624ff9af42d1f316bed0752e37c490)
Colin Cross [Wed, 28 Sep 2016 20:57:56 +0000 (20:57 +0000)]
Merge "Fix order of operations warning in libui"
Colin Cross [Tue, 27 Sep 2016 21:09:07 +0000 (14:09 -0700)]
Fix order of operations warning in libui
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I21f34567927125d3eeeecd8f00271a175f93af21
Colin Cross [Wed, 28 Sep 2016 20:53:15 +0000 (20:53 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
Dimitry Ivanov [Wed, 28 Sep 2016 19:01:21 +0000 (19:01 +0000)]
Merge "Add missing liblog dependency"
am:
c4dd0c3b83
Change-Id: I710f932670b8374e11a19fe96f2a53b622753468
Dimitry Ivanov [Wed, 28 Sep 2016 18:56:35 +0000 (18:56 +0000)]
Merge "Add missing liblog dependency"
Colin Cross [Mon, 26 Sep 2016 20:48:25 +0000 (13:48 -0700)]
Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: If2bae8b2fbc4238d6251cdd78bc7b5216684f99d
Dan Albert [Wed, 28 Sep 2016 08:54:12 +0000 (08:54 +0000)]
Merge "Include what we use."
am:
be7fdfc2a1
Change-Id: Ifb6f3d6424dc3f1295a8c50a8773b58410b562d9
Treehugger Robot [Wed, 28 Sep 2016 08:50:27 +0000 (08:50 +0000)]
Merge "Include what we use."
Dan Albert [Wed, 28 Sep 2016 07:03:56 +0000 (00:03 -0700)]
Include what we use.
Test: make checkbuild
Bug: None
Change-Id: If803e761c6d7e0c6d043bbcd2ace47f373495db3
Colin Cross [Wed, 28 Sep 2016 03:51:56 +0000 (03:51 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f
am:
132fb22957
Change-Id: Idb0a92939564554becffe4cfa7209f9c220176e6
Colin Cross [Wed, 28 Sep 2016 03:51:55 +0000 (03:51 +0000)]
Fix constructor parameters shadowing member variables
am:
382ecd3d63
Change-Id: I89fc7c1780eab42ab17e028997db2d125f59c2d8
Colin Cross [Wed, 28 Sep 2016 03:51:37 +0000 (03:51 +0000)]
Use uint32_t consistently for region op
am:
8f279960c6
Change-Id: Ibe726f674fc22ca69cd33242ff0059ac6dd70c48
Colin Cross [Wed, 28 Sep 2016 03:51:27 +0000 (03:51 +0000)]
Fix trailing semicolon warnings
am:
17576de056
Change-Id: I6bb34741553c12225d62fd4fdcde74e14502a15c
Colin Cross [Wed, 28 Sep 2016 03:37:50 +0000 (03:37 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f
* changes:
Fix constructor parameters shadowing member variables
Use uint32_t consistently for region op
Fix trailing semicolon warnings
Dan Albert [Wed, 28 Sep 2016 03:37:33 +0000 (03:37 +0000)]
Merge "Migrate libandroid headers to ndk_headers."
am:
fd9d1fb52b
Change-Id: I3762d8549bc449283c874f420d0fa72bda40f244
Treehugger Robot [Wed, 28 Sep 2016 03:32:56 +0000 (03:32 +0000)]
Merge "Migrate libandroid headers to ndk_headers."
Colin Cross [Mon, 26 Sep 2016 20:33:59 +0000 (13:33 -0700)]
Fix constructor parameters shadowing member variables
Using the same name for the constructor parameter and the member
variable causes a warning that was being hidden by the use of -isystem
to include frameworks/native/include. Prefix the parameter with an
underscore.
Bug:
31752268
Test: m -j
Change-Id: I7748934f1e9515176e2ae98d2c0e58d165a7a5c2
Colin Cross [Mon, 26 Sep 2016 20:08:16 +0000 (13:08 -0700)]
Use uint32_t consistently for region op
An implicit conversion warning was being hidden by the use of -isystem
to include frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I008ef537a24311d58816fae12ef8c4aeaba07547
Colin Cross [Mon, 26 Sep 2016 20:07:06 +0000 (13:07 -0700)]
Fix trailing semicolon warnings
Remove semicolons after inline function definitions. The warnings were
being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I1027e87f459c36a575cd04b3afb645736832b07b
Dimitry Ivanov [Tue, 27 Sep 2016 16:29:02 +0000 (09:29 -0700)]
Add missing liblog dependency
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and recompile
Change-Id: I01e7a0ca758308b5f85f2a08f34a9671eaa48b10
Dimitry Ivanov [Sat, 24 Sep 2016 22:16:19 +0000 (22:16 +0000)]
Merge "Add missing liblog dependency"
am:
b32a59e797
Change-Id: I8ed998f6342914164f89ce8584bca61b8daa4244
Dimitry Ivanov [Sat, 24 Sep 2016 22:07:19 +0000 (22:07 +0000)]
Merge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 24 Sep 2016 00:22:33 +0000 (17:22 -0700)]
Add missing liblog dependency
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and recompile
Change-Id: I5d6ded54613e8a29f20495d8f977064f0af2ffd6
David Pursell [Fri, 23 Sep 2016 23:52:03 +0000 (23:52 +0000)]
Merge "libgui: add a test for Sensor serialization."
am:
01a0c92da0
Change-Id: Idac427f7e0fa170b1a70ad274f39994361fa452d
Treehugger Robot [Fri, 23 Sep 2016 23:44:11 +0000 (23:44 +0000)]
Merge "libgui: add a test for Sensor serialization."
Ajay Panicker [Fri, 23 Sep 2016 23:07:50 +0000 (23:07 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)"
am:
d95b2eb2f6
Change-Id: Ida600de84569296a3c146ca54aba86f9b88a5816
Ajay Panicker [Fri, 23 Sep 2016 23:01:16 +0000 (23:01 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)"
Dan Albert [Fri, 23 Sep 2016 22:57:45 +0000 (15:57 -0700)]
Migrate libandroid headers to ndk_headers.
Test: make native
Bug: http://b/
30465923
Change-Id: I0ef0b3630670241c4efd22515b6ab13eb41a81b3
OSDN Git Service
