OSDN Git Service
Ruben Brunk [Tue, 4 Feb 2014 02:01:40 +0000 (18:01 -0800)]
am
8cff1a37: Merge "camera3: Update awbRegions tag."
* commit '
8cff1a370e8d89c0a977b82cd8730ab791866808':
camera3: Update awbRegions tag.
Ruben Brunk [Tue, 4 Feb 2014 01:18:07 +0000 (01:18 +0000)]
Merge "camera3: Update awbRegions tag."
Ruben Brunk [Tue, 4 Feb 2014 01:14:33 +0000 (17:14 -0800)]
camera3: Update awbRegions tag.
Change-Id: I85053b61fae4e360eff9143afc021ad60971f3b6
Andy McFadden [Tue, 4 Feb 2014 00:42:11 +0000 (16:42 -0800)]
am
01127579: Merge "Remove setFlags()"
* commit '
0112757995debe0d4e3527f9f8299380b0561017':
Remove setFlags()
Andy McFadden [Tue, 4 Feb 2014 00:39:15 +0000 (00:39 +0000)]
Merge "Remove setFlags()"
Tim Murray [Mon, 3 Feb 2014 23:33:46 +0000 (15:33 -0800)]
am
6faecbb8: am
fd71ddfd: (-s ours) am
6ceac9f0: (-s ours) am
f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
* commit '
6faecbb8d2b9f99d88913a0a7af592e193e8a8ae':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Tim Murray [Mon, 3 Feb 2014 23:33:43 +0000 (15:33 -0800)]
am
43098617: am
5d331c7c: am
b1bec0d9: am
3fb6feac: Merge "Check that bound allocations are 1D"
* commit '
430986178dfcc46d84bafd8ad39a16eba30844fd':
Check that bound allocations are 1D
Tim Murray [Mon, 3 Feb 2014 23:33:38 +0000 (15:33 -0800)]
am
f593000e: am
64788f1b: am
67d9e0be: am
0cc37f4c: Merge "Fix debug context."
* commit '
f593000eac5ace1538dca3353cffea25d01f26bb':
Fix debug context.
Tim Murray [Mon, 3 Feb 2014 23:33:35 +0000 (15:33 -0800)]
am
63aec6ac: am
4cd7f2d8: am
42e4aee5: am
0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
* commit '
63aec6acbf7b645cf193c5c53e29db174dfb8628':
Enable asynchronous destruction of BaseObjs.
Tim Murray [Mon, 3 Feb 2014 23:33:32 +0000 (15:33 -0800)]
am
2ee23f3d: am
95b3568d: am
42955bab: am
d8b4dd95: Merge "Fix most logging macros for context pointers."
* commit '
2ee23f3dbf5c32d3e3c45bd3740237443acd7152':
Fix most logging macros for context pointers.
Tim Murray [Mon, 3 Feb 2014 23:33:23 +0000 (15:33 -0800)]
am
02eefa0f: am
d642dbd8: am
d39e19eb: am
351879df: Merge "Fix getBytesSize for YUV allocations."
* commit '
02eefa0f4a6e19d10eecd6ec5d368d5e7b162161':
Fix getBytesSize for YUV allocations.
Tim Murray [Mon, 3 Feb 2014 23:33:20 +0000 (15:33 -0800)]
am
6be5817d: am
2905039d: am
16e9362e: am
8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '
6be5817d4201750c60547cfd61b26e4ef07a7c4f':
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Tim Murray [Mon, 3 Feb 2014 23:33:17 +0000 (15:33 -0800)]
am
da1192ae: am
47f295e8: (-s ours) am
8df3ea66: am
b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit '
da1192ae311c3e02202ed1960e4076352ecb45c9':
Convert Java/JNI to 64-bit, part 2.
Tim Murray [Mon, 3 Feb 2014 23:33:14 +0000 (15:33 -0800)]
am
7d02a5fc: am
041c77ac: (-s ours) am
72d637e2: am
e22e268e: Merge changes If93a5d78,I1957f7ac
* commit '
7d02a5fcb73e56a6751642d914cc0bfca5143aae':
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
Tim Murray [Mon, 3 Feb 2014 23:33:12 +0000 (15:33 -0800)]
am
4e634bd3: am
923da98f: (-s ours) am
bccee732: am
61eb6b55: Merge "Use Object + type in place of specific array"
* commit '
4e634bd31321471eb1f2065d3936cca668ab292c':
Use Object + type in place of specific array
Alan Viverette [Mon, 3 Feb 2014 23:33:09 +0000 (15:33 -0800)]
am
e5aea3bb: Merge "Fix ordering of dimension caching during ImageView.setResource()"
* commit '
e5aea3bb0c88619bea61569fc9f824741542138d':
Fix ordering of dimension caching during ImageView.setResource()
Tim Murray [Mon, 3 Feb 2014 23:33:06 +0000 (15:33 -0800)]
am
e0abb661: am
4e5e654e: (-s ours) am
69914882: am
e559d7ee: Merge "Utility API for creating types."
* commit '
e0abb6616736b69437b0a9b39eeb1f883c6c0db9':
Utility API for creating types.
Tim Murray [Mon, 3 Feb 2014 23:33:03 +0000 (15:33 -0800)]
am
e32f9988: am
b0a79d35: am
271c3b74: am
b1c1518e: Merge "Remove old hidden API."
* commit '
e32f9988be49266436f4eb3975a4d214bd83ea7a':
Remove old hidden API.
Tim Murray [Mon, 3 Feb 2014 23:33:00 +0000 (15:33 -0800)]
am
693265ae: am
a392cdf3: am
9bad32c3: am
aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit '
693265ae557594c04ad51bbc20de7674835c108c':
Remove hidden API setSurfaceTexture.
Igor Murashkin [Mon, 3 Feb 2014 23:32:57 +0000 (15:32 -0800)]
am
eff19d36: Merge "camera2: Revise android.sensor.maxFrameDuration definition"
* commit '
eff19d36fcbdcf3d554b961905a54e4a01c61629':
camera2: Revise android.sensor.maxFrameDuration definition
ztenghui [Mon, 3 Feb 2014 23:32:53 +0000 (15:32 -0800)]
am
a989cb29: Merge "Fixing a bad bug when there is no real umbra"
* commit '
a989cb29c35149b35bf8c332ba39d7167bd95d6b':
Fixing a bad bug when there is no real umbra
John Spurlock [Mon, 3 Feb 2014 23:32:50 +0000 (15:32 -0800)]
am
3aad4f28: Merge "Remove unused line from PhoneWindowManager."
* commit '
3aad4f28376698c0dce78a7d08af4a616c3d5c04':
Remove unused line from PhoneWindowManager.
Dianne Hackborn [Mon, 3 Feb 2014 23:32:47 +0000 (15:32 -0800)]
am
e8d916c0: Merge "More battery history improvements."
* commit '
e8d916c04c3fb40667fbacb9b6fd1c775ce00b42':
More battery history improvements.
Zhijun He [Mon, 3 Feb 2014 23:32:43 +0000 (15:32 -0800)]
am
6c90d439: Merge "Camera2: Update sceneFlicker tag spec"
* commit '
6c90d439758add5981dee67674d0aafc5208f427':
Camera2: Update sceneFlicker tag spec
Zhijun He [Mon, 3 Feb 2014 23:32:40 +0000 (15:32 -0800)]
am
37bac0ae: Merge "Camera2: update lens state tag specs"
* commit '
37bac0aecbf656f0d8b1f0145fbbb30743c59e9b':
Camera2: update lens state tag specs
Christopher Tate [Mon, 3 Feb 2014 23:32:36 +0000 (15:32 -0800)]
am
31b4834b: Merge "Introduce "IdleService" API to expose idle-time maintenance to apps"
* commit '
31b4834b6d5eb1e5156950930b69221819a84766':
Introduce "IdleService" API to expose idle-time maintenance to apps
Zhijun He [Mon, 3 Feb 2014 23:32:33 +0000 (15:32 -0800)]
am
ef83738d: Merge "Camera2: Update pixelArraySize and analog sensitivity tags"
* commit '
ef83738da65a79defc6dc4f12433b327d670127e':
Camera2: Update pixelArraySize and analog sensitivity tags
Geoff Mendal [Mon, 3 Feb 2014 23:32:31 +0000 (15:32 -0800)]
am
4c2315d1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
4c2315d10c462cbebe098cae656675a46e8cfe3d':
Import translations. DO NOT MERGE
John Spurlock [Mon, 3 Feb 2014 23:32:26 +0000 (15:32 -0800)]
am
53a470af: am
be878d87: am
b6a4926c: am
647db9fa: am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
53a470af6574dea27a2701e763e6c6b10be75af7':
Fix typo in ImageView.java
Alan Viverette [Mon, 3 Feb 2014 23:32:18 +0000 (15:32 -0800)]
am
edc4664d: Fix broken build in BridgeResources
* commit '
edc4664d60af1f124d05f0a2b6ba58b837630f51':
Fix broken build in BridgeResources
Kenny Root [Mon, 3 Feb 2014 23:32:15 +0000 (15:32 -0800)]
am
faa1057d: am
aa6ff54e: am
85ee57d1: am
c064a1b5: Merge "Remove DRLCertFactory"
* commit '
faa1057d4c6cc3941e42d93399fa9cf511c09370':
Remove DRLCertFactory
Alan Viverette [Mon, 3 Feb 2014 23:32:10 +0000 (15:32 -0800)]
am
c8577b38: Merge "Revert "Cache display lists for Drawables""
* commit '
c8577b384a0e0e04eed6d05660e013b5db47b7f2':
Revert "Cache display lists for Drawables"
Alan Viverette [Mon, 3 Feb 2014 23:32:07 +0000 (15:32 -0800)]
am
fe0ea8c2: Merge "Allow specification of View theme override as a theme attribute"
* commit '
fe0ea8c21fe6f6cbaa0594295ec371efca4af824':
Allow specification of View theme override as a theme attribute
Alan Viverette [Mon, 3 Feb 2014 23:32:04 +0000 (15:32 -0800)]
am
14a11eee: Merge "Simplify GradientDrawable\'s use of ColorStateList"
* commit '
14a11eeeff3efd5458754785a7c48bbcf68122ef':
Simplify GradientDrawable's use of ColorStateList
John Spurlock [Mon, 3 Feb 2014 23:32:01 +0000 (15:32 -0800)]
am
17b79985: am
47e276db: am
cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev
* commit '
17b79985f4e5e6b696320e29f665adb796a2aef5':
Update READ&WRITE_DREAM_STATE to signature|system.
Craig Mautner [Mon, 3 Feb 2014 23:31:57 +0000 (15:31 -0800)]
am
624e98f5: am
d5f1fcb7: am
56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev
* commit '
624e98f53962377f00104a50d9fc8e3044cbcd79':
Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
Alan Viverette [Mon, 3 Feb 2014 23:31:54 +0000 (15:31 -0800)]
am
8b725dcb: Merge "Improve encapsulation of Resources"
* commit '
8b725dcbe15761514eea680c119bcc83a290c0f0':
Improve encapsulation of Resources
Chris Wren [Mon, 3 Feb 2014 23:31:50 +0000 (15:31 -0800)]
am
5c57c44e: Merge "record the notification style"
* commit '
5c57c44eea02ec579dc24cedfe417d487ba71fce':
record the notification style
Chris Craik [Mon, 3 Feb 2014 23:31:47 +0000 (15:31 -0800)]
am
494db9e4: Merge "Simplify umbra calculation"
* commit '
494db9e4bbf206025336aee9dfece93639686e44':
Simplify umbra calculation
Chris Craik [Mon, 3 Feb 2014 23:31:44 +0000 (15:31 -0800)]
am
1d89563f: Merge "Add initial hidden outline APIs"
* commit '
1d89563ff8f5afd77457ef58489a234f490b480c':
Add initial hidden outline APIs
Narayan Kamath [Mon, 3 Feb 2014 23:31:40 +0000 (15:31 -0800)]
am
90b8eaa6: am
797b5adc: am
77a1986c: am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
90b8eaa68bda6beaf2ff886c3ed642e7050e3ff6':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Mon, 3 Feb 2014 23:31:38 +0000 (15:31 -0800)]
am
8396b56e: am
d49babe5: (-s ours) am
9af95574: am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
8396b56e0a12d97c7933afca3813c356c18a8f38':
Change ResourceType cookies to int32_t.
Narayan Kamath [Mon, 3 Feb 2014 23:31:35 +0000 (15:31 -0800)]
am
fd6a44d0: am
ff62e966: am
149510e0: am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
fd6a44d0b5b6bcfc606abf23520b316c4bf36fc4':
Fixed cancel() not working correctly
Igor Murashkin [Mon, 3 Feb 2014 23:31:32 +0000 (15:31 -0800)]
am
5ec133b9: am
ed5d7a6f: am
4463a4ef: am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
5ec133b9a0949cda92c5c287169aba86ad615065':
EGL14.eglCreateWindowSurface should set producerControlledByApp
George Mount [Mon, 3 Feb 2014 23:31:28 +0000 (15:31 -0800)]
am
56f57ccb: Revert "Add Path trimming."
* commit '
56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334':
Revert "Add Path trimming."
Zhijun He [Mon, 3 Feb 2014 23:31:23 +0000 (15:31 -0800)]
am
10586ad2: am
4f840dd1: am
5901ddeb: am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
10586ad2a6996b8f9f84ed47a65ccc2d883fc19f':
Narayan Kamath [Mon, 3 Feb 2014 23:31:19 +0000 (15:31 -0800)]
am
b9fd12ac: am
dfd1aa43: resolved conflicts for merge of
2cd0563c to klp-modular-dev-plus-aosp
* commit '
b9fd12ac53a35800753d54c4c0a825c261267c29':
Narayan Kamath [Mon, 3 Feb 2014 23:31:14 +0000 (15:31 -0800)]
am
3a5e4705: am
5cdbac1e: (-s ours) am
70986e19: am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
3a5e470553a1a42647850b7c642f96961c2e4587':
Narayan Kamath [Mon, 3 Feb 2014 23:31:10 +0000 (15:31 -0800)]
am
13701e48: am
133c9649: am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
13701e4822d15e67bca1919ea1317312908f0bea':
Tim Murray [Mon, 3 Feb 2014 23:20:03 +0000 (23:20 +0000)]
am
fd71ddfd: (-s ours) am
6ceac9f0: (-s ours) am
f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
* commit '
fd71ddfd4378de331e231fbe22beb92f1efcd196':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Tim Murray [Mon, 3 Feb 2014 23:19:59 +0000 (23:19 +0000)]
am
5d331c7c: am
b1bec0d9: am
3fb6feac: Merge "Check that bound allocations are 1D"
* commit '
5d331c7c89d2ae7254c06f188cd02f91cd467f45':
Check that bound allocations are 1D
Tim Murray [Mon, 3 Feb 2014 23:19:54 +0000 (23:19 +0000)]
am
64788f1b: am
67d9e0be: am
0cc37f4c: Merge "Fix debug context."
* commit '
64788f1b6857c87a14e67044f51c2405195b407c':
Fix debug context.
Tim Murray [Mon, 3 Feb 2014 23:19:50 +0000 (23:19 +0000)]
am
4cd7f2d8: am
42e4aee5: am
0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
* commit '
4cd7f2d8c745977d3b12fdb26a13a1373832c6b8':
Enable asynchronous destruction of BaseObjs.
Tim Murray [Mon, 3 Feb 2014 23:19:46 +0000 (23:19 +0000)]
am
95b3568d: am
42955bab: am
d8b4dd95: Merge "Fix most logging macros for context pointers."
* commit '
95b3568d38c65f556a59aa6e8e35c3e8ef14c356':
Fix most logging macros for context pointers.
Tim Murray [Mon, 3 Feb 2014 23:19:43 +0000 (23:19 +0000)]
am
d642dbd8: am
d39e19eb: am
351879df: Merge "Fix getBytesSize for YUV allocations."
* commit '
d642dbd891ff5a9955de15a5f743ff0bf4baa9a8':
Fix getBytesSize for YUV allocations.
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.
Evan Charlton [Mon, 3 Feb 2014 22:58:21 +0000 (14:58 -0800)]
resolved conflicts for merge
54b100ce
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:26 +0000 (22:45 +0000)]
am
6ceac9f0: (-s ours) am
f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
* commit '
6ceac9f099b0ef7ca29351bbefa128df8101b5c2':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Tim Murray [Mon, 3 Feb 2014 22:45:23 +0000 (22:45 +0000)]
am
b1bec0d9: am
3fb6feac: Merge "Check that bound allocations are 1D"
* commit '
b1bec0d916c00c7ceb09c691f1e5977909ba698d':
Check that bound allocations are 1D
Tim Murray [Mon, 3 Feb 2014 22:45:20 +0000 (22:45 +0000)]
am
67d9e0be: am
0cc37f4c: Merge "Fix debug context."
* commit '
67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb':
Fix debug context.
Tim Murray [Mon, 3 Feb 2014 22:45:11 +0000 (22:45 +0000)]
am
42e4aee5: am
0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
* commit '
42e4aee598d2eceab6fc20fc9801b5c2fbf2e50d':
Enable asynchronous destruction of BaseObjs.
Tim Murray [Mon, 3 Feb 2014 22:45:08 +0000 (22:45 +0000)]
am
42955bab: am
d8b4dd95: Merge "Fix most logging macros for context pointers."
* commit '
42955bab2a275f3ea22d5a50b556cec88697a573':
Fix most logging macros for context pointers.
Tim Murray [Mon, 3 Feb 2014 22:45:05 +0000 (22:45 +0000)]
am
d39e19eb: am
351879df: Merge "Fix getBytesSize for YUV allocations."
* commit '
d39e19eb8af54683d03ae955a5a58fea48a58754':
Fix getBytesSize for YUV allocations.
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:42 +0000 (14:41 -0800)]
am
f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
* commit '
f5294ed57cf388973a1db29b062b1577966f90d1':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Tim Murray [Mon, 3 Feb 2014 22:41:39 +0000 (14:41 -0800)]
am
3fb6feac: Merge "Check that bound allocations are 1D"
* commit '
3fb6feacc62e1021c705b53d46e915ecf50582d2':
Check that bound allocations are 1D
Tim Murray [Mon, 3 Feb 2014 22:41:30 +0000 (14:41 -0800)]
am
0cc37f4c: Merge "Fix debug context."
* commit '
0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
Fix debug context.
Tim Murray [Mon, 3 Feb 2014 22:41:27 +0000 (14:41 -0800)]
am
0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
* commit '
0539b7b4116622d33c91dbaa9a3040c7a3a703d6':
Enable asynchronous destruction of BaseObjs.
Tim Murray [Mon, 3 Feb 2014 22:41:24 +0000 (14:41 -0800)]
am
d8b4dd95: Merge "Fix most logging macros for context pointers."
* commit '
d8b4dd9555e987df92206562061080b327598f41':
Fix most logging macros for context pointers.
Tim Murray [Mon, 3 Feb 2014 22:41:21 +0000 (14:41 -0800)]
am
351879df: Merge "Fix getBytesSize for YUV allocations."
* commit '
351879df3aff02987a6f4c4485bf004a96fcb150':
Fix getBytesSize for YUV allocations.
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:37:12 +0000 (22:37 +0000)]
Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
Tim Murray [Mon, 3 Feb 2014 22:37:11 +0000 (22:37 +0000)]
Merge "Check that bound allocations are 1D"
Tim Murray [Mon, 3 Feb 2014 22:37:06 +0000 (22:37 +0000)]
Merge "Fix debug context."
Tim Murray [Mon, 3 Feb 2014 22:37:00 +0000 (22:37 +0000)]
Merge "Enable asynchronous destruction of BaseObjs."
Tim Murray [Mon, 3 Feb 2014 22:36:54 +0000 (22:36 +0000)]
Merge "Fix most logging macros for context pointers."
Tim Murray [Mon, 3 Feb 2014 22:36:53 +0000 (22:36 +0000)]
Merge "Fix getBytesSize for YUV allocations."
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."