OSDN Git Service
Pablo Ceballos [Fri, 23 Oct 2015 19:10:13 +0000 (12:10 -0700)]
SF: Connect the VDS scratch surface producer
- VirtualDisplaySurface has a BufferQueue for producing scratch
buffers when doing mixed composition for a virtual display.
- Connect/disconnect the producer end of this BufferQueue in the
VirtualDisplaySurface constructor/destructor to avoid using it in a
disconnected state.
Bug
24733179
Change-Id: I87dab9ff4f46d422b7796670b0b4d17b7fd09165
Ian Pedowitz [Thu, 22 Oct 2015 22:41:13 +0000 (22:41 +0000)]
Revert "Track ashmem memory usage in Parcel" am:
6880307e8e am:
159a5c3372 am:
7a2643cd77
am:
f4ccbf8103
* commit '
f4ccbf8103dadabfc8e2eb01b582d9711f7d2931':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:38:23 +0000 (22:38 +0000)]
Revert "Track ashmem memory usage in Parcel" am:
6880307e8e am:
159a5c3372
am:
7a2643cd77
* commit '
7a2643cd77f1836844032f8a14f3c03a40c4e581':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:33:58 +0000 (22:33 +0000)]
Revert "Track ashmem memory usage in Parcel" am:
6880307e8e
am:
159a5c3372
* commit '
159a5c337250613c166ae45b2811861f70c733bd':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:32:07 +0000 (22:32 +0000)]
Revert "Track ashmem memory usage in Parcel"
am:
6880307e8e
* commit '
6880307e8e35a6c484942443fb4ddd6173126152':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:08:10 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"
This reverts commit
e2f499fb734bc30a1e1c947112caa0727349b6ed.
Bug:
25169267
Bug:
25191602
Bug:
25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0
Pablo Ceballos [Thu, 22 Oct 2015 20:47:38 +0000 (20:47 +0000)]
Merge "Revert "Revert "Remove GLTrace support"""
Michael Wright [Thu, 22 Oct 2015 14:46:08 +0000 (14:46 +0000)]
Merge "Add new Cut / Copy / Paste keys"
Michael Wright [Thu, 22 Oct 2015 14:37:47 +0000 (14:37 +0000)]
Merge "Limit the number of keys read by KeyCharacterMaps."
Michael Wright [Wed, 21 Oct 2015 13:38:03 +0000 (14:38 +0100)]
Limit the number of keys read by KeyCharacterMaps.
Apps can send us a KCM containing a ridiculous key count, which will
cause us to crash when an allocation fails. Limit the key count so this
doesn't happen.
Bug:
24876135
Change-Id: I2bb4a5acabfc9184a867a406eef756c28c28f0ad
Daniel Erat [Thu, 22 Oct 2015 01:44:31 +0000 (01:44 +0000)]
Merge "libbinder: Stub out checkPermissions() on Brillo." am:
0d6d2917cb am:
0923d1017d
am:
ce0f028e07
* commit '
ce0f028e07a1659a29b188429dc8bcabf77ffc86':
libbinder: Stub out checkPermissions() on Brillo.
Daniel Erat [Thu, 22 Oct 2015 01:42:31 +0000 (01:42 +0000)]
Merge "libbinder: Stub out checkPermissions() on Brillo." am:
0d6d2917cb
am:
0923d1017d
* commit '
0923d1017daf3a56f19027d5ad10355301662455':
libbinder: Stub out checkPermissions() on Brillo.
Daniel Erat [Thu, 22 Oct 2015 01:40:35 +0000 (01:40 +0000)]
Merge "libbinder: Stub out checkPermissions() on Brillo."
am:
0d6d2917cb
* commit '
0d6d2917cb22ba09da632552c7074d3aa110fbdb':
libbinder: Stub out checkPermissions() on Brillo.
Daniel Erat [Thu, 22 Oct 2015 01:38:14 +0000 (01:38 +0000)]
Merge "libbinder: Stub out checkPermissions() on Brillo."
Daniel Erat [Tue, 13 Oct 2015 21:29:32 +0000 (15:29 -0600)]
libbinder: Stub out checkPermissions() on Brillo.
When BRILLO is defined at build-time, avoid checking
permissions with ActivityManager (which isn't built for
Brillo).
Bug:
24907738
Change-Id: I8e277fe45d73d551e3a8ab41bd9dfa2535967522
Adrian Roos [Thu, 22 Oct 2015 00:59:59 +0000 (00:59 +0000)]
Track ashmem memory usage in Parcel am:
e2f499fb73 am:
a0c1be2617 am:
cb09f2c82f
am:
b73f66ec1a
* commit '
b73f66ec1a31c5910c63fea199b222afb7c5a417':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:55:46 +0000 (00:55 +0000)]
Track ashmem memory usage in Parcel am:
e2f499fb73 am:
a0c1be2617
am:
cb09f2c82f
* commit '
cb09f2c82fa202b3e4069b74ca103d8ba502c4c3':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:52:32 +0000 (00:52 +0000)]
Track ashmem memory usage in Parcel am:
e2f499fb73
am:
a0c1be2617
* commit '
a0c1be26177d554ef9c5d61b8a564bb03d402a04':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:49:15 +0000 (00:49 +0000)]
Track ashmem memory usage in Parcel
am:
e2f499fb73
* commit '
e2f499fb734bc30a1e1c947112caa0727349b6ed':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:31:16 +0000 (00:31 +0000)]
Merge "Track ashmem memory usage in Parcel"
Adrian Roos [Wed, 21 Oct 2015 02:11:23 +0000 (19:11 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
Adrian Roos [Wed, 21 Oct 2015 02:11:23 +0000 (19:11 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
Dan Austin [Wed, 21 Oct 2015 20:06:20 +0000 (20:06 +0000)]
Merge "Fix benign integer overflow in printHexDump" am:
b36c7d0b6e am:
dd2ead5220
am:
cfde9e1de2
* commit '
cfde9e1de27372f2df26fa703019b8d156629cc3':
Fix benign integer overflow in printHexDump
Dan Austin [Wed, 21 Oct 2015 20:04:03 +0000 (20:04 +0000)]
Merge "Fix benign integer overflow in printHexDump" am:
b36c7d0b6e
am:
dd2ead5220
* commit '
dd2ead5220eb50e759e41b1b70e82085d20557bc':
Fix benign integer overflow in printHexDump
Dan Austin [Wed, 21 Oct 2015 20:01:45 +0000 (20:01 +0000)]
Merge "Fix benign integer overflow in printHexDump"
am:
b36c7d0b6e
* commit '
b36c7d0b6e793fae2d27b43d0022981c0d366d55':
Fix benign integer overflow in printHexDump
Dan Austin [Wed, 21 Oct 2015 19:53:56 +0000 (19:53 +0000)]
Merge "Fix benign integer overflow in printHexDump"
Dan Austin [Wed, 21 Oct 2015 18:28:59 +0000 (11:28 -0700)]
Fix benign integer overflow in printHexDump
There is an instance where an unsigned integer is multiplied by -1.
Refactor the code to eliminate this operation.
Bug:
25085348
Change-Id: I9c5dc1cc22a27dc998ae8eeacc9f889373d993cd
Michael Wright [Wed, 21 Oct 2015 17:09:02 +0000 (18:09 +0100)]
Add new Cut / Copy / Paste keys
Bug:
25120948
Change-Id: Ic2569b1d542fb3fd4159d8c08fe65beeb8b656d7
Casey Dahlin [Tue, 20 Oct 2015 23:59:41 +0000 (23:59 +0000)]
Merge "Fix build breakage due to extraneous dereference" am:
a763da3f1f am:
3a5841286c
am:
476ecb24db
* commit '
476ecb24dbf4492e27247be7c81f337d4da2de4c':
Fix build breakage due to extraneous dereference
Pablo Ceballos [Tue, 20 Oct 2015 23:57:53 +0000 (23:57 +0000)]
Revert "Revert "Remove GLTrace support""
This reverts commit
e6288e2660e9c310986bff7148fcfb745c13af9a.
Change-Id: Id50a7d471536150bb9e0393e159d66475aa4f473
Casey Dahlin [Tue, 20 Oct 2015 23:54:49 +0000 (23:54 +0000)]
Merge "Fix build breakage due to extraneous dereference" am:
a763da3f1f
am:
3a5841286c
* commit '
3a5841286c49d8944cee9e621fc971948c3f2cf3':
Fix build breakage due to extraneous dereference
Casey Dahlin [Tue, 20 Oct 2015 23:50:31 +0000 (23:50 +0000)]
Merge "Fix build breakage due to extraneous dereference"
am:
a763da3f1f
* commit '
a763da3f1fc010576b4807fa9b050c0720f81d00':
Fix build breakage due to extraneous dereference
Casey Dahlin [Tue, 20 Oct 2015 23:27:30 +0000 (23:27 +0000)]
Merge "Fix build breakage due to extraneous dereference"
Casey Dahlin [Tue, 20 Oct 2015 23:26:23 +0000 (16:26 -0700)]
Fix build breakage due to extraneous dereference
Change-Id: If84d8b68a6af1e04a6085351655e588ebef65664
Casey Dahlin [Tue, 20 Oct 2015 23:16:12 +0000 (23:16 +0000)]
Merge "Add read/write methods for vectors" am:
d83a34d8c7 am:
1dd0cbdb49
am:
29bf29d1aa
* commit '
29bf29d1aa9e0b467819519334d494ea4039af31':
Add read/write methods for vectors
Naveen Leekha [Tue, 20 Oct 2015 23:16:02 +0000 (23:16 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/native into mnc-dr-dev-plus-aosp
am:
1e7da8dfc6
* commit '
1e7da8dfc683ffdaf423c9f0c4faa3b41276b7c6':
Naveen Leekha [Tue, 20 Oct 2015 23:15:57 +0000 (23:15 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606 am:
8121177b5e am:
7135d2768b am:
5957172a7e am:
1d7b4fde4c
am:
91db803f0a
* commit '
91db803f0a0e7fb0445bf0193b6dcbe79e9df8fc':
Initialize local variables to avoid data leak
Casey Dahlin [Tue, 20 Oct 2015 23:11:53 +0000 (23:11 +0000)]
Merge "Add read/write methods for vectors" am:
d83a34d8c7
am:
1dd0cbdb49
* commit '
1dd0cbdb4957f675a2a6663bda89c6bfac95eb69':
Add read/write methods for vectors
Casey Dahlin [Tue, 20 Oct 2015 23:07:29 +0000 (23:07 +0000)]
Merge "Add read/write methods for vectors"
am:
d83a34d8c7
* commit '
d83a34d8c7fa4be9bd2fa3da4d3ca2c16febd651':
Add read/write methods for vectors
Casey Dahlin [Tue, 20 Oct 2015 23:00:12 +0000 (23:00 +0000)]
Merge "Add read/write methods for vectors"
Casey Dahlin [Tue, 20 Oct 2015 01:12:18 +0000 (18:12 -0700)]
Add read/write methods for vectors
Also a readString16 with the expected semantics.
Change-Id: Idbeaff1b4337089b2a5a7124f77226a693b2be4f
Test: Unit tests pass
Bug:
25012838
Signed-off-by: Casey Dahlin <sadmac@google.com>
Naveen Leekha [Tue, 20 Oct 2015 18:33:40 +0000 (18:33 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/native into mnc-dr-dev-plus-aosp
Naveen Leekha [Tue, 20 Oct 2015 18:33:36 +0000 (18:33 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606 am:
8121177b5e am:
7135d2768b am:
5957172a7e
am:
1d7b4fde4c
* commit '
1d7b4fde4c7ae0bd5e8dd9a5177252cbfba85f1e':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 18:30:05 +0000 (18:30 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606 am:
8121177b5e am:
7135d2768b am:
5957172a7e
am:
1d7b4fde4c
* commit '
1d7b4fde4c7ae0bd5e8dd9a5177252cbfba85f1e':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 17:48:10 +0000 (17:48 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606 am:
8121177b5e am:
7135d2768b
am:
5957172a7e
* commit '
5957172a7edb83d05423d5abae0091628f0c557c':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 17:25:55 +0000 (17:25 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606 am:
8121177b5e
am:
7135d2768b
* commit '
7135d2768bcb46603735ab9b6b4bbaa788d39179':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 17:02:33 +0000 (17:02 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606
am:
8121177b5e
* commit '
8121177b5e8c406570f0eaf6593c6fd1db232ddf':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 16:54:09 +0000 (16:54 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours
am:
7b4863f606
* commit '
7b4863f606bdb48b188b0235447dfaba6c8c3cf0':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 16:42:34 +0000 (16:42 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
am:
7534e4e63a -s ours
* commit '
7534e4e63afedeb826a8d8a4b0cf3f9d40d243ea':
Initialize local variables to avoid data leak
Pablo Ceballos [Mon, 19 Oct 2015 18:09:47 +0000 (18:09 +0000)]
Merge "Revert "Remove GLTrace support""
Pablo Ceballos [Mon, 19 Oct 2015 18:09:19 +0000 (18:09 +0000)]
Revert "Remove GLTrace support"
This reverts commit
5bf6f3b5bf06e04a742bde8d40409d3c9e434c05.
Change-Id: I25a2d9b4a4b219cb76b405db1f68997519361cd6
Pablo Ceballos [Mon, 19 Oct 2015 17:55:53 +0000 (17:55 +0000)]
Merge "Remove GLTrace support"
Casey Dahlin [Fri, 16 Oct 2015 20:45:04 +0000 (20:45 +0000)]
am
e313bf95: am
41c989aa: am
4e6d8c5b: Merge "Add methods to Parcel for bool and char and byte"
* commit '
e313bf9552745986fbc3a76d9176e7ec3727c725':
Add methods to Parcel for bool and char and byte
Casey Dahlin [Fri, 16 Oct 2015 20:37:02 +0000 (20:37 +0000)]
am
41c989aa: am
4e6d8c5b: Merge "Add methods to Parcel for bool and char and byte"
* commit '
41c989aa15c7a26aef4d2414137f9875fd22a161':
Add methods to Parcel for bool and char and byte
Casey Dahlin [Fri, 16 Oct 2015 20:30:50 +0000 (13:30 -0700)]
am
4e6d8c5b: Merge "Add methods to Parcel for bool and char and byte"
* commit '
4e6d8c5b9d51f11db7e8dbe91971c8b46beae5c0':
Add methods to Parcel for bool and char and byte
Casey Dahlin [Fri, 16 Oct 2015 20:13:00 +0000 (20:13 +0000)]
Merge "Add methods to Parcel for bool and char and byte"
Casey Dahlin [Thu, 15 Oct 2015 22:44:59 +0000 (15:44 -0700)]
Add methods to Parcel for bool and char and byte
We lift these to int, but handling the details of that here will be better
than having AIDL generate casting code all the time.
Test: unit tests pass
Bug:
24981507
Change-Id: If6aa33ab5fe365dd237136a95c5d9a702af41d15
Signed-off-by: Casey Dahlin <sadmac@google.com>
Dianne Hackborn [Thu, 15 Oct 2015 17:58:00 +0000 (17:58 +0000)]
Merge "Temporary hack to get rid of new virtuals."
Amirhossein Simjour [Thu, 15 Oct 2015 17:04:12 +0000 (17:04 +0000)]
Merge "When using trackpad, mouse pointer shows instead of circle"
Dianne Hackborn [Wed, 14 Oct 2015 22:13:02 +0000 (15:13 -0700)]
Temporary hack to get rid of new virtuals.
Seems like it breaks some prebuilt binaries.
Change-Id: Ia5e35beb4538364b2ab3618fbf21b2e9c9ee2363
Aravind Akella [Wed, 14 Oct 2015 21:23:58 +0000 (21:23 +0000)]
am
0221b4bd: am
263b020b: am
6427e719: am
2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '
0221b4bd2d0443ec634d4264df32e7184a0e47c5':
Set DATA_INJECTION mode flag for sensors.
Aravind Akella [Wed, 14 Oct 2015 21:20:00 +0000 (21:20 +0000)]
am
263b020b: am
6427e719: am
2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '
263b020b6eb442aa0f82860b34f68ab3f5a3971a':
Set DATA_INJECTION mode flag for sensors.
Aravind Akella [Wed, 14 Oct 2015 21:13:41 +0000 (21:13 +0000)]
am
6427e719: am
2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '
6427e7190bbd83a29169e6ae4b5e3cff263f6937':
Set DATA_INJECTION mode flag for sensors.
Aravind Akella [Wed, 14 Oct 2015 21:08:15 +0000 (21:08 +0000)]
am
2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '
2ac7405bda4f621f07cbcc0b562d16f7a9611c7b':
Set DATA_INJECTION mode flag for sensors.
Aravind Akella [Wed, 14 Oct 2015 21:03:07 +0000 (21:03 +0000)]
Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
Jesse Hall [Wed, 14 Oct 2015 21:01:57 +0000 (21:01 +0000)]
am
eb873c89: am
0983618f: am
a518d5ad: am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
eb873c89e98b18b6db755aac4040bc45e3b1d11c':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 20:30:38 +0000 (20:30 +0000)]
am
0983618f: am
a518d5ad: am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
0983618f0ad57b873163183eac6caf8dea7920c8':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 20:26:57 +0000 (20:26 +0000)]
am
a518d5ad: am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
a518d5ad0c0c6a661471a8cd2c962612943ca667':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 20:14:55 +0000 (20:14 +0000)]
am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
312d7555cb71ce7fb73bc758b9e30653e223b2f3':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 18:10:24 +0000 (11:10 -0700)]
egl: Remove window disconnect before calling driver eglDestroySurface
This was originally added for b/
14445579. An in-development app was
attempting to render to a window as an EGLSurface, then tear that
down, change some window properties, and create a new EGLSurface. The
second eglCreateWindowSurface failed because the window was already
connected. This change went in, but it turned out the real problem was
that the app still (unintentionally) had the surface current. After
the app bug was fixed, nobody revisited whether this change was
actually needed.
Turns out it wasn't needed. After an EGLSurface is both destroyed
*AND* not current (basically refcount==0), we were already
disconnecting the window in ~egl_surface_t().
Apart from being unnecessary and redundant, disconnecting the window
here is wrong for two reasons:
(a) The surface may still be in use after eglDestroySurface, if it was
still current. Rendering is undefined in that case, but disconnecting
the window leads to more catastrophic results than necessary.
(b) It's being called before calling the driver's eglDestroySurface.
The driver will almost definitely have a buffer dequeued that it needs
to cancel, and by disconnecting first we turn that into an error that
they don't have a graceful way to deal with.
Bug:
24524053
Change-Id: Ib063134413d25d3526f794aafb5e333e3417ea42
Amirhossein Simjour [Fri, 9 Oct 2015 14:39:48 +0000 (10:39 -0400)]
When using trackpad, mouse pointer shows instead of circle
The mouse pointer showing instead of circle for all gestures except FREEDOM.
FREEDOM gesture still is using spots to be able to show all the fingers.
Bug:
24139978
Change-Id: I91e916de02e690f6727b097345a919e536ffdc92
Adam Lesinski [Tue, 13 Oct 2015 04:00:15 +0000 (04:00 +0000)]
am
0ee1b1ff: am
5bba4236: am
76fc5f18: am
16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '
0ee1b1ff1f454e72a5b2ef2fbe78f7b66eba8bd4':
add number constraint for samples per MotionEvent
Adam Lesinski [Tue, 13 Oct 2015 00:20:26 +0000 (00:20 +0000)]
am
5bba4236: am
76fc5f18: am
16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '
5bba4236a86bbf4537bc27810803b9b224b0840f':
add number constraint for samples per MotionEvent
Adam Lesinski [Mon, 12 Oct 2015 22:30:10 +0000 (22:30 +0000)]
am
76fc5f18: am
16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '
76fc5f18e6a0271a1f04db54924653faac73912e':
add number constraint for samples per MotionEvent
Adam Lesinski [Mon, 12 Oct 2015 22:23:05 +0000 (22:23 +0000)]
am
16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '
16b0ae105e4e94ff09d1517b68f7c66f2022a19e':
add number constraint for samples per MotionEvent
Adam Lesinski [Mon, 12 Oct 2015 22:15:50 +0000 (22:15 +0000)]
Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent
Bug:
23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
Dianne Hackborn [Thu, 8 Oct 2015 00:35:27 +0000 (17:35 -0700)]
Add new "shell command" feature to Binder objects.
IBinder has a new common interface for sending shell commands
to it. This can be implemented by system services to provide
a shell interface to the service, without needing to have separate
shell java code.
Also add a new "cmd" command line tool, which invokes the shell
command method on a system service. This is much like dumpsys,
but for shell commands.
Change-Id: I95dc80c881a28cefb76957ad4d4fd9b3ed9630df
Jason Parks [Mon, 12 Oct 2015 17:13:55 +0000 (17:13 +0000)]
am
8b435c07: am
7b2b968d: am
33c3c1bd: Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
* commit '
8b435c07eece971ab032d450777e0e1723299de1':
Revert "do not dumpstate raft BUG:
24159112"
Jason Parks [Mon, 12 Oct 2015 15:45:00 +0000 (15:45 +0000)]
am
7b2b968d: am
33c3c1bd: Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
* commit '
7b2b968db484118668b70d040464f379a7e9e915':
Revert "do not dumpstate raft BUG:
24159112"
Jason Parks [Mon, 12 Oct 2015 15:39:58 +0000 (15:39 +0000)]
am
33c3c1bd: Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
* commit '
33c3c1bd71de8a903b6a07f0b1c4f2f670313778':
Revert "do not dumpstate raft BUG:
24159112"
Jason Parks [Mon, 12 Oct 2015 15:34:47 +0000 (15:34 +0000)]
Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
Jason Parks [Mon, 12 Oct 2015 15:27:10 +0000 (15:27 +0000)]
Revert "do not dumpstate raft BUG:
24159112"
This reverts commit
05c862252d5021f55a69281473c67d76e7097422.
Change-Id: Ib5984796734d2a0e33f47e0fb4e446b787e0d14f
Nick Kralevich [Sat, 10 Oct 2015 20:20:57 +0000 (20:20 +0000)]
am
748c546b: am
c4db5ece: am
8e0c88ea: Merge "servicemanager: log pid and uid on selinux denial"
* commit '
748c546b15dbaef6b1c480bed733fd6b16ce4cdc':
servicemanager: log pid and uid on selinux denial
Mark Salyzyn [Sat, 10 Oct 2015 20:20:56 +0000 (20:20 +0000)]
am
2abef0c3: am
ca78bbfd: am
52b25375: Merge "dumpstate: add -v printable to logcat"
* commit '
2abef0c38bacf39df950dfe66d90b820c876d8b9':
dumpstate: add -v printable to logcat
Nick Kralevich [Sat, 10 Oct 2015 20:18:22 +0000 (20:18 +0000)]
am
c4db5ece: am
8e0c88ea: Merge "servicemanager: log pid and uid on selinux denial"
* commit '
c4db5ece1b34ada975041c167215d41a58f788ca':
servicemanager: log pid and uid on selinux denial
Mark Salyzyn [Sat, 10 Oct 2015 20:18:22 +0000 (20:18 +0000)]
am
ca78bbfd: am
52b25375: Merge "dumpstate: add -v printable to logcat"
* commit '
ca78bbfd85dcff3c635b813d1cbe882b576b433c':
dumpstate: add -v printable to logcat
Nick Kralevich [Sat, 10 Oct 2015 20:11:05 +0000 (20:11 +0000)]
am
8e0c88ea: Merge "servicemanager: log pid and uid on selinux denial"
* commit '
8e0c88ea489a7b395a3d349f81000fb2639bf448':
servicemanager: log pid and uid on selinux denial
Nick Kralevich [Sat, 10 Oct 2015 20:07:22 +0000 (20:07 +0000)]
Merge "servicemanager: log pid and uid on selinux denial"
Mark Salyzyn [Fri, 9 Oct 2015 21:25:32 +0000 (21:25 +0000)]
am
52b25375: Merge "dumpstate: add -v printable to logcat"
* commit '
52b2537550a6fc43587980887858c7e7150255b0':
dumpstate: add -v printable to logcat
Mark Salyzyn [Fri, 9 Oct 2015 21:20:05 +0000 (21:20 +0000)]
Merge "dumpstate: add -v printable to logcat"
Mark Salyzyn [Fri, 9 Oct 2015 21:02:07 +0000 (14:02 -0700)]
dumpstate: add -v printable to logcat
In the case where binary data lands in an utf-8 log buffer,
ensure that the content is made printable.
Bug:
23517551
Change-Id: I41696372d07228875d01a19f0c7ab2cb7494b7ef
Pablo Ceballos [Thu, 8 Oct 2015 20:35:01 +0000 (20:35 +0000)]
Merge "BQ: fix Volantis test failures"
Puneet Kumar [Thu, 8 Oct 2015 17:34:30 +0000 (17:34 +0000)]
am
1f8b6b57: am
98d740d7: am
94973aeb: am
a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit '
1f8b6b57b25635011c70e5e7aaebb60bdb3b97af':
Inputflinger: hook up key event replacement processing
Puneet Kumar [Thu, 8 Oct 2015 17:22:54 +0000 (17:22 +0000)]
am
98d740d7: am
94973aeb: am
a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit '
98d740d7d2546fae9887e5304d6a3afc8cadff8d':
Inputflinger: hook up key event replacement processing
Dmitry Torokhov [Thu, 8 Oct 2015 17:15:55 +0000 (17:15 +0000)]
am
3b921160: resolved conflicts for
b9163905 to mnc-dr-dev-plus-aosp
* commit '
3b9211608669eb5aafba65d35b4cfbec89755499':
Allow defining replacement key events in keymap
Dmitry Torokhov [Thu, 8 Oct 2015 16:36:47 +0000 (09:36 -0700)]
resolved conflicts for
b9163905 to mnc-dr-dev-plus-aosp
Change-Id: I83afd79491533b1c7ae2aed50a927db175ba555f
Puneet Kumar [Thu, 8 Oct 2015 09:15:33 +0000 (09:15 +0000)]
am
94973aeb: am
a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit '
94973aeb1961c5a07a5288ec56c7f79ab658bb8d':
Inputflinger: hook up key event replacement processing
Puneet Kumar [Thu, 8 Oct 2015 09:15:32 +0000 (09:15 +0000)]
am
ec1323db: am
2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
* commit '
ec1323dbd4558f9d4ff422c8547334fe13242ad0':
Allow defining replacement key events in keymap
Puneet Kumar [Thu, 8 Oct 2015 09:08:32 +0000 (09:08 +0000)]
am
a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit '
a2f78b44ee30839e2c047d07525dd6bc4fe50f1d':
Inputflinger: hook up key event replacement processing