Tim Murray
fd71ddfd43
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.
2014-02-03 22:45:26 +00:00
Tim Murray
5d331c7c89
am b1bec0d9: am 3fb6feac: Merge "Check that bound allocations are 1D"
...
* commit 'b1bec0d916c00c7ceb09c691f1e5977909ba698d':
Check that bound allocations are 1D
2014-02-03 22:45:23 +00:00
Tim Murray
64788f1b68
am 67d9e0be: am 0cc37f4c: Merge "Fix debug context."
...
* commit '67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb':
Fix debug context.
2014-02-03 22:45:20 +00:00
Tim Murray
4cd7f2d8c7
am 42e4aee5: am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
...
* commit '42e4aee598d2eceab6fc20fc9801b5c2fbf2e50d':
Enable asynchronous destruction of BaseObjs.
2014-02-03 22:45:11 +00:00
Tim Murray
95b3568d38
am 42955bab: am d8b4dd95: Merge "Fix most logging macros for context pointers."
...
* commit '42955bab2a275f3ea22d5a50b556cec88697a573':
Fix most logging macros for context pointers.
2014-02-03 22:45:08 +00:00
Tim Murray
d642dbd891
am d39e19eb: am 351879df: Merge "Fix getBytesSize for YUV allocations."
...
* commit 'd39e19eb8af54683d03ae955a5a58fea48a58754':
Fix getBytesSize for YUV allocations.
2014-02-03 22:45:05 +00:00
Tim Murray
2905039d52
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.
2014-02-03 22:45:02 +00:00
Tim Murray
47f295e8cb
am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
...
* commit '8df3ea66994e96d72040c44099dd2d74ba15ec67':
Convert Java/JNI to 64-bit, part 2.
2014-02-03 22:44:58 +00:00
Tim Murray
041c77ac44
am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac
...
* commit '72d637e297a143e5b18c8e8f4eb85695ed6b10f1':
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
2014-02-03 22:44:54 +00:00
Tim Murray
923da98f79
am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array"
...
* commit 'bccee732b53d06c0e983b3f325e0d9ad889de134':
Use Object + type in place of specific array
2014-02-03 22:44:51 +00:00
Tim Murray
4e5e654e7a
am 69914882: am e559d7ee: Merge "Utility API for creating types."
...
* commit '69914882509b8ad81c23eadd1ebae53fb532042b':
Utility API for creating types.
2014-02-03 22:44:47 +00:00
Tim Murray
b0a79d3592
am 271c3b74: am b1c1518e: Merge "Remove old hidden API."
...
* commit '271c3b7499f53f6e7e168d68910efda5cc19f5fd':
Remove old hidden API.
2014-02-03 22:44:44 +00:00
Tim Murray
a392cdf375
am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture."
...
* commit '9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
Remove hidden API setSurfaceTexture.
2014-02-03 22:44:39 +00:00
Tim Murray
6ceac9f099
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.
2014-02-03 14:41:42 -08:00
Tim Murray
b1bec0d916
am 3fb6feac: Merge "Check that bound allocations are 1D"
...
* commit '3fb6feacc62e1021c705b53d46e915ecf50582d2':
Check that bound allocations are 1D
2014-02-03 14:41:39 -08:00
Tim Murray
67d9e0be8e
am 0cc37f4c: Merge "Fix debug context."
...
* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
Fix debug context.
2014-02-03 14:41:30 -08:00
Tim Murray
42e4aee598
am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
...
* commit '0539b7b4116622d33c91dbaa9a3040c7a3a703d6':
Enable asynchronous destruction of BaseObjs.
2014-02-03 14:41:27 -08:00
Tim Murray
42955bab2a
am d8b4dd95: Merge "Fix most logging macros for context pointers."
...
* commit 'd8b4dd9555e987df92206562061080b327598f41':
Fix most logging macros for context pointers.
2014-02-03 14:41:24 -08:00
Tim Murray
d39e19eb8a
am 351879df: Merge "Fix getBytesSize for YUV allocations."
...
* commit '351879df3aff02987a6f4c4485bf004a96fcb150':
Fix getBytesSize for YUV allocations.
2014-02-03 14:41:21 -08:00
Tim Murray
16e9362e5f
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.
2014-02-03 14:41:17 -08:00
Tim Murray
8df3ea6699
am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
...
* commit 'b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9':
Convert Java/JNI to 64-bit, part 2.
2014-02-03 14:41:14 -08:00
Tim Murray
72d637e297
am e22e268e: Merge changes If93a5d78,I1957f7ac
...
* commit 'e22e268e6d158f37173b1bce37a5614daabcf18c':
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
2014-02-03 14:41:11 -08:00
Tim Murray
bccee732b5
am 61eb6b55: Merge "Use Object + type in place of specific array"
...
* commit '61eb6b55c6b4db14e025240fc754e1314f57bd00':
Use Object + type in place of specific array
2014-02-03 14:41:08 -08:00
Tim Murray
6991488250
am e559d7ee: Merge "Utility API for creating types."
...
* commit 'e559d7ee53a69502c9aef8764bb055ed2d1adb64':
Utility API for creating types.
2014-02-03 14:41:05 -08:00
Tim Murray
271c3b7499
am b1c1518e: Merge "Remove old hidden API."
...
* commit 'b1c1518ef1e89fb8bc42022b6455a695cacd949c':
Remove old hidden API.
2014-02-03 14:41:02 -08:00
Tim Murray
9bad32c383
am aea3b581: Merge "Remove hidden API setSurfaceTexture."
...
* commit 'aea3b5816d8461fcbc4a384874a1a073ecdeafcf':
Remove hidden API setSurfaceTexture.
2014-02-03 14:41:00 -08:00
Tim Murray
f5294ed57c
Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
2014-02-03 22:37:13 +00:00
Tim Murray
3fb6feacc6
Merge "Check that bound allocations are 1D"
2014-02-03 22:37:11 +00:00
Tim Murray
0cc37f4cde
Merge "Fix debug context."
2014-02-03 22:37:06 +00:00
Tim Murray
0539b7b411
Merge "Enable asynchronous destruction of BaseObjs."
2014-02-03 22:37:00 +00:00
Tim Murray
d8b4dd9555
Merge "Fix most logging macros for context pointers."
2014-02-03 22:36:54 +00:00
Tim Murray
351879df3a
Merge "Fix getBytesSize for YUV allocations."
2014-02-03 22:36:53 +00:00
Tim Murray
8fced3174a
Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
2014-02-03 22:36:50 +00:00
Tim Murray
b4cf2a2aee
Merge "Convert Java/JNI to 64-bit, part 2."
2014-02-03 22:36:45 +00:00
Tim Murray
e22e268e6d
Merge changes If93a5d78,I1957f7ac
...
* changes:
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
2014-02-03 22:36:38 +00:00
Tim Murray
61eb6b55c6
Merge "Use Object + type in place of specific array"
2014-02-03 22:36:36 +00:00
Tim Murray
e559d7ee53
Merge "Utility API for creating types."
2014-02-03 22:36:13 +00:00
Tim Murray
b1c1518ef1
Merge "Remove old hidden API."
2014-02-03 22:36:06 +00:00
Tim Murray
aea3b5816d
Merge "Remove hidden API setSurfaceTexture."
2014-02-03 22:35:15 +00:00
John Spurlock
be878d8773
am b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java
...
* commit 'b6a4926c670244fbf7d7033f2a1b46da25b35d39':
Fix typo in ImageView.java
2014-02-03 17:27:11 +00:00
John Spurlock
b6a4926c67
am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java
...
* commit '647db9fae37b36d99ce290acfae7b453f00ae5af':
Fix typo in ImageView.java
2014-02-03 17:24:05 +00:00
John Spurlock
647db9fae3
am 76ecd66a: am 0196e561: Fix typo in ImageView.java
...
* commit '76ecd66a6d5f8ceaebbe9cd109948f01aff4cd27':
Fix typo in ImageView.java
2014-02-03 17:21:25 +00:00
John Spurlock
76ecd66a6d
am 0196e561: Fix typo in ImageView.java
...
* commit '0196e561f280e6cc361442036da277a630e68558':
Fix typo in ImageView.java
2014-02-03 17:18:37 +00:00
John Spurlock
0196e561f2
Fix typo in ImageView.java
...
Change-Id: Iaa7b020f09c893a5fe006a8523686dd8b9a8f872
2014-02-03 09:00:35 -05:00
Kenny Root
aa6ff54ef5
am 85ee57d1: am c064a1b5: Merge "Remove DRLCertFactory"
...
* commit '85ee57d1ae73db6ac014d76d7be1b5d5e87eb89f':
Remove DRLCertFactory
2014-01-31 23:01:15 +00:00
Kenny Root
85ee57d1ae
am c064a1b5: Merge "Remove DRLCertFactory"
...
* commit 'c064a1b5d9a68bb5513e6ed64a067ab822e98764':
Remove DRLCertFactory
2014-01-31 14:58:53 -08:00
Kenny Root
c064a1b5d9
Merge "Remove DRLCertFactory"
2014-01-31 22:54:44 +00:00
Kenny Root
4f2323106b
Remove DRLCertFactory
...
No longer needed since Conscrypt is the main provider.
Change-Id: Iee741ef376af2de52db79df07e96057438778bc6
2014-01-31 14:10:15 -08:00
Tim Murray
0e3431d4c7
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
...
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
2014-01-31 14:05:20 -08:00
Jason Sams
cf9c894a9b
Check that bound allocations are 1D
...
We do not support higher order bound allocations. The
stride is not available to the script so they cannot
walk the allocation correctly.
Change-Id: I9447a5d43c3ae1b88fc9522628a17bd5a317ffc6
2014-01-31 12:35:19 -08:00