OSDN Git Service
Maxim Siniavine [Wed, 5 Feb 2014 02:19:08 +0000 (18:19 -0800)]
Using large file for download manager test.
This should decrease the chance of the file being downloaded too quickly and
confusing the test.
Change-Id: I8f4debbb51798162493d6a8005e1aa142738dbd4
George Mount [Wed, 5 Feb 2014 00:23:03 +0000 (00:23 +0000)]
Merge "Cross-Activity Scene transition API."
George Mount [Fri, 13 Dec 2013 21:35:36 +0000 (13:35 -0800)]
Cross-Activity Scene transition API.
First pass at API for cross-Activity Scene transitions.
Remaining work:
Transition back
Automatically capture hero element info
Transfer of surface texture to synchronize between Activities
Possibly use scene names to indicate preferred transition
Change-Id: I59d07de1fae694a46b92b1c82525daa301ec1377
Craig Mautner [Tue, 4 Feb 2014 23:55:19 +0000 (15:55 -0800)]
resolved conflicts for merge of
32360147 to master
Change-Id: I97cc95f66df50006469f8debd286966cc21edb60
Craig Mautner [Tue, 4 Feb 2014 23:38:28 +0000 (23:38 +0000)]
am
df88d730: Add IIntentSender to ActivityContainer.startActivity
* commit '
df88d73092c62a1a3cd2b2056ca63ae2e70cc238':
Add IIntentSender to ActivityContainer.startActivity
Craig Mautner [Mon, 27 Jan 2014 17:21:32 +0000 (09:21 -0800)]
Add IIntentSender to ActivityContainer.startActivity
PendingIntents and IntentSenders can now be launched. Still does not
work once the host activity has been paused and resumed.
Window manager TaskStacks now exist independently of Displays and app
windows persist after Displays are removed below them. Attaching the
stack to a new Display does not yet restore the windows to it.
Fixes bug
12747909.
Change-Id: I509007ee23fda400b353f483cf6ecce08177763b
Alan Viverette [Tue, 4 Feb 2014 22:19:06 +0000 (14:19 -0800)]
Check for null display list
BUG:
12764584
Change-Id: I071aa0d9bc4f4ac353a5d0f534cf7c44964d4bf0
Alan Viverette [Tue, 4 Feb 2014 22:05:26 +0000 (22:05 +0000)]
Merge "Make background projection a property of View"
Ruben Brunk [Tue, 4 Feb 2014 21:01:19 +0000 (21:01 +0000)]
Merge "camera3: Update maxRegions tag."
Alan Viverette [Tue, 4 Feb 2014 19:37:41 +0000 (19:37 +0000)]
Merge "Update APIs from RotateDrawable change"
Alan Viverette [Tue, 4 Feb 2014 19:37:05 +0000 (11:37 -0800)]
Update APIs from RotateDrawable change
Change-Id: I89b1ef79360231912e16d60b20c2a52d4dc2c94e
Scott Main [Tue, 4 Feb 2014 19:33:26 +0000 (19:33 +0000)]
am
35a25455: am
70f908d7: am
3e80914d: am
eea15edc: am
749120f3: dashbaord update for feb \'14
* commit '
35a254554787196cf835536cc3bc28f9ee890af4':
dashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 19:25:04 +0000 (19:25 +0000)]
am
70f908d7: am
3e80914d: am
eea15edc: am
749120f3: dashbaord update for feb \'14
* commit '
70f908d7af916bf0e5b6af2913752dca431b837f':
dashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 19:22:02 +0000 (19:22 +0000)]
am
3e80914d: am
eea15edc: am
749120f3: dashbaord update for feb \'14
* commit '
3e80914d1683d1641fd6a01f14f126452e17f5c7':
dashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 19:19:38 +0000 (19:19 +0000)]
am
eea15edc: am
749120f3: dashbaord update for feb \'14
* commit '
eea15edcd47e6830dd6cdecb2c0b1e26eba0e6e3':
dashbaord update for feb '14
Alan Viverette [Tue, 4 Feb 2014 19:19:18 +0000 (19:19 +0000)]
Merge "Clean up RotateDrawable, add getters and setters for XML properties"
Alan Viverette [Tue, 4 Feb 2014 19:17:32 +0000 (11:17 -0800)]
Make background projection a property of View
BUG:
12764584
Change-Id: Id80afd6d26c814d3fd551f6690d4a88c441b0b9f
Scott Main [Tue, 4 Feb 2014 19:15:36 +0000 (19:15 +0000)]
am
749120f3: dashbaord update for feb \'14
* commit '
749120f39bdac49a96771d06d25b7f9edf70be67':
dashbaord update for feb '14
Glenn Kasten [Tue, 4 Feb 2014 19:02:57 +0000 (19:02 +0000)]
am
9d2ad121: am
830d4ffc: am
74dc4bd0: am
983a9381: am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
9d2ad12181a1793686d7cdbdf11b3aa5a92030c4':
Add adb over Wi-Fi
Adam Lesinski [Tue, 4 Feb 2014 19:00:03 +0000 (11:00 -0800)]
resolved conflicts for merge of
1b5b60d6 to master
Change-Id: I2b713a55fcdf02c01afa99f175bf14248f210460
Scott Main [Tue, 4 Feb 2014 18:57:47 +0000 (10:57 -0800)]
dashbaord update for feb '14
Change-Id: I7ed66b6603f40cbbf3ffcc4824894777e3f8add2
Glenn Kasten [Tue, 4 Feb 2014 18:40:09 +0000 (18:40 +0000)]
am
830d4ffc: am
74dc4bd0: am
983a9381: am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
830d4ffcb79fd2a676942a87d9fe661725d745f3':
Add adb over Wi-Fi
Adam Lesinski [Tue, 4 Feb 2014 18:36:10 +0000 (18:36 +0000)]
am
203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
* commit '
203356a34a82bfc759be02dfa1caa4529dce0732':
Add support for multiple asset dirs (-A)
Glenn Kasten [Tue, 4 Feb 2014 18:35:30 +0000 (18:35 +0000)]
am
74dc4bd0: am
983a9381: am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
74dc4bd09e0dce4855c15cae31dcdd42b05d3532':
Add adb over Wi-Fi
Glenn Kasten [Tue, 4 Feb 2014 18:32:10 +0000 (18:32 +0000)]
am
983a9381: am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
983a9381b87519ddd1c6e12e44a8762dc805894a':
Add adb over Wi-Fi
Adam Lesinski [Tue, 4 Feb 2014 18:31:23 +0000 (18:31 +0000)]
Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
Glenn Kasten [Tue, 4 Feb 2014 18:29:17 +0000 (18:29 +0000)]
am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
11263b24230a0d5db363d76ad199d692bcff1b35':
Add adb over Wi-Fi
Glenn Kasten [Tue, 4 Feb 2014 18:27:11 +0000 (18:27 +0000)]
Merge "Add adb over Wi-Fi" into klp-docs
Ricardo Cervera [Tue, 4 Feb 2014 17:35:37 +0000 (17:35 +0000)]
am
1441acdd: am
6dea46b2: am
f7c12817: am
b180bff5: am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
1441acdd6d0f08b00493478386e1b74df47e243b':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:29:40 +0000 (17:29 +0000)]
am
6dea46b2: am
f7c12817: am
b180bff5: am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
6dea46b2e567f614244100f542dce04e44c26bee':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:26:58 +0000 (17:26 +0000)]
am
f7c12817: am
b180bff5: am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
f7c12817dc700a5e3d9e4dd3de6b1b50688a4129':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:24:28 +0000 (17:24 +0000)]
am
b180bff5: am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
b180bff575b25ab6b692327a3be244310fd90c5e':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:21:18 +0000 (17:21 +0000)]
am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
ccec0906bd358ffa9fbac8f8c882f582c43b6092':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:18:59 +0000 (17:18 +0000)]
Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
Scott Main [Tue, 4 Feb 2014 01:07:27 +0000 (17:07 -0800)]
remove samples page under tools. redirect in separate cl.
bug:
12878293
Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d
Conflicts:
docs/html/tools/samples/index.jd
Scott Main [Tue, 4 Feb 2014 15:39:46 +0000 (15:39 +0000)]
am
e4cf2729: (-s ours) am
5ae21db1: am
a7f84f3b: am
28a828fa: am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
e4cf272967d6cbfc8e9e7c5c2756651e306a2755':
remove samples page under tools. redirect in separate cl. bug:
12878293
Alan Viverette [Tue, 4 Feb 2014 02:40:20 +0000 (18:40 -0800)]
Add APIs for obtaining themed Drawable from Theme, Context
BUG:
12611005
Change-Id: Ic0057be4e4c2d0c61ce02a019b3f7d0625e3a016
Scott Main [Tue, 4 Feb 2014 02:11:48 +0000 (02:11 +0000)]
am
5ae21db1: am
a7f84f3b: am
28a828fa: am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
5ae21db11291cca5ea6fe9f8b2b772deca438e5b':
remove samples page under tools. redirect in separate cl. bug:
12878293
Alan Viverette [Tue, 4 Feb 2014 02:08:34 +0000 (18:08 -0800)]
Clean up RotateDrawable, add getters and setters for XML properties
Change-Id: I1bb174e981fb6df910fee3a9d596c0249282928c
Scott Main [Tue, 4 Feb 2014 02:08:28 +0000 (02:08 +0000)]
am
a7f84f3b: am
28a828fa: am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
a7f84f3bd4582ce2124891db14fbc2ac52548cf8':
remove samples page under tools. redirect in separate cl. bug:
12878293
Scott Main [Tue, 4 Feb 2014 02:06:01 +0000 (02:06 +0000)]
am
28a828fa: am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
28a828fa198122a13d053eae2e46f18487818e91':
remove samples page under tools. redirect in separate cl. bug:
12878293
Scott Main [Tue, 4 Feb 2014 02:01:33 +0000 (02:01 +0000)]
am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
56783a742458968a6ec5daf4d9e7a72f755f5ce5':
remove samples page under tools. redirect in separate cl. bug:
12878293
Ruben Brunk [Tue, 4 Feb 2014 01:54:24 +0000 (17:54 -0800)]
camera3: Update maxRegions tag.
Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01
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
Ricardo Cervera [Tue, 4 Feb 2014 01:08:31 +0000 (17:08 -0800)]
docs: Added note on multiple build.gradle files. Bug:
12870006
Change-Id: I44b5152dc753893d3b9f0a0441066a530e5a30f0
Review: http://quixote.mtv.corp.google.com:8006/google/play-services/setup.html
Scott Main [Tue, 4 Feb 2014 01:07:27 +0000 (17:07 -0800)]
remove samples page under tools. redirect in separate cl.
bug:
12878293
Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d
Glenn Kasten [Mon, 3 Feb 2014 22:01:25 +0000 (14:01 -0800)]
Add adb over Wi-Fi
Change-Id: I6ada6c88e3a006abc4685b66d6decd1bec175941
Andy McFadden [Tue, 4 Feb 2014 00:39:15 +0000 (00:39 +0000)]
Merge "Remove setFlags()"
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.
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."
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.