OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:26 +0000 (03:06 +0000)]
am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.

* commit '650d30c5ec3c0b345651a56c45eb334fabf51b17':
  Fix a bug in Nine Patch library.

10 years agoam b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:36 +0000 (03:03 +0000)]
am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.

* commit 'b156c0197d052dd4be71ad2b858acc01f50ad49f':
  Fix a bug in Nine Patch library.

10 years agoam d5129e75: am 8a892279: Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:38 +0000 (02:59 +0000)]
am d5129e75: am 8a892279: Fix a bug in Nine Patch library.

* commit 'd5129e75968030620a1372e39fcfbc17fe584e17':
  Fix a bug in Nine Patch library.

10 years agoam 8a892279: Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:32 +0000 (02:56 +0000)]
am 8a892279: Fix a bug in Nine Patch library.

* commit '8a892279bd1b212311f4200f306a317985463918':
  Fix a bug in Nine Patch library.

10 years agoFix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 01:11:14 +0000 (17:11 -0800)]
Fix a bug in Nine Patch library.

The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.

Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b

10 years agoam 1bf2b873: Defer detach until animations are complete.
Craig Mautner [Thu, 6 Feb 2014 01:00:35 +0000 (01:00 +0000)]
am 1bf2b873: Defer detach until animations are complete.

* commit '1bf2b873470d2ba8a4ac218da73516cc2b20aa76':
  Defer detach until animations are complete.

10 years agoam dc548483: Move activities from DisplayContent to TaskStack
Craig Mautner [Thu, 6 Feb 2014 01:00:32 +0000 (01:00 +0000)]
am dc548483: Move activities from DisplayContent to TaskStack

* commit 'dc548483ae90ba26ad9e2e2cb79f4673140edb49':
  Move activities from DisplayContent to TaskStack

10 years agoDefer detach until animations are complete.
Craig Mautner [Wed, 5 Feb 2014 23:37:40 +0000 (15:37 -0800)]
Defer detach until animations are complete.

Allowing the detach of ActivityStack from DisplayContent to happen
immediately was causing all sorts of problems associated with not
having a Display to complete the animations.

Waiting for animations to complete before either the detach or the
display removal fixes those problems.

Change-Id: I8a5663bfac5c3c1084ff4fcc451e0e38e8080265

10 years agoam 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
Chris Craik [Wed, 5 Feb 2014 21:43:48 +0000 (21:43 +0000)]
am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"

* commit '0ec3ca6e08e5933016beda147ca9a82e96434b15':
  Fix for positioning of glyphs within a bitmap

10 years agoam 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
Chris Craik [Wed, 5 Feb 2014 21:40:22 +0000 (13:40 -0800)]
am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"

* commit '449273e2d575041ffe1a5d435666d36923de888b':
  Fix for positioning of glyphs within a bitmap

10 years agoMerge "Fix for positioning of glyphs within a bitmap"
Chris Craik [Wed, 5 Feb 2014 21:36:42 +0000 (21:36 +0000)]
Merge "Fix for positioning of glyphs within a bitmap"

10 years agoMove activities from DisplayContent to TaskStack
Craig Mautner [Wed, 5 Feb 2014 21:35:24 +0000 (13:35 -0800)]
Move activities from DisplayContent to TaskStack

Now that activities and tasks can be detached from a display do not
keep their state within the DisplayContent class. All such state is
now moved to the TaskStack class with this change.

Change-Id: Ie6b1811e9ec3f545782bad8c3461bd4f2d336b93

10 years agoam eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library...
Stephen Hines [Wed, 5 Feb 2014 02:00:43 +0000 (02:00 +0000)]
am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging."

* commit 'eadd69413a5cbdd32ae56967f48b6ab6f3efbe52':
  Add message to RS docs about application vs. library packaging.

10 years agoam bc80e40b: Merge "Add message to RS docs about application vs. library packaging."
Stephen Hines [Wed, 5 Feb 2014 01:57:11 +0000 (17:57 -0800)]
am bc80e40b: Merge "Add message to RS docs about application vs. library packaging."

* commit 'bc80e40b160596c262fee0ee4df4b9f15cc14e89':
  Add message to RS docs about application vs. library packaging.

10 years agoMerge "Add message to RS docs about application vs. library packaging."
Stephen Hines [Wed, 5 Feb 2014 01:52:31 +0000 (01:52 +0000)]
Merge "Add message to RS docs about application vs. library packaging."

