OSDN Git Service
Craig Mautner [Fri, 10 Jan 2014 21:28:10 +0000 (13:28 -0800)]
Fix invalid stackId bug.
Eliminate race condition by executing window manager createStack
directly from activity manager.
Change-Id: I2dda276d07d0ae09c7c958980bc5ebffe72ebd92
Craig Mautner [Fri, 20 Dec 2013 17:06:56 +0000 (09:06 -0800)]
Implement ActivityView.
With an existing ActivityContainer a caller can now create an
ActivityView which consists of a new VirtualDisplay immediately
attached to the ActivityContainer.
Change-Id: Id70333dcbef55d524a87df8f8c92d72ca5579364
Adam Powell [Fri, 10 Jan 2014 18:30:22 +0000 (18:30 +0000)]
Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-modular-dev
Craig Mautner [Fri, 10 Jan 2014 18:21:49 +0000 (18:21 +0000)]
Merge "Allow for the possibility of null ActivityContainer" into klp-modular-dev
Craig Mautner [Fri, 10 Jan 2014 18:16:43 +0000 (10:16 -0800)]
Allow for the possibility of null ActivityContainer
When BinderProxy is passed in as the IBinder for
getEnclosingActivityContainer the activity manager cannot turn it into
an ActivityRecord. This causes NPE in ActivityThread which is Not Good
(tm).
Allowing null to be returned when requesting an ActivityContainer and
handling it appropriately fixes this bug.
Fixes bug
12473669.
Change-Id: I6937636042f8853b3ddc2df40be010e7391e41a5
Adam Powell [Fri, 10 Jan 2014 18:16:27 +0000 (10:16 -0800)]
Fix a bug where OnTouchListeners in action views could be removed
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.
Bug
12470259
Change-Id: I8c4c6110065605225a20cb7ed872255282085661
Craig Mautner [Fri, 10 Jan 2014 16:43:18 +0000 (16:43 +0000)]
Merge "Call moveHomeStack before moving any stack." into klp-modular-dev
Craig Mautner [Fri, 10 Jan 2014 16:40:23 +0000 (08:40 -0800)]
Call moveHomeStack before moving any stack.
Order matters, otherwise mFocusedStack and mLastStack aren't updated
correctly.
Fixes bug
12478856.
Change-Id: I12e4334678bb3af49d1ff26c4003def3e8d987c2
Amith Yamasani [Thu, 9 Jan 2014 23:38:12 +0000 (15:38 -0800)]
Only compile the services jar and so when using mmm
Don't build the tests when using "mmm frameworks/base/services"
Change-Id: If1895598381bd0fce0b4d7f5e879f154d8fc44d0
Amith Yamasani [Thu, 9 Jan 2014 21:45:09 +0000 (21:45 +0000)]
Merge "Include subdirectory Android.mks." into klp-modular-dev
Christopher Tate [Thu, 9 Jan 2014 20:53:45 +0000 (20:53 +0000)]
am
f1fbe113: am
4ba1bbad: am
5fbcb134: am
35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '
f1fbe1135a2872a7287f5c06af211cf780f16598':
Cursor leakage due to cancellation signal
Christopher Tate [Thu, 9 Jan 2014 20:50:22 +0000 (20:50 +0000)]
am
4ba1bbad: am
5fbcb134: am
35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '
4ba1bbadb784e365f443b0272b111d384f4f2229':
Cursor leakage due to cancellation signal
Christopher Tate [Thu, 9 Jan 2014 20:47:50 +0000 (12:47 -0800)]
am
5fbcb134: am
35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '
5fbcb1347494e17dc9e9cd66d8e47a3972a8b90d':
Cursor leakage due to cancellation signal
Christopher Tate [Thu, 9 Jan 2014 20:43:39 +0000 (12:43 -0800)]
am
35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '
35b7de4c4562db8af697ad3384c09d2258d183ba':
Cursor leakage due to cancellation signal
Ying Wang [Thu, 9 Jan 2014 19:02:03 +0000 (11:02 -0800)]
Include subdirectory Android.mks.
Change-Id: I6e6bc721dbcf127b52f2a60f255c9fc677d3be29
(cherry picked from commit
c459bfea7e7be4343387dee137d4a5be9742fd91)
Christopher Tate [Thu, 9 Jan 2014 20:41:26 +0000 (20:41 +0000)]
Merge "Cursor leakage due to cancellation signal"
Vinod Krishnan [Thu, 5 Dec 2013 01:12:20 +0000 (17:12 -0800)]
Fwk: Adding a micro theme
Adding a micro theme affects 3 different GIT repositories:
1. Repository 'device/google/clockwork' - https://ar/398971
This has the overlay for the DeviceDefault for ClockWork
2. Repository 'platform/vendor/google_clockwork' - https://ar/399378
This has the changes to Clockwork Home to use the new micro Theme.
3. Repository 'frameworks/base' - https://ar/398959
This adds the *_micro.xml style/theme files.
Change-Id: Ib1e87953b052a9ec2ff0ea11dd0dfe55317442b4
Jeff Brown [Thu, 9 Jan 2014 02:12:58 +0000 (02:12 +0000)]
Merge "Add flag to force public virtual display to show own content." into klp-modular-dev
Wink Saville [Wed, 8 Jan 2014 19:37:30 +0000 (19:37 +0000)]
am
bc0207fd: am
2626d0e1: am
ad068837: am
76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '
bc0207fdbd6cd8b3f250704b07edef07ab376bcb':
telephony: Add same named operator configuration for some operators
Wink Saville [Wed, 8 Jan 2014 19:34:12 +0000 (19:34 +0000)]
am
2626d0e1: am
ad068837: am
76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '
2626d0e18dc9898d70f75540fabc67421f33fab3':
telephony: Add same named operator configuration for some operators
Wink Saville [Wed, 8 Jan 2014 19:31:02 +0000 (11:31 -0800)]
am
ad068837: am
76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '
ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
telephony: Add same named operator configuration for some operators
Wink Saville [Wed, 8 Jan 2014 19:28:58 +0000 (11:28 -0800)]
am
76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '
76d5cdd820b5d81af8de73180c272d7f8a01caae':
telephony: Add same named operator configuration for some operators
Wink Saville [Wed, 8 Jan 2014 19:25:11 +0000 (19:25 +0000)]
Merge "telephony: Add same named operator configuration for some operators"
Craig Mautner [Wed, 8 Jan 2014 17:33:42 +0000 (17:33 +0000)]
Merge "Extend stack management to other displays." into klp-modular-dev
Mike Lockwood [Wed, 8 Jan 2014 16:08:17 +0000 (16:08 +0000)]
am
d9e708e3: am
12ec2e6d: am
99206593: am
9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '
d9e708e365d94e83ec135f1486129febd3f8eaea':
Added missing USB device descriptor fields needed for intent filters
Mike Lockwood [Wed, 8 Jan 2014 16:05:29 +0000 (16:05 +0000)]
am
12ec2e6d: am
99206593: am
9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '
12ec2e6d71bc69ca11946f7f051931863c934273':
Added missing USB device descriptor fields needed for intent filters
Mike Lockwood [Wed, 8 Jan 2014 16:01:42 +0000 (08:01 -0800)]
am
99206593: am
9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '
992065938a95e5273b22dea009b8581bcc693e61':
Added missing USB device descriptor fields needed for intent filters
Mike Lockwood [Wed, 8 Jan 2014 15:59:06 +0000 (07:59 -0800)]
am
9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '
9607d78f5144792993bd254a4b5983b2a9d5bf83':
Added missing USB device descriptor fields needed for intent filters
Mike Lockwood [Wed, 8 Jan 2014 15:56:13 +0000 (15:56 +0000)]
Merge "Added missing USB device descriptor fields needed for intent filters"
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>
Jeff Brown [Wed, 8 Jan 2014 02:13:09 +0000 (18:13 -0800)]
Add flag to force public virtual display to show own content.
Change-Id: I1039f2ef3154169ec90411a4c7ba2c94629f72c4
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>
OSDN Git Service
