122311 Commits

Author SHA1 Message Date
Jeff Hao
d02e60fbd4 Add sample profiling interface to startMethodTracing.
Frameworks base side of this change. Also changed art and libcore.

Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
2014-01-15 11:27:24 -08:00
Ricardo Cervera
980edc3ca1 docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
Change-Id: I6c247e172b2a6dd0ef25afc6cf33f0960fc0fa8d
Review: http://quixote.mtv.corp.google.com:8101/google/play/publishing/multiple-apks.html
2014-01-15 11:25:10 -08:00
Leon Scroggins III
5aa3e4d58d Merge "Fix Javadoc build break." 2014-01-15 19:24:39 +00:00
Leon Scroggins III
2bc49ca96e Fix Javadoc build break.
Remove links to non-specific function name.

Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
2014-01-15 14:23:14 -05:00
John Spurlock
ab847cf16d Tear down bars on destroy() and avoid null pointers.
Change-Id: Ie393689bbf2f0b28895bfde5098c883b5d4ea4a6
2014-01-15 14:18:43 -05:00
John Reck
81155da284 Merge "Remove dead code" 2014-01-15 18:57:13 +00:00
Leon Scroggins III
0102f8a87a In nativeDecodeFileDescriptor, use fdopen.
Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Change-Id: If67da91484acc79f9f3dde6d05201409c0c75e41
2014-01-15 13:39:19 -05:00
Leon Scroggins III
f761fa7767 Merge "Remove calls to deprecated SkBitmap::setIsOpaque()" 2014-01-15 18:34:19 +00:00
Geoff Mendal
78604a2833 Merge "Import translations. DO NOT MERGE" 2014-01-15 18:24:04 +00:00
Geoff Mendal
282bcdd834 Import translations. DO NOT MERGE
Change-Id: I0116e137efa21bd9e8e3ba65fa05c7d84afb9e2c
Auto-generated-cl: translation import
2014-01-15 10:12:52 -08:00
quddusc
3a0ebd8957 am 4645edea: am 25e1900b: am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs
* commit '4645edeae0eec727909bcfe1ff7562ca4a7d1c80':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
2014-01-15 18:11:32 +00:00
quddusc
4645edeae0 am 25e1900b: am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs
* commit '25e1900beee4959be28ede9e00b8c5e8f10c1e17':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
2014-01-15 18:08:32 +00:00
quddusc
25e1900bee am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs
* commit 'e8ae214c31b4c5c2e90538b9d0a5c258e32fafeb':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
2014-01-15 18:04:31 +00:00
quddusc
e8ae214c31 am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs
* commit 'f40111731581f03dc1b447b432331b3415fb87b9':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
2014-01-15 10:00:53 -08:00
Glenn Kasten
0c5b62744b Merge "Unhide android.media.AudioTrack.setVolume(float)" 2014-01-15 17:58:53 +00:00
quddusc
f401117315 am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs
* commit '31573d45933886237dd6414978486b79a4dd4f9f':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
2014-01-15 17:57:27 +00:00
quddusc
31573d4593 Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 2014-01-15 17:55:22 +00:00
John Reck
2114aef4ea Remove dead code
Change-Id: I9c96d3d21bd3faed91a5146f5a2b8916c634fdff
2014-01-15 09:37:38 -08:00
Marco Nelissen
7a993a3d54 am 4e53edf7: am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '4e53edf7ea8f8158a123a451530146f23e3fed81':
  Before requerying a cursor, check if it is closed.
2014-01-15 17:33:42 +00:00
Marco Nelissen
4e53edf7ea am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit 'e495a5a3f3feec6319262a6bdab3b7704d6ab843':
  Before requerying a cursor, check if it is closed.
2014-01-15 17:29:43 +00:00
Marco Nelissen
e495a5a3f3 am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit 'cb15fb6041e604025d4b76645435f8cbafee754c':
  Before requerying a cursor, check if it is closed.
2014-01-15 17:27:19 +00:00
Marco Nelissen
cb15fb6041 am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '0d4916f19f81f80fc83eb7646c6d339630d5f618':
  Before requerying a cursor, check if it is closed.
2014-01-15 09:22:55 -08:00
Marco Nelissen
0d4916f19f am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit 'c3036a12467395465b86e6935af8aa500c1b128d':
  Before requerying a cursor, check if it is closed.
2014-01-15 09:19:52 -08:00
Marco Nelissen
c3036a1246 Merge "Before requerying a cursor, check if it is closed." 2014-01-15 17:17:05 +00:00
Leon Scroggins III
8790be6de3 Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia.

Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.

Change-Id: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
2014-01-15 11:37:04 -05:00
Ashok Bhat
b091d47a2e AArch64: Use long for pointers in BitmapRegionDecoder
For storing pointers, long is used in BitmapRegionDecoder
class, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

In addition, Graphics.cpp has been changed to work
with modified BitmapRegionDecoder.

