Nick Kralevich
1d94a1d036
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831 -s ours
...
am: a2685ebb1e#2
2015-10-23 04:32:47 +00:00
Nick Kralevich
a2685ebb1e
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours
...
am: dbc9a47831#2
2015-10-23 04:26:03 +00:00
Nick Kralevich
dbc9a47831
DO NOT MERGE: fix build try #2 am: 778b6f4902
...
am: 034bc1799c#2
2015-10-23 04:19:51 +00:00
Nick Kralevich
034bc1799c
DO NOT MERGE: fix build try #2
...
am: 778b6f4902#2
2015-10-23 04:15:21 +00:00
Nick Kralevich
1b28b05d2e
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7
...
am: 9ec978732f
2015-10-23 02:02:42 +00:00
Nick Kralevich
9ec978732f
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65
...
am: fa632f6ad7
2015-10-23 01:52:34 +00:00
Nick Kralevich
fa632f6ad7
resolve merge conflicts of 834ac204ce to klp-modular-dev.
...
am: 7f1ea80d65
2015-10-23 01:44:26 +00:00
Nick Kralevich
7f1ea80d65
resolve merge conflicts of 834ac204ce to klp-modular-dev.
...
Bug: 23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
2015-10-22 17:26:28 -07:00
Nick Kralevich
778b6f4902
DO NOT MERGE: fix build try #2
...
On klp-dev, UINT16_MAX isn't available unless __STDINT_LIMITS
is defined, which it's not for this code. This isn't relevant
for later branches due to bionic commit
e2a292d278b94fec3d078b1f1b27c1f89942c276
Don't use UINT16_MAX when we can just hardcode 65535.
Bug: 23905002
Change-Id: Ia1fd0f749cb7a4d19866075abc28ed6960424e54
2015-10-22 14:50:53 -07:00
Nick Kralevich
834ac204ce
DO NOT MERGE: fix build breakage
...
fix klp-dev only build breakage.
frameworks/native/libs/input/Input.cpp: In member function 'android::status_t android::MotionEvent::readFromParcel(android::Parcel*)':
frameworks/native/libs/input/Input.cpp:494:47: error: 'UINT16_MAX' was not declared in this scope
Bug: 23905002
Change-Id: I4b6b864ca64d39a8873d045a61e0ddaea2ab9109
2015-10-22 07:09:23 -07:00
Flanker
9830f11dc6
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869
...
am: 90dc6dc825
2015-10-22 02:15:13 +00:00
Flanker
90dc6dc825
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01
...
am: 9964d83869
2015-10-22 02:10:12 +00:00
Flanker
9964d83869
add number constraint for samples per MotionEvent am: 5d17838ade
...
am: 72c8ca4a01
2015-10-22 02:04:55 +00:00
Flanker
72c8ca4a01
add number constraint for samples per MotionEvent
...
am: 5d17838ade
2015-10-22 02:02:46 +00:00
Flanker
5d17838ade
add number constraint for samples per MotionEvent
...
Bug:23905002
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
(cherry picked from commit 552a8a5d8d
2015-10-20 12:28:15 -07:00
Naveen Leekha
7b4863f606
am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
...
am: 7534e4e63a
2015-10-20 16:42:34 +00:00
Naveen Leekha
c4bd721137
resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
...
Change-Id: I543df164076b44578b14d41031800bb62b81586d
2015-09-24 15:55:21 -07:00
Naveen Leekha
7534e4e63a
am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
...
* commit '18165848e86feab8656bfdac3173bccf45a9a6df':
Initialize local variables to avoid data leak
2015-09-24 22:20:05 +00:00
Naveen Leekha
e889592e33
am 73887c08: am b414255f: Initialize local variables to avoid data leak
...
* commit '73887c0864c9a928db6f66bd48c5aea4d31d9a8b':
Initialize local variables to avoid data leak
2015-09-24 22:13:06 +00:00
Naveen Leekha
18165848e8
am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
...
* commit 'e2c4f4fb8b34e36a4f2760f3812c942604cabfb6':
Initialize local variables to avoid data leak
2015-09-24 22:04:48 +00:00
Naveen Leekha
73887c0864
am b414255f: Initialize local variables to avoid data leak
...
* commit 'b414255f53b560a06e642251535b019327ba0d7b':
Initialize local variables to avoid data leak
2015-09-24 22:00:33 +00:00
Naveen Leekha
e2c4f4fb8b
am c1e6fbb5: Initialize local variables to avoid data leak
...
* commit 'c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4':
Initialize local variables to avoid data leak
2015-09-24 22:00:13 +00:00
Naveen Leekha
b414255f53
Initialize local variables to avoid data leak
...
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Partial manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest
to automerge from klp-dev)
For b/23696300
Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
2015-09-22 18:04:44 -07:00
Naveen Leekha
c1e6fbb52c
Initialize local variables to avoid data leak
...
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c )
For b/23696300
Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab
2015-09-22 17:58:21 -07:00
Christopher Tate
990c54485f
am 35851e2a: am 38ff2b44: am c1d8af50: am 3a9b9aec: am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
...
* commit '35851e2abbfe8f1d9c4cc7dc13a6e6e155b61664':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:57:06 +00:00
Christopher Tate
35851e2abb
am 38ff2b44: am c1d8af50: am 3a9b9aec: am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
...
* commit '38ff2b44ad7a64768cd1bb8793ec6c45e8d1e68e':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:45:16 +00:00
Christopher Tate
38ff2b44ad
am c1d8af50: am 3a9b9aec: am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
...
* commit 'c1d8af50c314164c0e6760d364b47d16b8d423ee':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:33:03 +00:00
Christopher Tate
8bd860c3dc
am 110654ae: am 8e44d0a1: am 0804ed8e: am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
...
* commit '110654ae44e45b1afd5badd24ada96cb9018bed1':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:18:21 +00:00
Christopher Tate
c1d8af50c3
am 3a9b9aec: am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
...
* commit '3a9b9aec7a0c04b74a278be5773fcfdaa2a04f4e':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:07:24 +00:00
Christopher Tate
110654ae44
am 8e44d0a1: am 0804ed8e: am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
...
* commit '8e44d0a173d1f0ec4075778791c88dc392f3981e':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:06:40 +00:00
Christopher Tate
8e44d0a173
am 0804ed8e: am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
...
* commit '0804ed8e604f2c4304fa7be3a84f429f770221bf':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:55:53 +00:00
Christopher Tate
134fd91bcc
am 708b42e0: am eba7afcc: am 2f340be3: Disregard alleged binder entities beyond parcel bounds
...
* commit '708b42e0ee5ad97b8426a6245f73131ddfc59a33':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:55:43 +00:00
Christopher Tate
3a9b9aec7a
am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
...
* commit 'dc3d6af97d521678981c773ad9f4e1da088d7870':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:42:09 +00:00
Christopher Tate
708b42e0ee
am eba7afcc: am 2f340be3: Disregard alleged binder entities beyond parcel bounds
...
* commit 'eba7afcc14f55e7fd32db9254f2b186108e1c776':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:41:09 +00:00
Christopher Tate
dc3d6af97d
am bb686c25: Disregard alleged binder entities beyond parcel bounds
...
* commit 'bb686c25b214edadd1830abd056db2d570d716ff':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:31:09 +00:00
Christopher Tate
0804ed8e60
am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
...
* commit '1b8a2f82fedffbc0b24c884def197db392b16576':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:29:18 +00:00
Christopher Tate
eba7afcc14
am 2f340be3: Disregard alleged binder entities beyond parcel bounds
...
* commit '2f340be345612d9fc2ecb1ea2a4c9e147610a593':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:28:56 +00:00
Anthony Hugh
209ea40e8f
am 9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
...
* commit '9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f':
DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-25 01:27:44 +00:00
Anthony Hugh
9e415d719e
DO NOT MERGE: Introduce stem keycodes for Wear
...
Cherry-pick from master
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG: 21903503
Change-Id: I762b8c0bcf3780a1756f4c1b8bbf07a039ba7781
2015-06-24 14:42:17 -07:00
Christopher Tate
bb686c25b2
Disregard alleged binder entities beyond parcel bounds
...
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug 17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit 27182be9f2
2015-06-24 20:46:58 +00:00
Christopher Tate
2f340be345
Disregard alleged binder entities beyond parcel bounds
...
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug 17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit 27182be9f2
2015-06-24 20:46:38 +00:00
Christopher Tate
1b8a2f82fe
Disregard alleged binder entities beyond parcel bounds
...
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug 17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit 27182be9f2
2015-06-24 20:46:05 +00:00
Adam Lesinski
d2fb7a6e49
am 8728c390: am 2c4f5fde: am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
...
* commit '8728c390476110857dd6b290dac3bfdf13b33e81':
Verify that the native handle was created
2015-05-28 22:30:05 +00:00
Adam Lesinski
8728c39047
am 2c4f5fde: am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
...
* commit '2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b':
Verify that the native handle was created
2015-05-28 21:44:36 +00:00
Adam Lesinski
2c4f5fdeca
am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
...
* commit '861c3f56157813627467054f488ecff7d339f2b0':
Verify that the native handle was created
2015-05-28 21:11:44 +00:00
Adam Lesinski
861c3f5615
am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
...
* commit '9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0':
Verify that the native handle was created
2015-05-28 20:40:46 +00:00
Adam Lesinski
9004e7f551
am 4ff0cb44: Verify that the native handle was created
...
* commit '4ff0cb4404db31576cd8a81ca5ef3b044d492904':
Verify that the native handle was created
2015-05-28 20:26:02 +00:00
Adam Lesinski
4ff0cb4404
Verify that the native handle was created
...
The inputs to native_handle_create can cause an overflowed allocation,
so check the return value of native_handle_create before accessing
the memory it returns.
Bug:19334482
Change-Id: I1f489382776c2a1390793a79dc27ea17baa9b2a2
(cherry picked from commit eaac99a717
2015-05-13 17:16:00 +00:00
Dan Stoza
5d10894c9d
am ef47c080: am 958f5011: Merge "libgui: Allow an IGBProducer to disable allocation"
...
* commit 'ef47c080fd0e7fb8bf1fc4b0ecadae277a22f2cf':
libgui: Allow an IGBProducer to disable allocation
2015-04-24 16:12:30 +00:00
Dan Stoza
437fb850b0
am f96a7581: am fb6d43ff: Merge "libgui: Change BufferQueue to use free lists"
...
* commit 'f96a758139be0d5c298abad8e27083b0f0849818':
libgui: Change BufferQueue to use free lists
2015-04-24 16:12:29 +00:00
