OSDN Git Service
Tim Murray [Mon, 3 Feb 2014 23:19:38 +0000 (23:19 +0000)]
am
2905039d: am
16e9362e: am
8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '
2905039d523610c5253b247dd77292c7bda830b7':
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Tim Murray [Mon, 3 Feb 2014 23:19:34 +0000 (23:19 +0000)]
am
47f295e8: (-s ours) am
8df3ea66: am
b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit '
47f295e8cb26991fe4b1d5f0a218222a0728d9a2':
Convert Java/JNI to 64-bit, part 2.
Tim Murray [Mon, 3 Feb 2014 23:13:28 +0000 (23:13 +0000)]
am
041c77ac: (-s ours) am
72d637e2: am
e22e268e: Merge changes If93a5d78,I1957f7ac
* commit '
041c77ac440efc6c61b7d1f68b885ad3a8015237':
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
Tim Murray [Mon, 3 Feb 2014 23:07:29 +0000 (23:07 +0000)]
am
923da98f: (-s ours) am
bccee732: am
61eb6b55: Merge "Use Object + type in place of specific array"
* commit '
923da98f792d97638f78f311ac80cac53e306408':
Use Object + type in place of specific array
Alan Viverette [Mon, 3 Feb 2014 23:03:20 +0000 (23:03 +0000)]
Merge "Fix ordering of dimension caching during ImageView.setResource()"
Tim Murray [Mon, 3 Feb 2014 23:01:29 +0000 (23:01 +0000)]
am
4e5e654e: (-s ours) am
69914882: am
e559d7ee: Merge "Utility API for creating types."
* commit '
4e5e654e7aac2212e40915df16fe6ad8598fb4bc':
Utility API for creating types.
Tim Murray [Mon, 3 Feb 2014 22:55:18 +0000 (22:55 +0000)]
am
b0a79d35: am
271c3b74: am
b1c1518e: Merge "Remove old hidden API."
* commit '
b0a79d35929d874628c3e0add672eff498e26b83':
Remove old hidden API.
Tim Murray [Mon, 3 Feb 2014 22:55:13 +0000 (22:55 +0000)]
am
a392cdf3: am
9bad32c3: am
aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit '
a392cdf375e4f43bea8c5398ed2b3bc993a31a77':
Remove hidden API setSurfaceTexture.
Tim Murray [Mon, 3 Feb 2014 22:45:02 +0000 (22:45 +0000)]
am
16e9362e: am
8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '
16e9362e5f5b4f09a46198218380bb386fee28e5':
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Tim Murray [Mon, 3 Feb 2014 22:44:58 +0000 (22:44 +0000)]
am
8df3ea66: am
b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit '
8df3ea66994e96d72040c44099dd2d74ba15ec67':
Convert Java/JNI to 64-bit, part 2.
Tim Murray [Mon, 3 Feb 2014 22:44:54 +0000 (22:44 +0000)]
am
72d637e2: am
e22e268e: Merge changes If93a5d78,I1957f7ac
* commit '
72d637e297a143e5b18c8e8f4eb85695ed6b10f1':
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
Tim Murray [Mon, 3 Feb 2014 22:44:51 +0000 (22:44 +0000)]
am
bccee732: am
61eb6b55: Merge "Use Object + type in place of specific array"
* commit '
bccee732b53d06c0e983b3f325e0d9ad889de134':
Use Object + type in place of specific array
Igor Murashkin [Mon, 3 Feb 2014 22:44:50 +0000 (22:44 +0000)]
Merge "camera2: Revise android.sensor.maxFrameDuration definition"
Tim Murray [Mon, 3 Feb 2014 22:44:47 +0000 (22:44 +0000)]
am
69914882: am
e559d7ee: Merge "Utility API for creating types."
* commit '
69914882509b8ad81c23eadd1ebae53fb532042b':
Utility API for creating types.
Tim Murray [Mon, 3 Feb 2014 22:44:44 +0000 (22:44 +0000)]
am
271c3b74: am
b1c1518e: Merge "Remove old hidden API."
* commit '
271c3b7499f53f6e7e168d68910efda5cc19f5fd':
Remove old hidden API.
Tim Murray [Mon, 3 Feb 2014 22:44:39 +0000 (22:44 +0000)]
am
9bad32c3: am
aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit '
9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
Remove hidden API setSurfaceTexture.
Tim Murray [Mon, 3 Feb 2014 22:41:17 +0000 (14:41 -0800)]
am
8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '
8fced3174ad45e5d618f28c82d69bd21261f6108':
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Tim Murray [Mon, 3 Feb 2014 22:41:14 +0000 (14:41 -0800)]
am
b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit '
b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9':
Convert Java/JNI to 64-bit, part 2.
Tim Murray [Mon, 3 Feb 2014 22:41:11 +0000 (14:41 -0800)]
am
e22e268e: Merge changes If93a5d78,I1957f7ac
* commit '
e22e268e6d158f37173b1bce37a5614daabcf18c':
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
Tim Murray [Mon, 3 Feb 2014 22:41:08 +0000 (14:41 -0800)]
am
61eb6b55: Merge "Use Object + type in place of specific array"
* commit '
61eb6b55c6b4db14e025240fc754e1314f57bd00':
Use Object + type in place of specific array
Tim Murray [Mon, 3 Feb 2014 22:41:05 +0000 (14:41 -0800)]
am
e559d7ee: Merge "Utility API for creating types."
* commit '
e559d7ee53a69502c9aef8764bb055ed2d1adb64':
Utility API for creating types.
Tim Murray [Mon, 3 Feb 2014 22:41:02 +0000 (14:41 -0800)]
am
b1c1518e: Merge "Remove old hidden API."
* commit '
b1c1518ef1e89fb8bc42022b6455a695cacd949c':
Remove old hidden API.
Tim Murray [Mon, 3 Feb 2014 22:41:00 +0000 (14:41 -0800)]
am
aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit '
aea3b5816d8461fcbc4a384874a1a073ecdeafcf':
Remove hidden API setSurfaceTexture.
Igor Murashkin [Mon, 3 Feb 2014 22:39:19 +0000 (14:39 -0800)]
camera2: Revise android.sensor.maxFrameDuration definition
Change-Id: If0bb6c07f4dff85120c31f7163a41f2af255fd65
Tim Murray [Mon, 3 Feb 2014 22:36:50 +0000 (22:36 +0000)]
Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
Tim Murray [Mon, 3 Feb 2014 22:36:45 +0000 (22:36 +0000)]
Merge "Convert Java/JNI to 64-bit, part 2."
Tim Murray [Mon, 3 Feb 2014 22:36:37 +0000 (22:36 +0000)]
Merge changes If93a5d78,I1957f7ac
* changes:
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
Tim Murray [Mon, 3 Feb 2014 22:36:36 +0000 (22:36 +0000)]
Merge "Use Object + type in place of specific array"
Tim Murray [Mon, 3 Feb 2014 22:36:13 +0000 (22:36 +0000)]
Merge "Utility API for creating types."
Tim Murray [Mon, 3 Feb 2014 22:36:05 +0000 (22:36 +0000)]
Merge "Remove old hidden API."
Tim Murray [Mon, 3 Feb 2014 22:35:14 +0000 (22:35 +0000)]
Merge "Remove hidden API setSurfaceTexture."
Alan Viverette [Mon, 3 Feb 2014 22:32:07 +0000 (14:32 -0800)]
Fix ordering of dimension caching during ImageView.setResource()
BUG:
12876148
Change-Id: I8c27546851f491e229a880307d34e1da8e74e6c2
ztenghui [Mon, 3 Feb 2014 22:18:53 +0000 (22:18 +0000)]
Merge "Fixing a bad bug when there is no real umbra"
John Spurlock [Mon, 3 Feb 2014 22:11:53 +0000 (22:11 +0000)]
Merge "Remove unused line from PhoneWindowManager."
Dianne Hackborn [Mon, 3 Feb 2014 21:32:33 +0000 (21:32 +0000)]
Merge "More battery history improvements."
Zhijun He [Mon, 3 Feb 2014 21:10:19 +0000 (21:10 +0000)]
Merge "Camera2: Update sceneFlicker tag spec"
Zhijun He [Mon, 3 Feb 2014 21:09:06 +0000 (13:09 -0800)]
Camera2: Update sceneFlicker tag spec
Change-Id: Ieb083b653b83f0373661fc15895ce23a4342a47f
Zhijun He [Mon, 3 Feb 2014 20:41:43 +0000 (20:41 +0000)]
Merge "Camera2: update lens state tag specs"
Zhijun He [Mon, 3 Feb 2014 20:39:53 +0000 (12:39 -0800)]
Camera2: update lens state tag specs
Change-Id: I630d45945f2806bde748f440c8203e08a70f59c9
Christopher Tate [Mon, 3 Feb 2014 20:35:01 +0000 (20:35 +0000)]
Merge "Introduce "IdleService" API to expose idle-time maintenance to apps"
Zhijun He [Mon, 3 Feb 2014 20:26:36 +0000 (20:26 +0000)]
Merge "Camera2: Update pixelArraySize and analog sensitivity tags"
Zhijun He [Mon, 3 Feb 2014 20:25:12 +0000 (12:25 -0800)]
Camera2: Update pixelArraySize and analog sensitivity tags
Change-Id: I07424afb44c70b5bcd600f1265efa969fdeac7e5
Geoff Mendal [Mon, 3 Feb 2014 19:08:19 +0000 (19:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Mon, 3 Feb 2014 18:50:53 +0000 (10:50 -0800)]
More battery history improvements.
- Better batching of history items. Fixed problems where empty
entries would be created because state toggles got lost.
- The string pool is now a HistoryTag pool, containing both a string
and uid; now an entry only requires 16 bits in the history data.
- Acquiring the first wake lock also now includes a HistoryTag
identifying who did the aquisition.
- Cleaned up printing of signal strengths and cell radio types.
- There was code that tried to allow you to add new history entries
while iterating the history... but these should never happen
together, so turned that into a failure... and fixed an issue
where we could leave the battery stats in a state where it
thinks it is continually iterating.
Change-Id: I1afa57ee2d66b186932c502dbdd633cdd4aed353
Geoff Mendal [Mon, 3 Feb 2014 18:51:48 +0000 (10:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I60c659282be6607e7510b5acfec18128ddbea404
Auto-generated-cl: translation import
John Spurlock [Mon, 3 Feb 2014 17:36:11 +0000 (17:36 +0000)]
am
be878d87: am
b6a4926c: am
647db9fa: am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
be878d8773cc841e5e144a6332c576c650e88126':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 17:27:11 +0000 (17:27 +0000)]
am
b6a4926c: am
647db9fa: am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
b6a4926c670244fbf7d7033f2a1b46da25b35d39':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 17:24:05 +0000 (17:24 +0000)]
am
647db9fa: am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
647db9fae37b36d99ce290acfae7b453f00ae5af':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 17:21:25 +0000 (17:21 +0000)]
am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
76ecd66a6d5f8ceaebbe9cd109948f01aff4cd27':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 17:18:37 +0000 (17:18 +0000)]
am
0196e561: Fix typo in ImageView.java
* commit '
0196e561f280e6cc361442036da277a630e68558':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 14:44:00 +0000 (09:44 -0500)]
Remove unused line from PhoneWindowManager.
Change-Id: I2b2dc1f08e32b2731409fcf192712ca0cc269f0a
John Spurlock [Mon, 3 Feb 2014 14:00:35 +0000 (09:00 -0500)]
Fix typo in ImageView.java
Change-Id: Iaa7b020f09c893a5fe006a8523686dd8b9a8f872
Alan Viverette [Sat, 1 Feb 2014 09:43:16 +0000 (01:43 -0800)]
Fix broken build in BridgeResources
Change-Id: Iec58a2acda6b9538bcb5974d3d5c45ea6e53eac5
ztenghui [Sat, 1 Feb 2014 01:17:55 +0000 (17:17 -0800)]
Fixing a bad bug when there is no real umbra
This fixed most of the issues when the light's Z postion is low.
Change-Id: If49afbf8aa90b1ce32fd628a62ed982a1a473da2
Christopher Tate [Mon, 19 Aug 2013 23:14:25 +0000 (16:14 -0700)]
Introduce "IdleService" API to expose idle-time maintenance to apps
When an application wishes to do low-priority background work when the
device is otherwise idle (e.g. in a desk dock overnight), it declares
a service in its manifest that requires this permission:
android:permission="android.permission.BIND_IDLE_SERVICE
to launch, and which publishes this intent filter:
<intent-filter>
<action android:name="android.service.idle.IdleService" />
</intent-filter>
This string is declared in the API as IdleService.SERVICE_INTERFACE.
The service must be implemented by extending the new "IdleService"
class, which provides the API through which the system will communicate
with the app.
IdleService declares three methods, two of which are lifecycle callbacks
to the service, and the third of which is for the service itself to
invoke when appropriate. The lifecycle callbacks are
public abstract boolean onIdleStart();
public abstract void onIdleStop();
The first of these is a notification to the service that an idle
maintenance interval has begun. The service can then spin off
whatever non-UI work it wishes. When the interval is over, or if
the OS determines that idle services should be shut down immediately,
the onIdleStop() method will be invoked. The service must shut down
any background processing immediately when this method is called.
Both of these methods must return immediately. However, the OS
holds a wakelock on the application's behalf for the entire period
between the onIdleStart() and onIdleStop() callbacks. This means
that for system-arbitrated idle-time operation, the application does
not need to do any of its own wakelock management, and does not need
to hold any wakelock permissions.
The third method in IdleService is
public final void finishIdle();
Calling this method notifies the OS that the application has finished
whatever idle-time operation it needed to perform, and the OS is thus
free to release the wakelock and return to normal operation (or to
allow other apps to run their own idle services).
Currently the idle window granted to each idle service is ten minutes.
The OS is rather conservative about when these services are run; low
battery or any user activity will suppress them, and the OS will not
choose to run them particularly often.
Idle services are granted their execution windows in round-robin
fashion.
Bug
9680213
Change-Id: Idd6f35940c938c31b94aa4269a67870abf7125b6
Kenny Root [Fri, 31 Jan 2014 23:07:24 +0000 (23:07 +0000)]
am
aa6ff54e: am
85ee57d1: am
c064a1b5: Merge "Remove DRLCertFactory"
* commit '
aa6ff54ef57936024e98d9f565afe9fff24df2e4':
Remove DRLCertFactory
Kenny Root [Fri, 31 Jan 2014 23:01:15 +0000 (23:01 +0000)]
am
85ee57d1: am
c064a1b5: Merge "Remove DRLCertFactory"
* commit '
85ee57d1ae73db6ac014d76d7be1b5d5e87eb89f':
Remove DRLCertFactory
Kenny Root [Fri, 31 Jan 2014 22:58:53 +0000 (14:58 -0800)]
am
c064a1b5: Merge "Remove DRLCertFactory"
* commit '
c064a1b5d9a68bb5513e6ed64a067ab822e98764':
Remove DRLCertFactory
Kenny Root [Fri, 31 Jan 2014 22:54:44 +0000 (22:54 +0000)]
Merge "Remove DRLCertFactory"
Kenny Root [Fri, 31 Jan 2014 22:10:01 +0000 (14:10 -0800)]
Remove DRLCertFactory
No longer needed since Conscrypt is the main provider.
Change-Id: Iee741ef376af2de52db79df07e96057438778bc6
Alan Viverette [Fri, 31 Jan 2014 21:07:51 +0000 (21:07 +0000)]
Merge "Revert "Cache display lists for Drawables""
Alan Viverette [Fri, 31 Jan 2014 21:05:23 +0000 (21:05 +0000)]
Merge "Allow specification of View theme override as a theme attribute"
Alan Viverette [Fri, 31 Jan 2014 21:04:38 +0000 (13:04 -0800)]
Revert "Cache display lists for Drawables"
This reverts commit
c062c7003f34999632fe4ad721dcd47cd71b2159.
Change-Id: I96d4f0482b927101f52140b667f4c38ffc8687f5
Alan Viverette [Fri, 31 Jan 2014 21:01:01 +0000 (21:01 +0000)]
Merge "Simplify GradientDrawable's use of ColorStateList"
Alan Viverette [Fri, 31 Jan 2014 20:58:43 +0000 (12:58 -0800)]
Simplify GradientDrawable's use of ColorStateList
BUG:
12816352
Change-Id: Icff432ee5d460ca733866185b8bf61fd50248cfc
Tim Murray [Tue, 17 Dec 2013 21:28:17 +0000 (13:28 -0800)]
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
John Spurlock [Fri, 31 Jan 2014 20:25:40 +0000 (20:25 +0000)]
am
47e276db: am
cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev
* commit '
47e276db2a938ca4ff9767cba28062b892e81629':
Update READ&WRITE_DREAM_STATE to signature|system.
John Spurlock [Fri, 31 Jan 2014 20:19:41 +0000 (20:19 +0000)]
am
cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev
* commit '
cbd156c1d574dfe5eced42ec640989ab7de7d5e7':
Update READ&WRITE_DREAM_STATE to signature|system.
John Spurlock [Fri, 31 Jan 2014 20:17:48 +0000 (20:17 +0000)]
Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev
Craig Mautner [Fri, 31 Jan 2014 19:32:18 +0000 (19:32 +0000)]
am
d5f1fcb7: am
56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev
* commit '
d5f1fcb7a4d6cc11b727bdf79fab7693a5dd7117':
Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
Craig Mautner [Fri, 31 Jan 2014 19:26:17 +0000 (19:26 +0000)]
am
56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev
* commit '
56bf2f670c800f569fc72102e79fd555b6102677':
Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
Craig Mautner [Fri, 31 Jan 2014 19:23:35 +0000 (19:23 +0000)]
Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev
Alan Viverette [Fri, 31 Jan 2014 19:22:24 +0000 (19:22 +0000)]
Merge "Improve encapsulation of Resources"
Craig Mautner [Sat, 25 Jan 2014 02:02:10 +0000 (18:02 -0800)]
Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
Fixes bug
12592453.
Change-Id: Ib64559727d59b3433c3753f9fda88329effc7e26
Chris Wren [Fri, 31 Jan 2014 19:19:23 +0000 (19:19 +0000)]
Merge "record the notification style"
Alan Viverette [Fri, 31 Jan 2014 19:07:29 +0000 (11:07 -0800)]
Improve encapsulation of Resources
Change-Id: Ic408915d2695ac8906231da1d2dc127f94bdd0cc
Tim Murray [Tue, 19 Nov 2013 20:45:54 +0000 (12:45 -0800)]
Convert Java/JNI to 64-bit, part 2.
This changes BaseObj to support 64-bit IDs. There are a few caveats:
1. Since it is deprecated, RSG will not support 64-bit.
2. Currently, methods that pass arrays of IDs to the driver are not supported in 64-bit. This will be fixed in a later CL.
bug
11332320
Change-Id: If0dbecc8b285e260f767e441e05088b6a1b749a2
Tim Murray [Fri, 15 Nov 2013 21:08:30 +0000 (13:08 -0800)]
Convert Java/JNI to 64-bit, part 1.
This converts context and device storage to use long instead of int.
bug
11332320
Change-Id: If93a5d78385d3004d5e709762b78bd1d3538088d
Jason Sams [Wed, 6 Nov 2013 23:08:07 +0000 (15:08 -0800)]
Add long/double read support.
Change-Id: I1957f7ac18262a3004a4adcb7c31055212e483c2
Jason Sams [Wed, 6 Nov 2013 19:22:02 +0000 (11:22 -0800)]
Use Object + type in place of specific array
Changed to avoid the explosion of entry points in the JNI layer.
Change-Id: I7d6cc565c8853b06560eb891fdd5e8acf05c9779
John Spurlock [Fri, 31 Jan 2014 19:14:19 +0000 (14:14 -0500)]
Update READ&WRITE_DREAM_STATE to signature|system.
Change-Id: Ic3c4c5445384712571e7a1188ed9e2ab6ceb4bde
Jason Sams [Thu, 10 Oct 2013 00:15:36 +0000 (17:15 -0700)]
Utility API for creating types.
Change-Id: I3263cb4440ef3a60cd418f0559b8c5638a9b8bf3
Jason Sams [Thu, 26 Sep 2013 19:13:20 +0000 (12:13 -0700)]
Remove old hidden API.
This was never shipped and long since replaced by ioReceive().
Change-Id: Ieba7fd4305c2c561cc36154c57414783e4bf502b
Jason Sams [Tue, 24 Sep 2013 22:18:52 +0000 (15:18 -0700)]
Remove hidden API setSurfaceTexture.
Change-Id: Ib6a3c5b84550932168f314375e74059507fc01ae
Chris Craik [Fri, 31 Jan 2014 18:57:24 +0000 (18:57 +0000)]
Merge "Simplify umbra calculation"
Chris Craik [Fri, 31 Jan 2014 18:56:40 +0000 (18:56 +0000)]
Merge "Add initial hidden outline APIs"
Chris Craik [Thu, 30 Jan 2014 23:43:56 +0000 (15:43 -0800)]
Simplify umbra calculation
Reuse pre-computed values
Change-Id: Ia7725be0ec3ac58af477fcb8de375f5faa05abf4
Chris Wren [Wed, 5 Jun 2013 19:05:57 +0000 (15:05 -0400)]
record the notification style
Bug:
10634902
Change-Id: I7d29f252367f4ab58e97a6ac8b0c6702f558e5cf
Narayan Kamath [Fri, 31 Jan 2014 17:12:42 +0000 (17:12 +0000)]
am
797b5adc: am
77a1986c: am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
797b5adcb4ead3c687db3d9fd831dff93760dd4a':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Fri, 31 Jan 2014 17:12:38 +0000 (17:12 +0000)]
am
d49babe5: (-s ours) am
9af95574: am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
d49babe50d61e0264a9f4fbf0b4e182cc56635db':
Change ResourceType cookies to int32_t.
Narayan Kamath [Fri, 31 Jan 2014 16:41:42 +0000 (16:41 +0000)]
am
ff62e966: am
149510e0: am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
ff62e966b60bb20dc7c3384485816b1e7bf06057':
Fixed cancel() not working correctly
Igor Murashkin [Fri, 31 Jan 2014 16:41:38 +0000 (16:41 +0000)]
am
ed5d7a6f: am
4463a4ef: am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
ed5d7a6f147c75c8af73328bdf816707b58afd90':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Narayan Kamath [Fri, 31 Jan 2014 16:29:23 +0000 (16:29 +0000)]
am
77a1986c: am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Fri, 31 Jan 2014 16:29:19 +0000 (16:29 +0000)]
am
9af95574: am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
Change ResourceType cookies to int32_t.
Narayan Kamath [Fri, 31 Jan 2014 16:29:16 +0000 (16:29 +0000)]
am
149510e0: am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
149510e010b46a445355a8d7fcdb8401125b92c3':
Fixed cancel() not working correctly
Igor Murashkin [Fri, 31 Jan 2014 16:29:06 +0000 (16:29 +0000)]
am
4463a4ef: am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
4463a4ef26b2eb62fae74568193fd07e97dedd4d':
EGL14.eglCreateWindowSurface should set producerControlledByApp
George Mount [Fri, 31 Jan 2014 00:56:09 +0000 (00:56 +0000)]
Revert "Add Path trimming."
Bug
12489442
This reverts commit
7fe03a267e6edb65142444765ce29ad5ff126052.
Change-Id: Idf434d79683e170364838388c7933a8591f7f4d3
Narayan Kamath [Fri, 31 Jan 2014 15:30:21 +0000 (07:30 -0800)]
am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
49b7ba4dbc0b4984fc466bb98e9cfa40650db85b':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Fri, 31 Jan 2014 15:30:18 +0000 (07:30 -0800)]
am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
1cadc07dd1e3711fb1e57548038e3026682c5ef8':
Change ResourceType cookies to int32_t.
Narayan Kamath [Fri, 31 Jan 2014 15:30:15 +0000 (07:30 -0800)]
am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
b9f960e094d53440be5c7e8759a74dbb0ab57317':
Fixed cancel() not working correctly