Change-Id: Id54087dd3bfb29577e8b762e70946793369dc701
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-15 14:23:22 +00:00
Ashok Bhat
dcaf5593dd AArch64: Use long for pointers in Movie class
For storing pointers, long is used in Movie class,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I946325e4af6cb9282012bebdaee89e1117d8797b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-15 14:22:56 +00:00
Ashok Bhat
a0545dd54f AArch64: Add AssetInputStream.getNativeAsset
This patch adds AssetInputStream.getNativeAsset. This function
returns asset pointer, which can then be passed to JNI functions.
Note that this function is hidden and not part of Android API.

This function will eventually replace getAssetInt,
once all the classes that use getAssetInt are changed
to use getNativeAsset instead.

Change-Id: I2a2b2e6864f1f57ae2b3a10c45559b3635266ed5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-15 14:21:59 +00:00
Ashok Bhat
075e9a19ce AArch64: Use long for pointers in media classes
For storing pointers, long is used in media classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-15 13:09:27 +00:00
Michael Jurka
cae6b43b03 Merge "Centering the crop by default in system wallpaper cropper" 2014-01-15 12:52:08 +00:00
Scott Main
f12b3fd617 Doc change: add Drive API feature page.
fix link text on several pages

Change-Id: I141e5b2cafe8c433861fa4f51aa9fc3843e7fba1
2014-01-14 18:47:34 -08:00
Alan Viverette
c6c243bf01 Merge "Propagate first call to DrawableContainer.setAlpha() to children" 2014-01-15 02:24:44 +00:00
Alan Viverette
34bd56b546 Propagate first call to DrawableContainer.setAlpha() to children
BUG: 12530662
Change-Id: Idd972698d1a6805cb9f66ba4c2ddde97e1f8d2ca
2014-01-14 18:19:09 -08:00
Zhijun He
78146ecb24 Camera2: Update AF mode related javadoc specs
Change-Id: If7a0de76f660ade25d9fdb92458fbe7e9752d0dd
2014-01-14 18:12:13 -08:00
Zhijun He
fb46c644ce Camera2: metadata tag javadoc update
Change-Id: I66700340780f3185796f25c054487f439f24a6fb
2014-01-14 17:57:23 -08:00
Alan Viverette
0ae6a7a2cc Merge "Cache display lists for Drawables" 2014-01-15 01:31:00 +00:00
Glenn Kasten
4896cb59a4 Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0" 2014-01-15 01:27:59 +00:00
Jason Sams
bdc223a7f2 Merge "Check that bound allocations are 1D" 2014-01-15 01:23:51 +00:00
Alan Viverette
c062c7003f Cache display lists for Drawables
Change-Id: I86e2dd4cd4ac8871f4131450cb9082c2b8de2eed
2014-01-14 17:16:29 -08:00
Craig Mautner
3a43aa9cef am 9cfb2e5f: Merge "Retain stacks even if they are empty." into klp-modular-dev
* commit '9cfb2e5f4c95c16d8ca531808f60486f214f9039':
  Retain stacks even if they are empty.
2014-01-15 01:10:51 +00:00
Adrian Roos
a3fa8bf159 Merge "Make brightness panel behave like volume panel." 2014-01-15 01:10:32 +00:00
Craig Mautner
9cfb2e5f4c Merge "Retain stacks even if they are empty." into klp-modular-dev 2014-01-15 01:07:15 +00:00
Alan Viverette
4b95cc7ef7 Quick fix for updating the FastScroller long list property
BUG: 12553181
Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79
2014-01-14 16:54:02 -08:00
Jason Sams
9eb8b3ae09 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-14 16:18:14 -08:00
Adrian Roos
d8ea484e2c Make brightness panel behave like volume panel.
Moves the brightness panel to the same spot as the volume panel. To avoid a conflict with the volume panel, brightness is dismissed when the volume keys are pressed.

Bug: 7217009
Bug: 7217154
Change-Id: Ib8331a1e390cbedca40fa237243ea2cfd088e521
2014-01-14 16:12:33 -08:00
Glenn Kasten
3e21cc8140 Unhide android.media.AudioTrack.setVolume(float)
Bug: 12534920
Change-Id: I7d7437f87f7002c42452011e347e89ddaa0bf6a5
2014-01-14 13:55:36 -08:00
John Spurlock
4a5eb8fe18 Merge "Add demo-mode command to hide notification icons." 2014-01-14 21:29:57 +00:00
John Spurlock
7f42fc5007 Add demo-mode command to hide notification icons.
Bug:11285517
Change-Id: I341feadbf164afd34fef192a541f14a2ff67e8e2
2014-01-14 16:20:39 -05:00
Chris Craik
255fd80737 Merge "Simplify Z reordering logic" 2014-01-14 21:07:50 +00:00
Chris Craik
9f68c09626 Simplify Z reordering logic
Change-Id: I9e36f68d7be5cfd4d69a84a51824cb9a642fe18d
2014-01-14 12:52:41 -08:00