2764 Commits

Author SHA1 Message Date
Dianne Hackborn
1775ebb76f am b6459eb2: am 3e1fdd9e: Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev
* commit 'b6459eb25f0593561389d7cb3da38a4f960cce14':
  Implement issue #10550827: watching gpu memory for occam_svelte
2013-09-06 15:34:43 -07:00
Dianne Hackborn
b6459eb25f am 3e1fdd9e: Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev
* commit '3e1fdd9ed02f95fd2dfefc36b34754f2ede1a2af':
  Implement issue #10550827: watching gpu memory for occam_svelte
2013-09-06 15:28:23 -07:00
Dianne Hackborn
37c9943262 Implement issue #10550827: watching gpu memory for occam_svelte
Well, it would work if the published file permissions gave the
system process access to them. :(

Change-Id: I99e0c506f52c212384b20a042dcdd35516cf49c2
2013-09-06 15:06:04 -07:00
Glenn Kasten
7bb90e9a0b am 44b4fd2c: am 04c58e9e: Merge "Java API for AudioTrack timestamps" into klp-dev
* commit '44b4fd2cb9440dfbd5eca5758d9cabcdeaab0a1b':
  Java API for AudioTrack timestamps
2013-09-04 15:35:32 -07:00
Glenn Kasten
44b4fd2cb9 am 04c58e9e: Merge "Java API for AudioTrack timestamps" into klp-dev
* commit '04c58e9ec12c65c15738ba456f18a1f36416b0cc':
  Java API for AudioTrack timestamps
2013-09-04 15:33:20 -07:00
Glenn Kasten
04c58e9ec1 Merge "Java API for AudioTrack timestamps" into klp-dev 2013-09-04 22:29:19 +00:00
Glenn Kasten
948c2e6ff4 Java API for AudioTrack timestamps
This change adds android.media.AudioTimestamp and
android.media.AudioTrack.getTimestamp, with implementation, but hidden.

Change-Id: Ic314f04ff775baca05c57d19b5ea91133dbd0be1
2013-09-04 15:23:27 -07:00
Derek Sollenberger
ed59cbb2d8 am 22f36b1a: am 4c92f7ce: Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev
* commit '22f36b1a8d9b6b4ecb27e3e35a79579fd9e9cff8':
  Revert workaround for Skia bug now that Skia has been fixed.
2013-09-04 10:40:09 -07:00
Derek Sollenberger
22f36b1a8d am 4c92f7ce: Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev
* commit '4c92f7cec761f1e6550a1cf3dd1305a186ce0e05':
  Revert workaround for Skia bug now that Skia has been fixed.
2013-09-04 10:37:49 -07:00
Derek Sollenberger
2696797939 Revert workaround for Skia bug now that Skia has been fixed.
bug: 7170836
Change-Id: If357767a5f66d539f775bce766e963b3d0df38bf
2013-09-04 10:50:06 -04:00
Aravind Akella
567753c895 am ce025258: am 14abafa1: Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev
* commit 'ce025258ed12d1885150bae41f367248c0f65f97':
  Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
2013-09-03 17:45:24 -07:00
Aravind Akella
ce025258ed am 14abafa1: Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev
* commit '14abafa10853d979d184e2e934253aaded105137':
  Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
2013-09-03 17:43:50 -07:00
Aravind Akella
b4c76b18a3 Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
Bug: 10109508
Change-Id: I6dfdd986bd8c3368cb568fa7d90abf9c03de9aef
2013-09-03 17:02:41 -07:00
Todd Poynor
bfdd62323e ActivityManagerService use lmkd low memory killer daemon
Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
2013-09-03 17:55:55 +00:00
Leon Scroggins III
9f5da6ff42 am 050129b4: am 3f8da091: Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev
* commit '050129b44ada6c105c317092056803b2a60cef74':
  Change name back to CreateJavaInputStreamAdaptor.
2013-09-03 10:53:21 -07:00
Leon Scroggins III
050129b44a am 3f8da091: Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev
* commit '3f8da09136087bd4f97c1e13e2fb7f8cfb81941c':
  Change name back to CreateJavaInputStreamAdaptor.
2013-09-03 10:49:07 -07:00
Leon Scroggins III
3f8da09136 Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev 2013-09-03 17:37:10 +00:00
Leon Scroggins III
c779752508 Change name back to CreateJavaInputStreamAdaptor.
In order to fix open source builds, change WrapJavaInputStream's
name back to CreateJavaInputStreamAdaptor.

Remove FIXME in CopyJavaInputStream, and return a more generic type,
since the more specific type was only needed by a change in external/webkit,
which is being reverted since it depends on unreleased code.

Change-Id: I89b0431e357b509a2a0c17a624b31bd49d29070f
2013-09-03 11:35:00 -04:00
Jesse Hall
e721327ee7 am 64582578: am 655cff17: Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '6458257836da466347f1d82a78c9c3ca3f16ec33':
  EGL10.eglCreateWindowSurface should set producerControlledByApp
2013-08-30 14:17:22 -07:00
Jesse Hall
6458257836 am 655cff17: Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '655cff1799c3b7cce616676500e38bf43f83bc34':
  EGL10.eglCreateWindowSurface should set producerControlledByApp
2013-08-30 14:12:10 -07:00
Jesse Hall
0fa257fe53 EGL10.eglCreateWindowSurface should set producerControlledByApp
Bug: 10521699
Change-Id: Ief3f01edf7dabc7996b7af1a756dfd00f0987f1a
2013-08-30 13:49:14 -07:00
Leon Scroggins III
f7142e3e8b am af172519: am 4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev
* commit 'af1725190fbb8dd7c29726f8b7c072f3af734aed':
  Replace stream wrap-function w/ more specific ones
2013-08-29 10:24:21 -07:00
Leon Scroggins III
af1725190f am 4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev
* commit '4b2993123bf9a1c56d0a16b032612834dd418520':
  Replace stream wrap-function w/ more specific ones
2013-08-29 10:22:48 -07:00
Leon Scroggins III
4b2993123b Merge "Replace stream wrap-function w/ more specific ones" into klp-dev 2013-08-29 17:12:01 +00:00
Mike Klein
f5b43bdc62 SkTScopedPtr -> SkAutoTDelete in Android
Change-Id: I8f0312f34e112d302b05852c31308a43967e7a3f
2013-08-29 11:15:06 -04:00
Leon Scroggins III
ca32021b43 Replace stream wrap-function w/ more specific ones
The current stream wrapper returns a potentially incorrect
value for a call to getLength(), is typically copied into
another stream (not always in the same way), and doesn't
always take advantage of its underlying data (like when it
is an Asset). The overall goal of this CL is to provide the
caller with something that is ready to use, depending on
what is asked for. If a copy is desired, the copy is made
before being returned to the caller.

core/jni/android/graphics/Bitmap.cpp:

    Include SkStream.h, since it is no longer included by
    CreateJavaOutputStreamAdaptor's header file.

core/jni/android/graphics/BitmapFactory.cpp:

    Pass an SkStreamRewindable to decoding functions, as Skia
    decoders will be updated to only take an SkStreamRewindable
    (which makes more sense because they require rewinding).

    Call the more specific GetRewindableStream to get a
    rewindable stream.

    Remove copyAssetToStream which has been moved to Utils.

    In nativeDecodeAsset, pass forcePurgeable as allowPurgeable
    in doDecode. Technically the old code worked, but it checked
    the BitmapOptions again.

    Remove getFDSize, which is no longer used.

core/jni/android/graphics/BitmapRegionDecoder.cpp:

    Remove redundant buildSkMemoryStream. nativeNewInstanceFromStream
    now calls CopyJavaInputStream, which handles the copy.

    Copy the Asset directly, using common code, rather than creating
    an AssetStreamAdaptor to copy.

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp:
core/jni/android/graphics/CreateJavaOutputStreamAdaptor.h:

    Provide new interfaces to access data from a Java InputStream.
    The new interfaces are more specific about what type of stream
    is desired.

    Use forward declarations where possible.

    Remove doSize, which gives a misleading answer to the question
    of how long the entire stream is.

    TODO: Only call FindClass etc once.

core/jni/android/graphics/Movie.cpp:

    Check for an asset stream, and use it if possible. Then call
    GetRewindableStream if there is not an asset.
    Remove the memory leak. Call DeleteLocalRef to delete the
    allocated memory.

core/jni/android/graphics/Picture.cpp:

    Call the new interface.

core/jni/android/graphics/Utils.cpp:
core/jni/android/graphics/Utils.h:

    Make AssetStreamAdaptor inherit from SkStreamRewindable so it
    can be passed to Skia decoding functions once they require it.

    Add CopyAssetToStream (moved from BitmapFactory.cpp) so it can
    be used by multiple files.

graphics/java/android/graphics/BitmapFactory.java:

    Remove the call to mark, which is now done natively.

    Remove the BufferedInputStream. Mark/reset is now handled
    by native code.

    Allow decodeStream to handle a FileInputStream by using the
    FileDescriptor, if it is seekable. In decodeFileDescriptor,
    call nativeDecodeStream instead of decodeStream so this new
    functionality will not loop.

    Call setDensityFromOptions in decodeFileDescriptor.

graphics/java/android/graphics/BitmapRegionDecoder.java:

    Remove the BufferedInputStream. Mark/reset is now handled
    by native code.

TODO: ADD TESTS!

Requires https://googleplex-android-review.googlesource.com/#/c/344317/

BUG=https://b.corp.google.com/issue?id=8432093

Change-Id: I4419b70b3482325c98ecc673dbfc4613f1b18581
2013-08-27 15:28:58 -04:00
Leon Scroggins III
c6ad1f4384 am 8f564fbe: am 3871fdb9: Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-dev
* commit '8f564fbef3f8d1916662ededb33cb541802953d0':
  Fix unpremul setting in BitmapRegionDecoder.
2013-08-26 15:11:53 -07:00
Chong Zhang
2e0ee66389 am 9c70038c: am 5de1faca: Merge "wifi-display: add certification options" into klp-dev
* commit '9c70038cba0e265b553aa8cda9b133fd8866b692':
  wifi-display: add certification options
2013-08-26 15:11:07 -07:00
Leon Scroggins III
8f564fbef3 am 3871fdb9: Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-dev
* commit '3871fdb966846d9026500696e48ccc64349eedb4':
  Fix unpremul setting in BitmapRegionDecoder.
2013-08-26 15:05:15 -07:00
Chong Zhang
9c70038cba am 5de1faca: Merge "wifi-display: add certification options" into klp-dev
* commit '5de1faca166e2241cf9ad1981007caa947a1fc1b':
  wifi-display: add certification options
2013-08-26 15:03:00 -07:00
Leon Scroggins III
2cc409ae52 Fix unpremul setting in BitmapRegionDecoder.
requireUnpremultiplied should be the opposite of BitmapOptions.
inPremultiplied, as in BitmapFactory.

Fixes CTS tests.

BUG=10490308

Change-Id: I21b8c057ccdc9b35c69730a7fe8c3b6802ee6dd8
2013-08-26 14:41:58 -04:00
Chong Zhang
1f3ecaae63 wifi-display: add certification options
When certification mode is enabled:

- Pass wfd session info to wifi display settings

- Allow sink to connect to source

- Add interface in display manager for pausing/resuming session

- Add interface in WifiP2pManager for setting lc, oc and starting
  autonomous GO

Note that we're compliant regardless of certification mode, but
some confusing options (eg. allowing incoming connection from
sink) we want to hide when not being tested.

Bug: 9371882
Change-Id: Icc7dcae4e046453796cfa03f5f197055fabf234b
2013-08-23 16:02:09 -07:00
Eino-Ville Talvala
2ef42b3d25 am 1de3ac64: am d5ea6e11: Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev
* commit '1de3ac646315f625a58b9009f21f74965dec1765':
  Camera1: Rename setPreviewTexture to ...Target for clarity
2013-08-21 20:16:08 -07:00
Eino-Ville Talvala
1de3ac6463 am d5ea6e11: Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev
* commit 'd5ea6e113cfd573859f0966ae71cdcfd3d5e5f51':
  Camera1: Rename setPreviewTexture to ...Target for clarity
2013-08-21 20:11:18 -07:00
Eino-Ville Talvala
d5ea6e113c Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev 2013-08-22 00:50:55 +00:00
Elliott Hughes
d7a90ca50c The VM handles blocking SIGPIPE.
We don't need this any more.

Bug: 10211309

(cherry picked from commit 437e76208d451e7954699ead8931d0fe147bb07d)

Change-Id: I97b3ab4f65a70eacca2fbe95cfb11b1cc85c4021
2013-08-21 16:08:29 -07:00
Elliott Hughes
554d5e11b5 am ac26d9db: am 3d86d3b6: am f39abeb4: Merge "The VM handles blocking SIGPIPE."
* commit 'ac26d9db0e10f3c7849bbf78220d55f213ab6e2a':
  The VM handles blocking SIGPIPE.
2013-08-21 15:43:36 -07:00
Elliott Hughes
ac26d9db0e am 3d86d3b6: am f39abeb4: Merge "The VM handles blocking SIGPIPE."
* commit '3d86d3b633105695881fbfa55332fc8aa09d0573':
  The VM handles blocking SIGPIPE.
2013-08-21 15:40:22 -07:00
Eino-Ville Talvala
7b29779d97 Camera1: Rename setPreviewTexture to ...Target for clarity
Bug: 10312644
Change-Id: I4bee90428cb932a12d73dad89e91bb2ef492dc86
2013-08-21 14:54:19 -07:00
Elliott Hughes
437e76208d The VM handles blocking SIGPIPE.
We don't need this any more.

Bug: 10211309
Change-Id: I8be0071d50296974e3861f8af9d2bae4f5678d5a
2013-08-21 13:56:15 -07:00
Mathieu Chartier
8a31b86071 am 577a0759: am 67a4d32c: Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev
* commit '577a0759838fc2d3ae45b19a78d4cb8ce45c491a':
  Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true".
2013-08-21 13:16:47 -07:00
Mathieu Chartier
577a075983 am 67a4d32c: Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev
* commit '67a4d32c0d722e5daec48918211bf1474ab2f667':
  Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true".
2013-08-21 13:13:58 -07:00
Mathieu Chartier
67a4d32c0d Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev 2013-08-21 20:09:46 +00:00
Chris Craik
ed2515e853 am 908d9bfa: am dc70afae: Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev
* commit '908d9bfafd576755d06f0566fc4cac3831476f63':
  Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
2013-08-21 10:26:23 -07:00
Chris Craik
908d9bfafd am dc70afae: Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev
* commit 'dc70afaeabd7acacc07e8852b15cc820cd07531c':
  Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
2013-08-21 10:23:40 -07:00
Chris Craik
1abf5d6242 Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
bug:2248948

Change-Id: I8fdd649332667598504a1076d5a447572bd53086
2013-08-20 18:29:33 -07:00
Mathieu Chartier
e6c2241f7a Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true".
Bug: 10131789

Change-Id: Ib9962f7becdedd71f48123a4720dcce1d09abb9d
2013-08-20 17:38:24 -07:00
Andy McFadden
e435e646fe am 272f8bba: am 59210de1: Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev
* commit '272f8bba47dadcf560cf1a11749cf61cbe367a83':
  Avoid crashing in unlockCanvasAndPost
2013-08-20 14:31:07 -07:00
Andy McFadden
272f8bba47 am 59210de1: Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev
* commit '59210de17c840bb60fc1c623250df8f39ebba132':
  Avoid crashing in unlockCanvasAndPost
2013-08-20 14:29:06 -07:00
Andy McFadden
59210de17c Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev 2013-08-20 21:27:07 +00:00