OSDN Git Service
Narayan Kamath [Wed, 8 Jan 2014 13:06:55 +0000 (13:06 +0000)]
am
2d87407e: am
136c0219: am
c156021d: am
8a927cfa: Merge "Fix a bug introduced in change 73712"
* commit '
2d87407e5765228a3469b9681ebff6c0c7eee140':
Fix a bug introduced in change 73712
Narayan Kamath [Wed, 8 Jan 2014 13:04:15 +0000 (13:04 +0000)]
am
136c0219: am
c156021d: am
8a927cfa: Merge "Fix a bug introduced in change 73712"
* commit '
136c02191790aa937c490341df49e966735f6857':
Fix a bug introduced in change 73712
Narayan Kamath [Wed, 8 Jan 2014 13:00:33 +0000 (05:00 -0800)]
am
c156021d: am
8a927cfa: Merge "Fix a bug introduced in change 73712"
* commit '
c156021debb8e13324e451cb288da7edd7e112ca':
Fix a bug introduced in change 73712
Narayan Kamath [Wed, 8 Jan 2014 12:49:24 +0000 (04:49 -0800)]
am
8a927cfa: Merge "Fix a bug introduced in change 73712"
* commit '
8a927cfa4ea8e4a78f6a9fa1e2b1da9187a3d1e8':
Fix a bug introduced in change 73712
Narayan Kamath [Wed, 8 Jan 2014 12:47:31 +0000 (12:47 +0000)]
Merge "Fix a bug introduced in change 73712"
Narayan Kamath [Wed, 8 Jan 2014 12:33:16 +0000 (12:33 +0000)]
am
651807fc: am
3f589e5d: am
2842bd02: am
de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit '
651807fcd0b1012ea848efe5f67b4381d8ce6797':
AArch64: Use long for pointers in App/Backup
Narayan Kamath [Wed, 8 Jan 2014 12:33:11 +0000 (12:33 +0000)]
am
72a8fe6d: am
74661ff1: am
b5558817: am
002ae75b: Merge "AArch64: Use long for pointers"
* commit '
72a8fe6d03a7c9e88e8fdd7181ca6896a2d475eb':
AArch64: Use long for pointers
Narayan Kamath [Wed, 8 Jan 2014 12:33:06 +0000 (12:33 +0000)]
am
9a743575: am
71cdc73d: am
53acc7ae: am
f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '
9a743575254d7d5d456456517171f0ee31bc9247':
AArch64: Use long for pointers in hardware classes
Narayan Kamath [Wed, 8 Jan 2014 12:26:28 +0000 (12:26 +0000)]
Fix a bug introduced in change 73712
"return (bool) true" was incorrectly changed to
"return (jboolean) JNI_FALSE"
Change-Id: I45f62f60c5affbae7970bb8889c55981e26d01ba
Narayan Kamath [Wed, 8 Jan 2014 12:19:40 +0000 (12:19 +0000)]
resolved conflicts for merge of
92ae0347 to klp-modular-dev
Change-Id: I703aea4f20985a4bbda0f685254721d6480bb20f
Narayan Kamath [Wed, 8 Jan 2014 12:05:13 +0000 (12:05 +0000)]
am
3f589e5d: am
2842bd02: am
de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit '
3f589e5d1e09e17a2aaa0a52fc15e16520d1bd5a':
AArch64: Use long for pointers in App/Backup
Narayan Kamath [Wed, 8 Jan 2014 12:02:05 +0000 (04:02 -0800)]
am
2842bd02: am
de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit '
2842bd021c11274720d6a10219538b536b7d2050':
AArch64: Use long for pointers in App/Backup
Narayan Kamath [Wed, 8 Jan 2014 12:01:13 +0000 (12:01 +0000)]
am
74661ff1: am
b5558817: am
002ae75b: Merge "AArch64: Use long for pointers"
* commit '
74661ff119b274e58d1b2f15cff97cfa6a1e64fa':
AArch64: Use long for pointers
Narayan Kamath [Wed, 8 Jan 2014 12:01:09 +0000 (12:01 +0000)]
am
71cdc73d: am
53acc7ae: am
f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '
71cdc73d2808944fca0a9e200696253d1f4a5bf4':
AArch64: Use long for pointers in hardware classes
Narayan Kamath [Wed, 8 Jan 2014 12:01:04 +0000 (12:01 +0000)]
am
cbf339f6: am
ab169215: am
f210044f: Merge "AArch64: Use long for pointers in services"
* commit '
cbf339f6e4bf45a7d41cd0327d2dd7975875b8aa':
AArch64: Use long for pointers in services
Narayan Kamath [Wed, 8 Jan 2014 11:59:46 +0000 (03:59 -0800)]
am
de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit '
de8c3cf13b0fc0655cf49934658e652b441ee019':
AArch64: Use long for pointers in App/Backup
Narayan Kamath [Wed, 8 Jan 2014 11:58:22 +0000 (03:58 -0800)]
am
b5558817: am
002ae75b: Merge "AArch64: Use long for pointers"
* commit '
b5558817c78e3140fa3f9cbbe167cacf6481f47f':
AArch64: Use long for pointers
Narayan Kamath [Wed, 8 Jan 2014 11:58:17 +0000 (03:58 -0800)]
am
53acc7ae: am
f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '
53acc7ae00ba921e8c7afb9415dbf473785a3be6':
AArch64: Use long for pointers in hardware classes
Narayan Kamath [Wed, 8 Jan 2014 11:58:13 +0000 (03:58 -0800)]
am
ab169215: am
f210044f: Merge "AArch64: Use long for pointers in services"
* commit '
ab169215fb135f590f0960ab89f5199dd7303a33':
AArch64: Use long for pointers in services
Narayan Kamath [Wed, 8 Jan 2014 11:56:00 +0000 (03:56 -0800)]
am
002ae75b: Merge "AArch64: Use long for pointers"
* commit '
002ae75b829730047240ab20a044a00570eb71d2':
AArch64: Use long for pointers
Narayan Kamath [Wed, 8 Jan 2014 11:55:56 +0000 (03:55 -0800)]
am
f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '
f5598210f067acf340487ba2fe55b00e43be1d9d':
AArch64: Use long for pointers in hardware classes
Narayan Kamath [Wed, 8 Jan 2014 11:55:52 +0000 (03:55 -0800)]
am
f210044f: Merge "AArch64: Use long for pointers in services"
* commit '
f210044fb8e2f6c056e5314702353d7b97d64978':
AArch64: Use long for pointers in services
Narayan Kamath [Wed, 8 Jan 2014 11:54:29 +0000 (11:54 +0000)]
Merge "AArch64: Use long for pointers in App/Backup"
Ashok Bhat [Thu, 2 Jan 2014 16:52:41 +0000 (16:52 +0000)]
AArch64: Use long for pointers in App/Backup
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: I7aee49dc26cf6c86af8f1d882e9cd1cc145a1977
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>
Narayan Kamath [Wed, 8 Jan 2014 11:53:50 +0000 (11:53 +0000)]
Merge "AArch64: Use long for pointers"
Ashok Bhat [Thu, 2 Jan 2014 13:42:56 +0000 (13:42 +0000)]
AArch64: Use long for pointers
For storing pointers, long is used in CursorWindow
and SQLiteConnection classes as native pointers can
be 64-bit.
Change-Id: Ia686006a7b8bdc7b95e5de0d0a294b155034a921
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>
Narayan Kamath [Wed, 8 Jan 2014 11:53:11 +0000 (11:53 +0000)]
Merge "AArch64: Use long for pointers in hardware classes"
Narayan Kamath [Wed, 8 Jan 2014 11:53:00 +0000 (11:53 +0000)]
Merge "AArch64: Use long for pointers in services"
Ashok Bhat [Fri, 3 Jan 2014 14:37:19 +0000 (14:37 +0000)]
AArch64: Use long for pointers in hardware classes
For storing pointers, long is used in hardware 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: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
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>
Ashok Bhat [Thu, 2 Jan 2014 19:43:30 +0000 (19:43 +0000)]
AArch64: Use long for pointers in services
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: Ib4435f0794740d545c1e640087849215e6844802
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Robert Greenwalt [Wed, 8 Jan 2014 00:50:16 +0000 (00:50 +0000)]
am
132a5537: am
400e6b70: am
cbf5e875: am
517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit '
132a55375e89d809e1cc116aa4cca49e2351294a':
Revert "Do not show roaming icon for Videotron operator when access Canada network"
Robert Greenwalt [Wed, 8 Jan 2014 00:47:37 +0000 (00:47 +0000)]
am
400e6b70: am
cbf5e875: am
517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit '
400e6b705f860fe70264a8b2d73c82772d734ad7':
Revert "Do not show roaming icon for Videotron operator when access Canada network"
Robert Greenwalt [Wed, 8 Jan 2014 00:44:30 +0000 (16:44 -0800)]
am
cbf5e875: am
517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit '
cbf5e8758ff9ef2eb21228fba20c962002f1e42d':
Revert "Do not show roaming icon for Videotron operator when access Canada network"
Robert Greenwalt [Wed, 8 Jan 2014 00:41:16 +0000 (16:41 -0800)]
am
517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit '
517e9b11d53609d59c60d22dc085e7f9fd442248':
Revert "Do not show roaming icon for Videotron operator when access Canada network"
Robert Greenwalt [Wed, 8 Jan 2014 00:38:29 +0000 (00:38 +0000)]
Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
Ian Rogers [Tue, 7 Jan 2014 21:45:07 +0000 (21:45 +0000)]
am
8dbfde50: am
0e16e3d7: am
c2b50c10: am
f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit '
8dbfde504787a002de1074a5dfac7eea9d060a43':
Add a call to registerAppInfo for the VMRuntime
Ian Rogers [Tue, 7 Jan 2014 21:41:34 +0000 (21:41 +0000)]
am
0e16e3d7: am
c2b50c10: am
f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit '
0e16e3d7ddcca8fe68bc747b88159eeb6b161785':
Add a call to registerAppInfo for the VMRuntime
Ian Rogers [Tue, 7 Jan 2014 21:38:44 +0000 (13:38 -0800)]
am
c2b50c10: am
f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit '
c2b50c10f0bf636562deba1d92ec7b54b13909de':
Add a call to registerAppInfo for the VMRuntime
Ian Rogers [Tue, 7 Jan 2014 21:36:29 +0000 (13:36 -0800)]
am
f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit '
f11dee797177760f089e757d91ed6bce32043750':
Add a call to registerAppInfo for the VMRuntime
Ian Rogers [Tue, 7 Jan 2014 21:31:17 +0000 (21:31 +0000)]
Merge "Add a call to registerAppInfo for the VMRuntime"
Adam Lesinski [Tue, 7 Jan 2014 20:53:20 +0000 (20:53 +0000)]
Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev
Dave Platt [Tue, 7 Jan 2014 19:59:21 +0000 (19:59 +0000)]
am
07290a7b: am
3bbf7e6a: am
62bac75d: am
76e5ca81: Fix descriptor leak after accepting connections
* commit '
07290a7be312c5da63857903dc6931cea5a2f2ea':
Fix descriptor leak after accepting connections
Dave Platt [Tue, 7 Jan 2014 19:59:11 +0000 (19:59 +0000)]
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
Dave Platt [Tue, 7 Jan 2014 19:55:47 +0000 (19:55 +0000)]
am
3bbf7e6a: am
62bac75d: am
76e5ca81: Fix descriptor leak after accepting connections
* commit '
3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8':
Fix descriptor leak after accepting connections
Dave Platt [Tue, 7 Jan 2014 19:55:43 +0000 (19:55 +0000)]
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
Dave Platt [Tue, 7 Jan 2014 19:53:12 +0000 (11:53 -0800)]
am
62bac75d: am
76e5ca81: Fix descriptor leak after accepting connections
* commit '
62bac75d677de5398b48487e758dcbdf7bc9d834':
Fix descriptor leak after accepting connections
Dave Platt [Tue, 7 Jan 2014 19:53:07 +0000 (11:53 -0800)]
am
e966e577: am
02f042dd: Fix socket descriptor leak from Zygote to child app
* commit '
e966e5774ad8d478bc89b541bcac3740fe267d18':
Fix socket descriptor leak from Zygote to child app
Dave Platt [Tue, 7 Jan 2014 19:49:54 +0000 (11:49 -0800)]
am
76e5ca81: Fix descriptor leak after accepting connections
* commit '
76e5ca81b3ba5a4f52126f2ec8907679b4356292':
Fix descriptor leak after accepting connections
Dave Platt [Tue, 7 Jan 2014 19:49:49 +0000 (11:49 -0800)]
am
02f042dd: Fix socket descriptor leak from Zygote to child app
* commit '
02f042ddd9ddf47ef88c4f174eb19a9bee296a45':
Fix socket descriptor leak from Zygote to child app
Narayan Kamath [Tue, 7 Jan 2014 13:07:02 +0000 (13:07 +0000)]
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
Narayan Kamath [Tue, 7 Jan 2014 13:06:57 +0000 (13:06 +0000)]
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
Narayan Kamath [Tue, 7 Jan 2014 13:06:52 +0000 (13:06 +0000)]
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
Narayan Kamath [Tue, 7 Jan 2014 13:06:47 +0000 (13:06 +0000)]
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
Narayan Kamath [Tue, 7 Jan 2014 13:06:42 +0000 (13:06 +0000)]
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
Narayan Kamath [Tue, 7 Jan 2014 13:04:19 +0000 (13:04 +0000)]
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
Narayan Kamath [Tue, 7 Jan 2014 13:04:14 +0000 (13:04 +0000)]
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
Narayan Kamath [Tue, 7 Jan 2014 13:04:10 +0000 (13:04 +0000)]
am
e7d7908c: am
02baba25: am
67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '
e7d7908c28adf77de2cefba4f2a554b770d49def':
AArch64: Use long for pointers in DisplayEventReceiver
Narayan Kamath [Tue, 7 Jan 2014 13:04:06 +0000 (13:04 +0000)]
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
Narayan Kamath [Tue, 7 Jan 2014 13:04:01 +0000 (13:04 +0000)]
am
568cde55: am
80cff944: am
74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '
568cde557abfaaa5bf584cf7c3396f9efd990e6c':
AArch64: Use long for pointers in AmrInputStream
Narayan Kamath [Tue, 7 Jan 2014 13:01:13 +0000 (05:01 -0800)]
am
79ceb53a: am
c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '
79ceb53ae5b867a954476e3f6499f89664fbc669':
AArch64: Use long for pointers in MTP classes
Narayan Kamath [Tue, 7 Jan 2014 13:01:08 +0000 (05:01 -0800)]
am
08467c57: am
9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '
08467c5727c04c1fef40ff1e361628944275ef28':
AArch64: Use long for pointers in VideoEditor classes
Narayan Kamath [Tue, 7 Jan 2014 13:01:03 +0000 (05:01 -0800)]
am
02baba25: am
67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '
02baba25545b232436502a73e2928a1d72fa240e':
AArch64: Use long for pointers in DisplayEventReceiver
Narayan Kamath [Tue, 7 Jan 2014 13:00:58 +0000 (05:00 -0800)]
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
Narayan Kamath [Tue, 7 Jan 2014 13:00:53 +0000 (05:00 -0800)]
am
80cff944: am
74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '
80cff94478a39914012df816179ea57c53040903':
AArch64: Use long for pointers in AmrInputStream
Narayan Kamath [Tue, 7 Jan 2014 12:58:23 +0000 (04:58 -0800)]
am
c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '
c58abeeae34c77559c00c7d967c77443469abeef':
AArch64: Use long for pointers in MTP classes
Narayan Kamath [Tue, 7 Jan 2014 12:54:46 +0000 (04:54 -0800)]
am
9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '
9bc6acf27ac446b7e18a51a926caafd99cf34713':
AArch64: Use long for pointers in VideoEditor classes
Narayan Kamath [Tue, 7 Jan 2014 12:54:42 +0000 (04:54 -0800)]
am
67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '
670327544184dbd6274de9127ceaf20dfd5801b4':
AArch64: Use long for pointers in DisplayEventReceiver
Narayan Kamath [Tue, 7 Jan 2014 12:54:35 +0000 (04:54 -0800)]
am
357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
* commit '
357ea90515025d806c6360ef846bf6f84b45a64e':
AArch64: Use long for pointers in audio effect classes
Narayan Kamath [Tue, 7 Jan 2014 12:54:11 +0000 (12:54 +0000)]
Merge "AArch64: Use long for pointers in MTP classes"
Ashok Bhat [Tue, 17 Dec 2013 19:04:19 +0000 (19:04 +0000)]
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>
Narayan Kamath [Tue, 7 Jan 2014 12:50:56 +0000 (04:50 -0800)]
am
74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '
74675f29133ff36dccc95387392bf3654dc94e15':
AArch64: Use long for pointers in AmrInputStream
Narayan Kamath [Tue, 7 Jan 2014 12:50:07 +0000 (12:50 +0000)]
Merge "AArch64: Use long for pointers in VideoEditor classes"
Ashok Bhat [Tue, 17 Dec 2013 14:13:08 +0000 (14:13 +0000)]
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>
Narayan Kamath [Tue, 7 Jan 2014 12:49:27 +0000 (12:49 +0000)]
Merge "AArch64: Use long for pointers in DisplayEventReceiver"
Ashok Bhat [Wed, 18 Dec 2013 18:00:05 +0000 (18:00 +0000)]
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>
Narayan Kamath [Tue, 7 Jan 2014 12:48:21 +0000 (12:48 +0000)]
Merge "AArch64: Use long for pointers in audio effect classes"
Ashok Bhat [Tue, 17 Dec 2013 12:42:00 +0000 (12:42 +0000)]
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>
Narayan Kamath [Tue, 7 Jan 2014 12:45:06 +0000 (12:45 +0000)]
Merge "AArch64: Use long for pointers in AmrInputStream"
Ashok Bhat [Tue, 17 Dec 2013 14:10:25 +0000 (14:10 +0000)]
AArch64: Use long for pointers in AmrInputStream
For storing pointers, long is used in AmrInputStream
class, as native pointers can be 64-bit.
Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08
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>
Narayan Kamath [Tue, 7 Jan 2014 10:14:00 +0000 (10:14 +0000)]
am
3f2843a4: am
c47b7d37: am
9d4ebdca: am
cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '
3f2843a447f037492cf6d2fde928ef88a1d77bc8':
XmlUtils#readThisMapXml should handle null keys.
Narayan Kamath [Tue, 7 Jan 2014 10:13:53 +0000 (10:13 +0000)]
am
ce9418c5: am
c797fd61: am
c9e27802: am
7e296254: Merge "Fix broken XML parsing idiom."
* commit '
ce9418c59e1c9e696b35123d75c077c164893b9f':
Fix broken XML parsing idiom.
Narayan Kamath [Tue, 7 Jan 2014 10:10:49 +0000 (10:10 +0000)]
am
c47b7d37: am
9d4ebdca: am
cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '
c47b7d377c4785f84a22c42c6a99716cceb5973c':
XmlUtils#readThisMapXml should handle null keys.
Narayan Kamath [Tue, 7 Jan 2014 10:10:45 +0000 (10:10 +0000)]
am
c797fd61: am
c9e27802: am
7e296254: Merge "Fix broken XML parsing idiom."
* commit '
c797fd614d28a0c5c3aacbff325e9de572d7f091':
Fix broken XML parsing idiom.
Narayan Kamath [Tue, 7 Jan 2014 10:08:02 +0000 (02:08 -0800)]
am
9d4ebdca: am
cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '
9d4ebdcafaa6a3f29978a7095f2bc3cbe0d5240a':
XmlUtils#readThisMapXml should handle null keys.
Narayan Kamath [Tue, 7 Jan 2014 10:07:56 +0000 (02:07 -0800)]
am
c9e27802: am
7e296254: Merge "Fix broken XML parsing idiom."
* commit '
c9e27802f049b9c3086770a7710b421ce33d2791':
Fix broken XML parsing idiom.
Narayan Kamath [Tue, 7 Jan 2014 10:05:39 +0000 (02:05 -0800)]
am
cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '
cf1aa551eed7be4310a386b9b9e458e46847207a':
XmlUtils#readThisMapXml should handle null keys.
Narayan Kamath [Tue, 7 Jan 2014 10:05:35 +0000 (02:05 -0800)]
am
7e296254: Merge "Fix broken XML parsing idiom."
* commit '
7e29625463e6034147c24992d0ad319ddf426088':
Fix broken XML parsing idiom.
Narayan Kamath [Tue, 7 Jan 2014 10:03:20 +0000 (10:03 +0000)]
Merge "XmlUtils#readThisMapXml should handle null keys."
Narayan Kamath [Tue, 7 Jan 2014 10:02:57 +0000 (10:02 +0000)]
Merge "Fix broken XML parsing idiom."
quddusc [Tue, 7 Jan 2014 00:41:21 +0000 (00:41 +0000)]
am
976b0d13: am
fd08cd48: am
0d4068ad: am
ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477" into klp-docs
* commit '
976b0d135a87217212e0294b8e4ab07a6034f179':
docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477
Baligh Uddin [Tue, 7 Jan 2014 00:41:17 +0000 (00:41 +0000)]
am
24c2980c: (-s ours) am
be24e41b: (-s ours) am
2c4d6d91: (-s ours) am
fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
24c2980cb2a9a93d1d6fe2a849f915b3819056c2':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 00:41:12 +0000 (00:41 +0000)]
am
fce88971: (-s ours) am
f256f49f: (-s ours) am
258bd63f: (-s ours) am
6e15a49e: (-s ours) Import translations. DO NOT MERGE
* commit '
fce889710225bfefd99af59afb83085b23a79704':
Import translations. DO NOT MERGE
quddusc [Tue, 7 Jan 2014 00:37:50 +0000 (00:37 +0000)]
am
fd08cd48: am
0d4068ad: am
ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477" into klp-docs
* commit '
fd08cd4852e285434e9067e09cad41bef28068ca':
docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477
Baligh Uddin [Tue, 7 Jan 2014 00:37:46 +0000 (00:37 +0000)]
am
be24e41b: (-s ours) am
2c4d6d91: (-s ours) am
fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
be24e41b41e9ccec3bb685baf9dc951b386116ee':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 00:37:41 +0000 (00:37 +0000)]
am
f256f49f: (-s ours) am
258bd63f: (-s ours) am
6e15a49e: (-s ours) Import translations. DO NOT MERGE
* commit '
f256f49f9fddbd035375ea8c6444cf7fa36418ca':
Import translations. DO NOT MERGE
quddusc [Tue, 7 Jan 2014 00:30:35 +0000 (16:30 -0800)]
am
0d4068ad: am
ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477" into klp-docs
* commit '
0d4068ad1cbc8b8c550118c2214eb70116b83f81':
docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477
Baligh Uddin [Tue, 7 Jan 2014 00:30:30 +0000 (16:30 -0800)]
am
2c4d6d91: (-s ours) am
fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 00:30:25 +0000 (16:30 -0800)]
am
258bd63f: (-s ours) am
6e15a49e: (-s ours) Import translations. DO NOT MERGE
* commit '
258bd63f38d90ac96aac5eb4e3a5c696e8b089f8':
Import translations. DO NOT MERGE
Conley Owens [Mon, 6 Jan 2014 23:48:58 +0000 (23:48 +0000)]
am
849ab14d: am
7f16047b: am
73a6702e: am
4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '
849ab14d7237d3474f6dde3731ab65624ac297ac':
CompoundButton: Let text can be changed by config
Conley Owens [Mon, 6 Jan 2014 23:46:00 +0000 (23:46 +0000)]
am
7f16047b: am
73a6702e: am
4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '
7f16047b9efeba7cf82690b0492eaed44ca017df':
CompoundButton: Let text can be changed by config
OSDN Git Service
