Adam Lesinski
dfc73e9c24
am 66e9b1e1: Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev
...
* commit '66e9b1e1178813037daf3798b8fe23467c4b91ab':
Move SystemService code to frameworks/base/core
2014-01-07 20:58:16 +00:00
Adam Lesinski
66e9b1e117
Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev
2014-01-07 20:53:20 +00:00
Alan Viverette
58a8a678bd
Merge "Revert "Allow Views to specify a theme override""
2014-01-07 20:30:01 +00:00
Alan Viverette
eb14ccf020
Revert "Allow Views to specify a theme override"
...
Inheriting the parent view's Context breaks RemoteView inflation.
This reverts commit dd9233253b88d86473403d5b63c72e223b5e40bd.
Change-Id: I1c9a940a31169cd42b7356ad58548597a2efbb24
2014-01-07 20:28:56 +00:00
Dave Platt
edbe35357c
am 5dd0be29: am 07290a7b: am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections
...
* commit '5dd0be293694706e016d6ff431668de2d318f3aa':
Fix descriptor leak after accepting connections
2014-01-07 20:02:02 +00:00
Dave Platt
10c3f81cbb
am d5d0ab5b: am 1b5bc6f8: am bd9acc22: am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app
...
* commit 'd5d0ab5ba9203804dea82be9bd13770428455e5f':
Fix socket descriptor leak from Zygote to child app
2014-01-07 20:01:55 +00:00
Dave Platt
5dd0be2936
am 07290a7b: am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections
...
* commit '07290a7be312c5da63857903dc6931cea5a2f2ea':
Fix descriptor leak after accepting connections
2014-01-07 19:59:21 +00:00
Dave Platt
d5d0ab5ba9
am 1b5bc6f8: am bd9acc22: am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app
...
* commit '1b5bc6f8f96fc30b651679411a4da00d3fbebaa7':
Fix socket descriptor leak from Zygote to child app
2014-01-07 19:59:11 +00:00
Dave Platt
07290a7be3
am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections
...
* commit '3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8':
Fix descriptor leak after accepting connections
2014-01-07 19:55:47 +00:00
Dave Platt
1b5bc6f8f9
am bd9acc22: am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app
...
* commit 'bd9acc2218fcf3cd6605554a45db2251753ddd7b':
Fix socket descriptor leak from Zygote to child app
2014-01-07 19:55:43 +00:00
Dave Platt
3bbf7e6aa5
am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections
...
* commit '62bac75d677de5398b48487e758dcbdf7bc9d834':
Fix descriptor leak after accepting connections
2014-01-07 11:53:12 -08:00
Dave Platt
bd9acc2218
am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app
...
* commit 'e966e5774ad8d478bc89b541bcac3740fe267d18':
Fix socket descriptor leak from Zygote to child app
2014-01-07 11:53:07 -08:00
Dave Platt
62bac75d67
am 76e5ca81: Fix descriptor leak after accepting connections
...
* commit '76e5ca81b3ba5a4f52126f2ec8907679b4356292':
Fix descriptor leak after accepting connections
2014-01-07 11:49:54 -08:00
Dave Platt
e966e5774a
am 02f042dd: Fix socket descriptor leak from Zygote to child app
...
* commit '02f042ddd9ddf47ef88c4f174eb19a9bee296a45':
Fix socket descriptor leak from Zygote to child app
2014-01-07 11:49:49 -08:00
Alan Viverette
d9e788c4f0
Add support for specifying Drawable color filter in XML
...
BUG: 12178044
Change-Id: Ie118aebf56bb4580c97b625e20f4e76bed4b6f6f
2014-01-07 11:30:24 -08:00
Tim Murray
04f0d6e339
Fix getBytesSize for YUV allocations.
...
bug 12134914
Change-Id: I128e75b756a5bd129077177e254f1db6c94182f1
2014-01-07 11:14:39 -08:00
Vinit Deshapnde
4a3f9cf099
Move Wifi services to a new git project
...
Bug: 12175455
Change-Id: I1fa07e29c6a9aae38d9e334d519a9f2445d15613
2014-01-07 11:00:05 -08:00
Narayan Kamath
c975437ef3
am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
...
* commit '1e3395c7378a7dd293a2e8a8ac8fbf239adbad0c':
AArch64: Use long for pointers in MTP classes
2014-01-07 13:10:19 +00:00
Narayan Kamath
819f2e1234
am 510616d2: am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
...
* commit '510616d215372e59e5e8c39b8de1125fc5b54c60':
AArch64: Use long for pointers in VideoEditor classes
2014-01-07 13:10:14 +00:00
Narayan Kamath
2e09e57e3d
am 0d8c3c46: am 5f83ff6f: am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
...
* commit '0d8c3c469e4a5e74b702b58307c1e24fa15da3d8':
AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 13:10:08 +00:00
Narayan Kamath
e434ddd042
am 113e83e6: am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
...
* commit '113e83e6f538ea217c167c6d8e11b28042ff2c53':
AArch64: Use long for pointers in audio effect classes
2014-01-07 13:10:03 +00:00
Narayan Kamath
ac8bd534dd
am 99aec6b5: am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
...
* commit '99aec6b5d1cb73a3f5b57badc53e6f56b2a53c4d':
AArch64: Use long for pointers in AmrInputStream
2014-01-07 13:09:57 +00:00
Narayan Kamath
1e3395c737
am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
...
* commit '105b545ec0ad5ea4f723f8d8b06de37f68c2f6c3':
AArch64: Use long for pointers in MTP classes
2014-01-07 13:07:02 +00:00
Narayan Kamath
510616d215
am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
...
* commit 'bec733af11a428cb202a552ff297ce43f0411f78':
AArch64: Use long for pointers in VideoEditor classes
2014-01-07 13:06:57 +00:00
Narayan Kamath
0d8c3c469e
am 5f83ff6f: am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
...
* commit '5f83ff6ffa82fb84df6feab4339054b302ac391e':
AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 13:06:52 +00:00
Narayan Kamath
113e83e6f5
am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
...
* commit '58cb0f0c412e5405f866ef0561e593b8c99bfada':
AArch64: Use long for pointers in audio effect classes
2014-01-07 13:06:47 +00:00
Narayan Kamath
99aec6b5d1
am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
...
* commit '40b0aaa9201095f408551510ddd353dcf8c8ae26':
AArch64: Use long for pointers in AmrInputStream
2014-01-07 13:06:42 +00:00
Narayan Kamath
105b545ec0
am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
...
* commit '0dce19caf81c3e2090e80800957216c1d5fe66b8':
AArch64: Use long for pointers in MTP classes
2014-01-07 13:04:19 +00:00
Narayan Kamath
bec733af11
am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
...
* commit '23ebc24eee4bf8b58405daab177e46d8e3da790f':
AArch64: Use long for pointers in VideoEditor classes
2014-01-07 13:04:14 +00:00
Narayan Kamath
5f83ff6ffa
am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
...
* commit 'e7d7908c28adf77de2cefba4f2a554b770d49def':
AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 13:04:10 +00:00
Narayan Kamath
58cb0f0c41
am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
...
* commit 'bfbe585ed4360b007640b227d49b6e8d7a2352b0':
AArch64: Use long for pointers in audio effect classes
2014-01-07 13:04:06 +00:00
Narayan Kamath
40b0aaa920
am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
...
* commit '568cde557abfaaa5bf584cf7c3396f9efd990e6c':
AArch64: Use long for pointers in AmrInputStream
2014-01-07 13:04:01 +00:00
Narayan Kamath
0dce19caf8
am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
...
* commit '79ceb53ae5b867a954476e3f6499f89664fbc669':
AArch64: Use long for pointers in MTP classes
2014-01-07 05:01:13 -08:00
Narayan Kamath
23ebc24eee
am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
...
* commit '08467c5727c04c1fef40ff1e361628944275ef28':
AArch64: Use long for pointers in VideoEditor classes
2014-01-07 05:01:08 -08:00
Narayan Kamath
e7d7908c28
am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
...
* commit '02baba25545b232436502a73e2928a1d72fa240e':
AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 05:01:03 -08:00
Narayan Kamath
bfbe585ed4
am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
...
* commit 'c0c92f206eddb6fb319bd11929c1703daf17248f':
AArch64: Use long for pointers in audio effect classes
2014-01-07 05:00:58 -08:00
Narayan Kamath
568cde557a
am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
...
* commit '80cff94478a39914012df816179ea57c53040903':
AArch64: Use long for pointers in AmrInputStream
2014-01-07 05:00:53 -08:00
Narayan Kamath
79ceb53ae5
am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
...
* commit 'c58abeeae34c77559c00c7d967c77443469abeef':
AArch64: Use long for pointers in MTP classes
2014-01-07 04:58:23 -08:00
Narayan Kamath
08467c5727
am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
...
* commit '9bc6acf27ac446b7e18a51a926caafd99cf34713':
AArch64: Use long for pointers in VideoEditor classes
2014-01-07 04:54:46 -08:00
Narayan Kamath
02baba2554
am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
...
* commit '670327544184dbd6274de9127ceaf20dfd5801b4':
AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 04:54:42 -08:00
Narayan Kamath
c0c92f206e
am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
...
* commit '357ea90515025d806c6360ef846bf6f84b45a64e':
AArch64: Use long for pointers in audio effect classes
2014-01-07 04:54:35 -08:00
Narayan Kamath
c58abeeae3
Merge "AArch64: Use long for pointers in MTP classes"
2014-01-07 12:54:11 +00:00
Ashok Bhat
e2e59326f1
AArch64: Use long for pointers in MTP classes
...
For storing pointers, long is used in MTP classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: I67805547251722e7b77611d47d0bb632a64d3e6d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:52:57 +00:00
Narayan Kamath
80cff94478
am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
...
* commit '74675f29133ff36dccc95387392bf3654dc94e15':
AArch64: Use long for pointers in AmrInputStream
2014-01-07 04:50:56 -08:00
Narayan Kamath
9bc6acf27a
Merge "AArch64: Use long for pointers in VideoEditor classes"
2014-01-07 12:50:07 +00:00
Ashok Bhat
44ba5c1b4e
AArch64: Use long for pointers in VideoEditor classes
...
For storing pointers, long is used in VideoEditor
classes, as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: Ifff3a28f2ab6774ee89d31770ad63451c8726431
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:49:41 +00:00
Narayan Kamath
6703275441
Merge "AArch64: Use long for pointers in DisplayEventReceiver"
2014-01-07 12:49:27 +00:00
Ashok Bhat
27285821b7
AArch64: Use long for pointers in DisplayEventReceiver
...
For storing pointers, long is used as
native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-07 12:48:43 +00:00
Narayan Kamath
357ea90515
Merge "AArch64: Use long for pointers in audio effect classes"
2014-01-07 12:48:21 +00:00
Ashok Bhat
ea7861c918
AArch64: Use long for pointers in audio effect classes
...
For storing pointers, long is used in AudioEffect
and Visualizer classes, as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: Ief49bbe5baef663e268c7f6d70ac33a4df45621c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:47:51 +00:00