10 years agoam df88d730: Add IIntentSender to ActivityContainer.startActivity
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

10 years agoAdd 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

10 years agoam 70f908d7: am 3e80914d: am eea15edc: am 749120f3: 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

10 years agoam 3e80914d: am eea15edc: am 749120f3: 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

10 years agoam eea15edc: am 749120f3: 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

10 years agoam 749120f3: dashbaord update for feb \'14
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

10 years agodashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 18:57:47 +0000 (10:57 -0800)]
dashbaord update for feb '14

Change-Id: I7ed66b6603f40cbbf3ffcc4824894777e3f8add2

10 years agoam 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into...
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

10 years agoam 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
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)

10 years agoam 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
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

10 years agoam 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
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

10 years agoMerge "Add support for multiple asset dirs (-A)" into klp-modular-dev
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

10 years agoam 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
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

10 years agoMerge "Add adb over Wi-Fi" into klp-docs
Glenn Kasten [Tue, 4 Feb 2014 18:27:11 +0000 (18:27 +0000)]
Merge "Add adb over Wi-Fi" into klp-docs

10 years agoam 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multip...
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

10 years agoam f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build...
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

10 years agoam b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files...
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

10 years agoam ccec0906: Merge "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

10 years agoMerge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs
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

10 years agoam 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools...
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

10 years agoam a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect...
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

10 years agoam 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl...
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

10 years agoam 56783a74: 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

10 years agodocs: Added note on multiple build.gradle files. Bug: 12870006
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

10 years agoremove samples page under tools. redirect in separate cl.
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

10 years agoAdd adb over Wi-Fi
Glenn Kasten [Mon, 3 Feb 2014 22:01:25 +0000 (14:01 -0800)]
Add adb over Wi-Fi

Change-Id: I6ada6c88e3a006abc4685b66d6decd1bec175941

10 years agoam 6ceac9f0: (-s ours) am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util...
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.

10 years agoam b1bec0d9: am 3fb6feac: Merge "Check that bound allocations are 1D"
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

10 years agoam 67d9e0be: am 0cc37f4c: Merge "Fix debug context."
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.

10 years agoam 42e4aee5: am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
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.

10 years agoam 42955bab: am d8b4dd95: Merge "Fix most logging macros for context pointers."
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.

10 years agoam d39e19eb: am 351879df: Merge "Fix getBytesSize for YUV allocations."
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.

10 years agoam 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base...
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.

10 years agoam 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
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.

10 years agoam 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac
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.

10 years agoam bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array"
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

10 years agoam 69914882: am e559d7ee: Merge "Utility API for creating types."
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.

10 years agoam 271c3b74: am b1c1518e: Merge "Remove old hidden API."
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.

10 years agoam 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture."
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.

10 years agoam f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide...
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.

10 years agoam 3fb6feac: Merge "Check that bound allocations are 1D"
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

10 years agoam 0cc37f4c: Merge "Fix debug context."
Tim Murray [Mon, 3 Feb 2014 22:41:30 +0000 (14:41 -0800)]
am 0cc37f4c: Merge "Fix debug context."

* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
  Fix debug context.

10 years agoam 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
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.

10 years agoam d8b4dd95: Merge "Fix most logging macros for context pointers."
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.

10 years agoam 351879df: Merge "Fix getBytesSize for YUV allocations."
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.

10 years agoam 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory...
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.

10 years agoam b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
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.

10 years agoam e22e268e: Merge changes If93a5d78,I1957f7ac
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.

10 years agoam 61eb6b55: Merge "Use Object + type in place of specific array"
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

10 years agoam e559d7ee: Merge "Utility API for creating types."
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.

10 years agoam b1c1518e: Merge "Remove old hidden API."
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.

10 years agoam aea3b581: Merge "Remove hidden API setSurfaceTexture."
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.

10 years agoMerge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
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."

10 years agoMerge "Check that bound allocations are 1D"
Tim Murray [Mon, 3 Feb 2014 22:37:11 +0000 (22:37 +0000)]
Merge "Check that bound allocations are 1D"

10 years agoMerge "Fix debug context."
Tim Murray [Mon, 3 Feb 2014 22:37:06 +0000 (22:37 +0000)]
Merge "Fix debug context."

10 years agoMerge "Enable asynchronous destruction of BaseObjs."
Tim Murray [Mon, 3 Feb 2014 22:37:00 +0000 (22:37 +0000)]
Merge "Enable asynchronous destruction of BaseObjs."

