OSDN Git Service
Narayan Kamath [Fri, 11 Apr 2014 11:41:45 +0000 (11:41 +0000)]
am
79d88d13: am
73e78c75: am
af42a91c: Fix another build breakage.
* commit '
79d88d138c07835d349f7c74f380eaeb7cac8d0b':
Fix another build breakage.
Narayan Kamath [Fri, 11 Apr 2014 11:37:40 +0000 (11:37 +0000)]
am
73e78c75: am
af42a91c: Fix another build breakage.
* commit '
73e78c75b770b3af0d48acac9c8565f7b4d035ff':
Fix another build breakage.
Narayan Kamath [Fri, 11 Apr 2014 11:35:19 +0000 (11:35 +0000)]
am
af42a91c: Fix another build breakage.
* commit '
af42a91c118941d463b474574bf34bf05822350d':
Fix another build breakage.
Narayan Kamath [Fri, 11 Apr 2014 11:28:10 +0000 (12:28 +0100)]
Fix another build breakage.
Caused by
037c33eae74bee2774897d969d48947f9abe254f, which
was submitted without a checkbuild.
Change-Id: I0d48f6b941cc98a30904cdfbd7bcb56ed509734e
Narayan Kamath [Fri, 11 Apr 2014 11:01:59 +0000 (11:01 +0000)]
Narayan Kamath [Fri, 11 Apr 2014 10:57:28 +0000 (10:57 +0000)]
Narayan Kamath [Fri, 11 Apr 2014 10:54:20 +0000 (10:54 +0000)]
Narayan Kamath [Fri, 11 Apr 2014 10:42:33 +0000 (11:42 +0100)]
Fix build.
isScreenOn was changed to isInteractive.
Change-Id: I381d0b0ca745b61e64ac6309c2a6307696f52be0
Narayan Kamath [Fri, 11 Apr 2014 10:10:16 +0000 (10:10 +0000)]
am
26ad3af7: am
c3255ae0: am
de442781: am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
26ad3af74d4b8a6f960de7a4370684a987551f6d':
Dual zygote cleanup.
Narayan Kamath [Fri, 11 Apr 2014 10:02:17 +0000 (10:02 +0000)]
am
c3255ae0: am
de442781: am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
c3255ae04c8bec36f6701b92bf645323558e23c1':
Dual zygote cleanup.
Narayan Kamath [Fri, 11 Apr 2014 09:57:27 +0000 (09:57 +0000)]
am
de442781: am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
de442781cd4f7404e8aaa3f7ca5d1d3fc28cccc6':
Dual zygote cleanup.
Jinsuk Kim [Fri, 11 Apr 2014 09:47:20 +0000 (09:47 +0000)]
am
4bdcd299: am
55dab4dd: am
b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit '
4bdcd299da48f9abe5f9c67abed0dbe79080445d':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
Jinsuk Kim [Fri, 11 Apr 2014 09:43:37 +0000 (09:43 +0000)]
am
55dab4dd: am
b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit '
55dab4dd3b5b56ade91c012d688b581b6cbdebdf':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
Mikhail Naganov [Fri, 11 Apr 2014 09:42:32 +0000 (09:42 +0000)]
am
b429088c: Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat."
* commit '
b429088cbb12a226fd217f04870d16bbd833ed06':
Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat.
Jinsuk Kim [Fri, 11 Apr 2014 09:40:46 +0000 (09:40 +0000)]
am
b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit '
b11f250e09195d1ab250c93bfed0b31ed3a40f3d':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
Jinsuk Kim [Fri, 11 Apr 2014 09:38:22 +0000 (09:38 +0000)]
Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
Mikhail Naganov [Fri, 11 Apr 2014 09:36:38 +0000 (09:36 +0000)]
Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat."
Jinsuk Kim [Mon, 7 Apr 2014 04:39:17 +0000 (13:39 +0900)]
Delegate HdmiCecService method impl to HdmiCecDevice subclass
Most of the methods in the interface IHdmiCecService should be implemented
based on the device type. This CL makes a change such that the HdmiCecDevice
just has stub methods that should be overriden by subclasses.
Other changes:
- Fixed a bug of <Inactive Source> not sending its physical address
in its message body. Also the command should have been sent to TV
only rather than broadcast.
- Put back sendGiveDevicePowerStatus interface method. It allows the client
to keep track of the other device(like TV) power status more closely.
Devices goes through the status from standby -> transient to on -> on
but the CEC spec doesn't require that they broacast it actively.
The restored method can be used to let the playback device to get
up-to-date power status of TV/display when it is booting up.
This method should work the same across all the device types. So it was
implemented in the service, not delegated to HdmiCecDevice.
- Send <Report Physical Address> when a new logical device is registered,
which is required by CEC spec: "it should report the association between
its logical and physical address by broadcasting <Report Physical
Address>
Change-Id: Iac1d2cf5783d947f2dcd6965a54670fbdb8e6a63
Jeff Brown [Fri, 11 Apr 2014 09:26:02 +0000 (09:26 +0000)]
am
26c6a50f: Rename isScreenOn() to isInteractive().
* commit '
26c6a50f037c6af9c41b3f96269fe194748605ce':
Rename isScreenOn() to isInteractive().
Jeff Brown [Fri, 11 Apr 2014 09:15:54 +0000 (02:15 -0700)]
Rename isScreenOn() to isInteractive().
Fix build break due to an earlier merge.
Change-Id: I6e6583b251da9e027a4ade45cb4bb77e9d4ee624
Mikhail Naganov [Thu, 10 Apr 2014 17:07:42 +0000 (18:07 +0100)]
Add Javadoc statement regarding enumerability of methods of injected Java
objects for applications targeted to API levels after KitKat.
Bug:
12169386
Change-Id: I1c988468545e48ac0d7323b01b9c77a1f8d713f2
Narayan Kamath [Fri, 11 Apr 2014 08:45:47 +0000 (08:45 +0000)]
am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
909a6a0e2b5815332618b2cf731d27824a76d042':
Dual zygote cleanup.
Jeff Brown [Fri, 11 Apr 2014 08:43:44 +0000 (08:43 +0000)]
am
4e5c089e: resolved conflicts for merge of
337e764d to master
* commit '
4e5c089ef3e62e7f658e71c0be262d09bd3e399b':
Plumb display power state through display manager.
Jeff Brown [Fri, 11 Apr 2014 08:21:14 +0000 (01:21 -0700)]
resolved conflicts for merge of
337e764d to master
Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
Colin Cross [Fri, 11 Apr 2014 08:31:32 +0000 (08:31 +0000)]
Narayan Kamath [Fri, 11 Apr 2014 08:24:52 +0000 (08:24 +0000)]
Merge "Dual zygote cleanup."
Colin Cross [Fri, 11 Apr 2014 05:16:11 +0000 (05:16 +0000)]
Merge "fix build"
Colin Cross [Fri, 11 Apr 2014 05:05:57 +0000 (22:05 -0700)]
fix build
Fix make checkbuild.
Change-Id: Ie9335a9e8afe4dc13ec47b2e84ab433b19ff315f
Jeff Brown [Fri, 11 Apr 2014 03:49:37 +0000 (03:49 +0000)]
am
f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev
* commit '
f24687e2731811fd0e3803b691fd47a659f89329':
Plumb display power state through display manager.
Jeff Brown [Fri, 11 Apr 2014 03:47:08 +0000 (03:47 +0000)]
Merge "Plumb display power state through display manager." into klp-modular-dev
Jeff Brown [Wed, 9 Apr 2014 07:31:55 +0000 (00:31 -0700)]
Plumb display power state through display manager.
Declare a new method, Display.getState() to retrieve the actual
power state of a display.
Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.
Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.
Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.
Eliminated the bright here and woke here policy flags since they
were unused. Simplified the input dispatch policy somewhat.
Ensure that screen wake locks are respected up until the point
when dozing really begins.
Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.
Bug:
13133142
Bug:
13472578
Bug:
13929355
Bug:
13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
Alan Viverette [Fri, 11 Apr 2014 02:59:12 +0000 (02:59 +0000)]
am
eed2be4e: Merge "Fix support for TouchFeedbackDrawable tint mode"
* commit '
eed2be4eab2b43618bd5e89c4a228b9988af8c65':
Fix support for TouchFeedbackDrawable tint mode
Alan Viverette [Fri, 11 Apr 2014 02:55:31 +0000 (02:55 +0000)]
Merge "Fix support for TouchFeedbackDrawable tint mode"
Sungsoo Lim [Fri, 11 Apr 2014 02:29:41 +0000 (02:29 +0000)]
am
f0e74f08: Merge "Add equals, hashCode, and toString methods in TvInputInfo."
* commit '
f0e74f08a1a11a6d7bb25f34350ff996716036a1':
Add equals, hashCode, and toString methods in TvInputInfo.
Alan Viverette [Fri, 11 Apr 2014 02:27:58 +0000 (19:27 -0700)]
Fix support for TouchFeedbackDrawable tint mode
Change-Id: I86bff1c5e69d9a193deb52559948b20ddca99751
Sungsoo Lim [Fri, 11 Apr 2014 02:27:21 +0000 (02:27 +0000)]
Merge "Add equals, hashCode, and toString methods in TvInputInfo."
Sungsoo Lim [Thu, 10 Apr 2014 07:41:57 +0000 (16:41 +0900)]
Add equals, hashCode, and toString methods in TvInputInfo.
Change-Id: I770e0eeac334d2c0b98ef0941bc9840296360e4f
Alan Viverette [Fri, 11 Apr 2014 01:18:30 +0000 (01:18 +0000)]
am
494fb7b5: Update volume panel
* commit '
494fb7b58a21a7a9a8eba3bacecffe115edcb8c6':
Update volume panel
Alan Viverette [Fri, 11 Apr 2014 01:12:56 +0000 (18:12 -0700)]
Update volume panel
Change-Id: I6f0887069598f8addc5c5af5aef9c07a69532424
Amith Yamasani [Fri, 11 Apr 2014 00:35:57 +0000 (00:35 +0000)]
am
c095ca1c: Merge "Corp badging for Recents"
* commit '
c095ca1cb8877121f768b5b6940e4025e810d4ba':
Corp badging for Recents
Amith Yamasani [Fri, 11 Apr 2014 00:30:35 +0000 (00:30 +0000)]
Merge "Corp badging for Recents"
Amith Yamasani [Thu, 10 Apr 2014 20:48:15 +0000 (13:48 -0700)]
Corp badging for Recents
Badge apps that belong to the corp profile when shown in the recents list.
Add a userId to TaskKey to help with caching.
Bug:
11676348
Change-Id: I92c8262dce763de89497977fcc6a53899afda136
Zhijun He [Fri, 11 Apr 2014 00:15:30 +0000 (00:15 +0000)]
am
438d77e0: MediaFrameworkTest: Fix Camera2 API unit test build breakage
* commit '
438d77e0429f78def6c0cb3c21095202c71b8220':
MediaFrameworkTest: Fix Camera2 API unit test build breakage
Zhijun He [Fri, 11 Apr 2014 00:09:22 +0000 (17:09 -0700)]
MediaFrameworkTest: Fix Camera2 API unit test build breakage
Change-Id: I49329e2c3bbf1290f1f6e7c64dbb56eb831e5a96
Alan Viverette [Thu, 10 Apr 2014 23:20:19 +0000 (23:20 +0000)]
am
316e533a: Merge "Update brightness icons to use color attribute"
* commit '
316e533ab0ac9888af9e6c3db44e886dd50312e1':
Update brightness icons to use color attribute
Jean-Michel Trivi [Thu, 10 Apr 2014 23:20:15 +0000 (23:20 +0000)]
am
cf3f3c27: Merge "MediaFocusControl: fix comment"
* commit '
cf3f3c27364cf82619e50436f3f9d308dc669229':
MediaFocusControl: fix comment
Alan Viverette [Thu, 10 Apr 2014 23:15:45 +0000 (23:15 +0000)]
Merge "Update brightness icons to use color attribute"
Alan Viverette [Thu, 10 Apr 2014 23:14:40 +0000 (16:14 -0700)]
Update brightness icons to use color attribute
BUG:
13961573
Change-Id: I6c7f85c8cda739cb1e5e14c39c7e4a9fe20a8650
Jean-Michel Trivi [Thu, 10 Apr 2014 23:11:28 +0000 (23:11 +0000)]
Merge "MediaFocusControl: fix comment"
ztenghui [Thu, 10 Apr 2014 22:47:23 +0000 (22:47 +0000)]
am
8a5c99c9: Merge "Fix path interpretation on curves"
* commit '
8a5c99c9e91fc86875f3c11f621a9e8a50c5831b':
Fix path interpretation on curves
ztenghui [Thu, 10 Apr 2014 22:40:35 +0000 (22:40 +0000)]
Merge "Fix path interpretation on curves"
Raph Levien [Thu, 10 Apr 2014 22:29:14 +0000 (22:29 +0000)]
am
6d954bbd: Merge "Fix build breakage"
* commit '
6d954bbdf5a5c0246ea8bfb5ed1cfb56060bbe56':
Fix build breakage
John Reck [Thu, 10 Apr 2014 22:29:10 +0000 (22:29 +0000)]
am
822bbb38: Merge "Make attachFunctor blocking"
* commit '
822bbb382fa6b6c8d1b45770e27c2c2732a7afb7':
Make attachFunctor blocking
Raph Levien [Thu, 10 Apr 2014 22:24:54 +0000 (22:24 +0000)]
Merge "Fix build breakage"
John Reck [Thu, 10 Apr 2014 22:23:22 +0000 (22:23 +0000)]
Merge "Make attachFunctor blocking"
Raph Levien [Thu, 10 Apr 2014 22:12:30 +0000 (15:12 -0700)]
Fix build breakage
A recent change to remove VectorDrawable methods from the public api
didn't run update-api. This should fix that build.
Change-Id: I4d86221f5ada96113f673def4b32985c6d60110a
Jean-Michel Trivi [Thu, 10 Apr 2014 22:05:44 +0000 (15:05 -0700)]
MediaFocusControl: fix comment
Comment about role of audio focus isn't valid anymore.
Change-Id: I608d8cf9d5d9c4449384e2788e5eb5ea42c97eca
John Reck [Thu, 10 Apr 2014 22:00:13 +0000 (15:00 -0700)]
Make attachFunctor blocking
Bug:
13930200
Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
Alan Viverette [Thu, 10 Apr 2014 21:38:02 +0000 (21:38 +0000)]
am
4b1a7c20: Fix build breakage
* commit '
4b1a7c203d5e32c8b2dc7f4f54f28559ca31860a':
Fix build breakage
Alan Viverette [Thu, 10 Apr 2014 21:28:30 +0000 (14:28 -0700)]
Fix build breakage
Change-Id: I73d9ff5f38986b7acf83b85c1989203f472bc5fd
John Reck [Thu, 10 Apr 2014 21:17:51 +0000 (21:17 +0000)]
am
a47c3cc5: Merge "Remove sync flush"
* commit '
a47c3cc5375777a9adbc0dba95e6f133541f8d28':
Remove sync flush
John Reck [Thu, 10 Apr 2014 21:13:07 +0000 (21:13 +0000)]
Merge "Remove sync flush"
Selim Cinek [Thu, 10 Apr 2014 21:06:38 +0000 (21:06 +0000)]
am
ff0978fd: Merge "Further improved NotificationStackScroller"
* commit '
ff0978fd162d1211007c8345bd1ea641fa2b0e33':
Further improved NotificationStackScroller
Selim Cinek [Thu, 10 Apr 2014 21:01:28 +0000 (21:01 +0000)]
Merge "Further improved NotificationStackScroller"
Jianing Wei [Thu, 10 Apr 2014 19:56:25 +0000 (19:56 +0000)]
am
dcb495ff: Merge "Camera2 API: enable burst capture and repeating burst."
* commit '
dcb495ff86b1322256585dbd5eda92949a1e8a4f':
Camera2 API: enable burst capture and repeating burst.
Jianing Wei [Thu, 10 Apr 2014 19:51:57 +0000 (19:51 +0000)]
Merge "Camera2 API: enable burst capture and repeating burst."
Jianing Wei [Fri, 28 Mar 2014 01:27:43 +0000 (18:27 -0700)]
Camera2 API: enable burst capture and repeating burst.
* Enable sending out burst requests, canceling, and flushing.
* Enable onCaptureStarted, onResultReceived for bursts.
* Enable onCaptureSequenceCompleted by tracking frame number.
Change-Id: Ica2b031cac7ad90f9c4b74a78e6185e627195340
Bug-ID:
10749500
Alan Viverette [Thu, 10 Apr 2014 19:46:47 +0000 (19:46 +0000)]
am
de5a29de: Merge "Cleaning up VectorDrawable"
* commit '
de5a29deaed1c527a78441189e64a40cdf3d82d3':
Cleaning up VectorDrawable
Alan Viverette [Thu, 10 Apr 2014 19:38:24 +0000 (19:38 +0000)]
Merge "Cleaning up VectorDrawable"
Selim Cinek [Tue, 8 Apr 2014 00:27:49 +0000 (02:27 +0200)]
Further improved NotificationStackScroller
The top card is now collapsed during the pulldown of
the notification shade and expanded during the transition.
The scrollstate is also reset once the shade is closed.
Change-Id: Ibf17eef1f338d674c545e5bf55261e60db62b2ce
Svetoslav [Thu, 10 Apr 2014 19:36:27 +0000 (19:36 +0000)]
am
6be2f952: Merge "Adding render stats APIs to UiAutomation (framework)."
* commit '
6be2f95202237b7284542e692273d13a5bd26913':
Adding render stats APIs to UiAutomation (framework).
Svetoslav [Thu, 10 Apr 2014 19:32:59 +0000 (19:32 +0000)]
Merge "Adding render stats APIs to UiAutomation (framework)."
Chris Wren [Thu, 10 Apr 2014 19:23:27 +0000 (19:23 +0000)]
am
2bb8dde4: Merge "support the people extra on the notification object"
* commit '
2bb8dde44be10212ec453d435aaad27177714f5e':
support the people extra on the notification object
Chris Wren [Thu, 10 Apr 2014 19:18:31 +0000 (19:18 +0000)]
Merge "support the people extra on the notification object"
Chris Wren [Wed, 26 Mar 2014 21:24:15 +0000 (17:24 -0400)]
support the people extra on the notification object
currently supported URIs:
content://com.android.contacts/contacts/lookup/*
tel:*
Change-Id: I833eee3f2ee40aa8cb2cfad135bdd6cb2c0eb792
Alan Viverette [Thu, 10 Apr 2014 18:14:45 +0000 (11:14 -0700)]
Cleaning up VectorDrawable
Use argb evaluation method from animation package, lazily create paint,
set default for stroke line cap and join. Fix scaling to bounds. Fix
drawable in test app.
Change-Id: I245d5d6acc6ba9806743ab2bf9bf99aff3649c39
Evan Charlton [Thu, 10 Apr 2014 17:54:43 +0000 (17:54 +0000)]
Merge "Expose CallState.NEW" into master-nova
John Reck [Thu, 10 Apr 2014 17:28:45 +0000 (10:28 -0700)]
Remove sync flush
Bug:
13952590
It was attempting to flush state changes after the canvas was
destroyed, which caused layer updates to crash.
Due to the removal of SetDisplayListData, the sync mode isn't able
to do anything ever, so remove it.
Change-Id: I1e18ce288d81fd47cc6e612afda9476f75ecef2e
Evan Charlton [Thu, 10 Apr 2014 16:21:03 +0000 (09:21 -0700)]
Expose CallState.NEW
Expose CallState.NEW so that we have a state before DIALING. Immediately
transitioning calls to DIALING is wrong, because that shouldn't happen
until the CallService is actually dialing.
Bug:
13902624
Change-Id: Id5ee0d4d050deb2f3038f3de8fdd265caa75f7b2
Baligh Uddin [Thu, 10 Apr 2014 16:07:41 +0000 (16:07 +0000)]
am
2271a91c: (-s ours) am
cd5e3f85: (-s ours) am
da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
2271a91c327cee8a6c1dffcbfd3419c95d56c37e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:58:38 +0000 (15:58 +0000)]
am
cd5e3f85: (-s ours) am
da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
cd5e3f85fc9228b943ee8dfda0951e068953596c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:57:08 +0000 (15:57 +0000)]
am
8c22e367: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
8c22e3674258261d9870f48e752572d438838fe1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:55:25 +0000 (15:55 +0000)]
am
da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
da6b9599c77230c689d63e32ca80b62f60f18c27':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:51:37 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 10 Apr 2014 15:51:35 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Paul Lawrence [Thu, 10 Apr 2014 14:35:25 +0000 (14:35 +0000)]
am
9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection"
* commit '
9502f990899ef576879048ec5147d403158ad89d':
Allow encryption when keyguard is set to pattern or no protection
Paul Lawrence [Thu, 10 Apr 2014 14:30:52 +0000 (14:30 +0000)]
Merge "Allow encryption when keyguard is set to pattern or no protection"
Narayan Kamath [Thu, 10 Apr 2014 11:31:56 +0000 (11:31 +0000)]
am
edd6d9e3: am
3603970d: am
940e76fd: am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
edd6d9e3a87d47b42d9119b70d1f442c3fa98c35':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:28:34 +0000 (11:28 +0000)]
am
3603970d: am
940e76fd: am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
3603970d3a8a2215027e96c4861e1ab9eec86f79':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:25:56 +0000 (11:25 +0000)]
am
940e76fd: am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:21:33 +0000 (11:21 +0000)]
am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
b827f78e7acee3a604c315615268edf7098dc184':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:18:28 +0000 (11:18 +0000)]
Merge "Removed android.debug.JNITest from preloaded-classes"
Narayan Kamath [Thu, 10 Apr 2014 11:13:06 +0000 (12:13 +0100)]
Dual zygote cleanup.
- Use different process names for the 32 / 64 bit zygote.
- Pass command line arguments correctly. The first unmatched
argument must be passed through to the java main class.
Change-Id: I952ebbdbba941f118d992354b9bd0ada2dade417
Narayan Kamath [Thu, 10 Apr 2014 09:49:45 +0000 (09:49 +0000)]
am
f148f36d: am
9e289d70: am
1d26a3f1: am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
f148f36d140e995ec8f755e60bbb0b37f33c3da7':
System services detect and register app CPU ABIs
Narayan Kamath [Thu, 10 Apr 2014 09:49:42 +0000 (09:49 +0000)]
am
d11f223c: resolved conflicts for merge of
286a247e to master
* commit '
d11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4':
Re-implement native library search and copies.
Narayan Kamath [Thu, 10 Apr 2014 09:45:18 +0000 (09:45 +0000)]
am
9e289d70: am
1d26a3f1: am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
9e289d70a8baaed0030413b5991653792e2a816d':
System services detect and register app CPU ABIs
Narayan Kamath [Thu, 10 Apr 2014 09:37:17 +0000 (10:37 +0100)]
resolved conflicts for merge of
286a247e to master
Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
Narayan Kamath [Thu, 10 Apr 2014 09:26:59 +0000 (09:26 +0000)]
am
1d26a3f1: am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
1d26a3f1efd0d965e8751e8515608c31789bdbe2':
System services detect and register app CPU ABIs
Narayan Kamath [Thu, 10 Apr 2014 09:26:44 +0000 (09:26 +0000)]
am
0fd40cb1: am
80413c9f: Merge "Re-implement native library search and copies."
* commit '
0fd40cb100bccbd5d9ad6109ca39c818a857f889':
Re-implement native library search and copies.
Narayan Kamath [Thu, 10 Apr 2014 09:23:33 +0000 (09:23 +0000)]
am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
System services detect and register app CPU ABIs
OSDN Git Service