10 years agoMerge "Fix most logging macros for context pointers."
Tim Murray [Mon, 3 Feb 2014 22:36:54 +0000 (22:36 +0000)]
Merge "Fix most logging macros for context pointers."

10 years agoMerge "Fix getBytesSize for YUV allocations."
Tim Murray [Mon, 3 Feb 2014 22:36:53 +0000 (22:36 +0000)]
Merge "Fix getBytesSize for YUV allocations."

10 years agoMerge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
Tim Murray [Mon, 3 Feb 2014 22:36:50 +0000 (22:36 +0000)]
Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."

10 years agoMerge "Convert Java/JNI to 64-bit, part 2."
Tim Murray [Mon, 3 Feb 2014 22:36:45 +0000 (22:36 +0000)]
Merge "Convert Java/JNI to 64-bit, part 2."

10 years agoMerge changes If93a5d78,I1957f7ac
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.

10 years agoMerge "Use Object + type in place of specific array"
Tim Murray [Mon, 3 Feb 2014 22:36:36 +0000 (22:36 +0000)]
Merge "Use Object + type in place of specific array"

10 years agoMerge "Utility API for creating types."
Tim Murray [Mon, 3 Feb 2014 22:36:13 +0000 (22:36 +0000)]
Merge "Utility API for creating types."

10 years agoMerge "Remove old hidden API."
Tim Murray [Mon, 3 Feb 2014 22:36:05 +0000 (22:36 +0000)]
Merge "Remove old hidden API."

10 years agoMerge "Remove hidden API setSurfaceTexture."
Tim Murray [Mon, 3 Feb 2014 22:35:14 +0000 (22:35 +0000)]
Merge "Remove hidden API setSurfaceTexture."

10 years agoam b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: 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

10 years agoam 647db9fa: am 76ecd66a: am 0196e561: 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

10 years agoam 76ecd66a: am 0196e561: 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

10 years agoam 0196e561: 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

10 years agoFix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 14:00:35 +0000 (09:00 -0500)]
Fix typo in ImageView.java

Change-Id: Iaa7b020f09c893a5fe006a8523686dd8b9a8f872

10 years agoam 85ee57d1: am c064a1b5: Merge "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

10 years agoam c064a1b5: Merge "Remove DRLCertFactory"
Kenny Root [Fri, 31 Jan 2014 22:58:53 +0000 (14:58 -0800)]
am c064a1b5: Merge "Remove DRLCertFactory"

* commit 'c064a1b5d9a68bb5513e6ed64a067ab822e98764':
  Remove DRLCertFactory

10 years agoMerge "Remove DRLCertFactory"
Kenny Root [Fri, 31 Jan 2014 22:54:44 +0000 (22:54 +0000)]
Merge "Remove DRLCertFactory"

10 years agoRemove 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

10 years agoDO NOT MERGE: Mark new util type functions as @hide in AOSP.
Tim Murray [Fri, 31 Jan 2014 20:57:20 +0000 (12:57 -0800)]
DO NOT MERGE: Mark new util type functions as @hide in AOSP.

Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c

10 years agoCheck that bound allocations are 1D
Jason Sams [Wed, 15 Jan 2014 00:18:14 +0000 (16:18 -0800)]
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

10 years agoFix debug context.
Tim Murray [Fri, 10 Jan 2014 19:25:52 +0000 (11:25 -0800)]
Fix debug context.

bug 12477551

Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e

10 years agoEnable asynchronous destruction of BaseObjs.
Tim Murray [Tue, 7 Jan 2014 19:13:56 +0000 (11:13 -0800)]
Enable asynchronous destruction of BaseObjs.

Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c

Conflicts:
rs/java/android/renderscript/BaseObj.java

10 years agoFix most logging macros for context pointers.
Tim Murray [Tue, 7 Jan 2014 23:36:19 +0000 (15:36 -0800)]
Fix most logging macros for context pointers.

Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166

10 years agoFix getBytesSize for YUV allocations.
Tim Murray [Wed, 18 Dec 2013 01:15:25 +0000 (17:15 -0800)]
Fix getBytesSize for YUV allocations.

bug 12134914

Change-Id: I128e75b756a5bd129077177e254f1db6c94182f1

10 years agoMove RenderScript from graphics/ to new fw/base subdirectory rs.
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

10 years agoam cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp...
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.

10 years agoMerge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev
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

10 years agoam 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modul...
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

10 years agoMerge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev
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