Zhijun He
30ba38ac78
am bf143ff1: Merge "ImageReader: disable NV21 support" into klp-dev
...
* commit 'bf143ff1955f9ec70fd9435240e3505c5df4804d':
ImageReader: disable NV21 support
2013-09-18 10:52:14 -07:00
Chet Haase
07861ea82b
am 4fa809fe: Merge "Fix leak fix in ViewTreeObserver" into klp-dev
...
* commit '4fa809fe74635720528ab46cff7d2ba0d0aebd8a':
Fix leak fix in ViewTreeObserver
2013-09-18 10:52:11 -07:00
Zhijun He
bf143ff195
Merge "ImageReader: disable NV21 support" into klp-dev
2013-09-18 17:49:30 +00:00
Chet Haase
4fa809fe74
Merge "Fix leak fix in ViewTreeObserver" into klp-dev
2013-09-18 17:48:38 +00:00
Zhijun He
4eda9f5359
ImageReader: disable NV21 support
...
Bug: 10787131
Change-Id: I5ff0a67144b5ec49eabde6129423a41c9597c2b8
2013-09-18 10:30:50 -07:00
Lajos Molnar
0fe0fe9501
am b8462457: Merge "Misc. media API changes" into klp-dev
...
* commit 'b84624571ba2d0431dda8fd7cd45ae995630dd17':
Misc. media API changes
2013-09-18 10:24:16 -07:00
Lajos Molnar
b84624571b
Merge "Misc. media API changes" into klp-dev
2013-09-18 17:20:08 +00:00
Lajos Molnar
e3d75c9dc8
am e23ce3b1: Merge "Add CaptioningManager listener Subtitle support." into klp-dev
...
* commit 'e23ce3b1fccd605ab696c120f86bd3912651731c':
Add CaptioningManager listener Subtitle support.
2013-09-18 09:49:49 -07:00
Lajos Molnar
e23ce3b1fc
Merge "Add CaptioningManager listener Subtitle support." into klp-dev
2013-09-18 16:46:39 +00:00
Chet Haase
fc343967c8
Fix leak fix in ViewTreeObserver
...
The leak fix of the CopyOnWriteArray in ViewTreeObserver was
too aggressive, always clearing the shadow copy when it should only
have cleared it when needed. The way it works now, we will always
clear the listeners for ViewTreeObserver after the listeners
are processed.
Issue #10815924 ViewTreeObserver leak fix too aggressive
Change-Id: Iff0095d73beb38e52b0a5ae6b6378afec4458fd3
2013-09-18 08:44:33 -07:00
Alan Viverette
56a87f8c07
am c255a711: Merge "Ensure WeeksAdapter calls notifyDataSetChanged when needed" into klp-dev
...
* commit 'c255a7113a6a6b058f1b3b5b128fba1d24bbd3d9':
Ensure WeeksAdapter calls notifyDataSetChanged when needed
2013-09-17 23:05:55 -07:00
Alan Viverette
c255a7113a
Merge "Ensure WeeksAdapter calls notifyDataSetChanged when needed" into klp-dev
2013-09-18 06:03:34 +00:00
Jesse Hall
1f9b486142
am 11c92012: Merge "Fix ImageReader onImageAvailable synchronization" into klp-dev
...
* commit '11c920124021bd9b21eac4885486e21a45f681e7':
Fix ImageReader onImageAvailable synchronization
2013-09-17 20:34:27 -07:00
Jesse Hall
11c9201240
Merge "Fix ImageReader onImageAvailable synchronization" into klp-dev
2013-09-18 03:32:17 +00:00
Jean-Michel Trivi
d925056344
am f841d701: Fix javadoc in RemoteControlClient and MediaMetadataEditor
...
* commit 'f841d70155c991b6cf728dd41e6d37e051be453d':
Fix javadoc in RemoteControlClient and MediaMetadataEditor
2013-09-17 19:28:43 -07:00
Jean-Michel Trivi
f841d70155
Fix javadoc in RemoteControlClient and MediaMetadataEditor
...
Change-Id: Ibd333d9cb47e74c4ca1d8ec7bd950224d81783b0
2013-09-17 19:13:55 -07:00
Lajos Molnar
8a39021dfa
Misc. media API changes
...
- MediaCodec.setParameter signature to take android.os.Bundle
- PARAMETER_KEY_VIDEO_BITRATE value
- comments for MediaFormat.KEY_LANGUAGE and createSubtitleFormat
Change-Id: I092e9830cb21df08b331854cbd28c758db06bc10
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10461617
2013-09-17 19:05:37 -07:00
Jean-Michel Trivi
f54f7d7075
am 15bcc323: Merge "RemoteController class to expose IRemoteControlDisplay features" into klp-dev
...
* commit '15bcc323cbaff72a2ca3eb9e75c35200e6216bd2':
RemoteController class to expose IRemoteControlDisplay features
2013-09-17 18:53:17 -07:00
Chris Craik
d97303a73b
am ce9ee16d: Merge "Conservatively estimate geometry bounds" into klp-dev
...
* commit 'ce9ee16d654a42f31d211c60708d7b23f17c1d8e':
Conservatively estimate geometry bounds
2013-09-17 18:53:14 -07:00
Chris Craik
7cb404dda7
am a42ceb03: Merge "Disallow negative scale matrices in merged Bitmap drawing" into klp-dev
...
* commit 'a42ceb03cf6a1cbcd9f526afb02d806b2c200ee3':
Disallow negative scale matrices in merged Bitmap drawing
2013-09-17 18:53:11 -07:00
Jean-Michel Trivi
15bcc323cb
Merge "RemoteController class to expose IRemoteControlDisplay features" into klp-dev
2013-09-18 01:51:17 +00:00
Chris Craik
ce9ee16d65
Merge "Conservatively estimate geometry bounds" into klp-dev
2013-09-18 01:50:02 +00:00
Chris Craik
a42ceb03cf
Merge "Disallow negative scale matrices in merged Bitmap drawing" into klp-dev
2013-09-18 01:49:32 +00:00
Jean-Michel Trivi
7ddd226e7c
RemoteController class to expose IRemoteControlDisplay features
...
Wrap all the features of IRemoteControlDisplay.aidl in a
new class, RemoteController, that implements the
IRemoteControlDisplay interface.
The API functions to expose in the SDK are tagged with
"CANDIDATE FOR API"
Bug 8209392
Change-Id: I597bcd503ac93e73889c9ae8b47b16c4fcb363bc
2013-09-18 01:47:25 +00:00
Jesse Hall
c395fffd90
Fix ImageReader onImageAvailable synchronization
...
This avoids a race where close() can return while there are still
onImageAvailable callbacks pending.
Bug: 10666923
Change-Id: Ic519b68f3132ceb7f95a9a42ebd1032c1638fbf5
2013-09-17 18:21:30 -07:00
Zhijun He
30a1707a5f
am 9b645984: Merge "Camera2: Add docs for availableProcessedSizes" into klp-dev
...
* commit '9b6459841e52b9d44ec8ec57af5eb8007841f93d':
Camera2: Add docs for availableProcessedSizes
2013-09-17 18:02:54 -07:00
Zhijun He
9b6459841e
Merge "Camera2: Add docs for availableProcessedSizes" into klp-dev
2013-09-18 01:01:32 +00:00
Chris Craik
32f05e343c
Conservatively estimate geometry bounds
...
bug:10761696
Avoids a case where a rect with top coordinate of (e.g.) 0.51f is
assumed to not draw in the first row of pixels, which leads to it not
being clipped. Since rounding can cause it to render in this first
pixel anyway, we very slightly expand geometry bounds.
Now, in ambiguous cases, the geometry bounds are expanded so clipping
is more likely to happen.
Change-Id: I119b7c7720de07bac1634549724ffb63935567fc
2013-09-17 17:48:14 -07:00
Justin Mattson
2bf68f43b0
am 904aa38f: Merge "Try fixing the build again" into klp-dev
...
* commit '904aa38f1a420c42467a13b8d5108d1891350c97':
Try fixing the build again
2013-09-17 17:36:18 -07:00
Dianne Hackborn
12b2247996
am 222920c4: Merge "Maybe fix issue #10797796 : IllegalStateException in ProcessState..." into klp-dev
...
* commit '222920c46044d4782df3cd5b3c6c7e6578659903':
Maybe fix issue #10797796 : IllegalStateException in ProcessState...
2013-09-17 17:36:15 -07:00
Justin Mattson
904aa38f1a
Merge "Try fixing the build again" into klp-dev
2013-09-18 00:35:12 +00:00
Dianne Hackborn
222920c460
Merge "Maybe fix issue #10797796 : IllegalStateException in ProcessState..." into klp-dev
2013-09-18 00:34:02 +00:00
petergng@google.com
ac301e8b07
am 24873be6: Merge "Make touch states neutralized by replacing default pressed states for most fw widgets" into klp-dev
...
* commit '24873be6eee77a89599aa2af3db0f8f2f5466978':
Make touch states neutralized by replacing default pressed states for most fw widgets
2013-09-17 17:31:46 -07:00
Dianne Hackborn
53459a7020
Maybe fix issue #10797796 : IllegalStateException in ProcessState...
...
...caused runtime restart
There were some situations where the package list could be set
with process stats when it shouldn't. Not sure if this is causing
the problem, since there is no repro.
Also some improvements to debug output -- new commands to clear
all stats, print full details of stats, and print a one-day
summary (which should match what the UI shows).
Change-Id: I9581db4059d7bb094f79f2fe06c1ccff3e1a4e74
2013-09-17 17:30:34 -07:00
Alan Viverette
9ac68dc69f
am 84c5ade8: Merge "Fix vertical scroll computation in NumberPicker" into klp-dev
...
* commit '84c5ade823d96f6166fad4d6e4521badd322e5e8':
Fix vertical scroll computation in NumberPicker
2013-09-17 17:28:15 -07:00
petergng@google.com
24873be6ee
Merge "Make touch states neutralized by replacing default pressed states for most fw widgets" into klp-dev
2013-09-18 00:26:35 +00:00
Alan Viverette
84c5ade823
Merge "Fix vertical scroll computation in NumberPicker" into klp-dev
2013-09-18 00:21:38 +00:00
Justin Mattson
b0da450556
Try fixing the build again
...
Change-Id: I4b4daae3e290e3548d2bb9c122a8f576c4050994
2013-09-17 17:18:29 -07:00
Mindy Pereira
2fed38ec13
am 09804e41: Merge "Add isQuickScaleEnabled to ScaleGestureDetector" into klp-dev
...
* commit '09804e41daa31f95a6050892866b24eea32eb4cf':
Add isQuickScaleEnabled to ScaleGestureDetector
2013-09-17 17:00:10 -07:00
Mindy Pereira
09804e41da
Merge "Add isQuickScaleEnabled to ScaleGestureDetector" into klp-dev
2013-09-17 23:57:54 +00:00
Matthew Xie
1d47f0033b
am c9d1d5f3: Adjust absolute volume only when the device is streaming music
...
* commit 'c9d1d5f35091226e96fcfa91817480f589eb36e2':
Adjust absolute volume only when the device is streaming music
2013-09-17 16:53:13 -07:00
Matthew Xie
c9d1d5f350
Adjust absolute volume only when the device is streaming music
...
The device has to be A2DP device
Remove AudioManager#avrcpUpdateVolume
bug 10681804
Change-Id: I2bc85e48fdff374638b984af593c6f1c4ddd3ee6
2013-09-17 23:48:19 +00:00
Craig Mautner
2af9dd716e
am 019f8cb8: Merge "Add bounds checks before accessing ArrayList." into klp-dev
...
* commit '019f8cb8a78c5584618655f5478d9a9f3dedc3f0':
Add bounds checks before accessing ArrayList.
2013-09-17 16:15:20 -07:00
Craig Mautner
019f8cb8a7
Merge "Add bounds checks before accessing ArrayList." into klp-dev
2013-09-17 23:13:31 +00:00
Craig Mautner
dccb770b84
Add bounds checks before accessing ArrayList.
...
Add a test for emptiness before accessing either mTaskHistory[0] or
TaskRecord.mActivities[0]. This will keep us from hitting
IndexOutOfBoundsException.
Fixes bug 10789624.
Change-Id: If726df888a2c8b393788793b6220a6bffe2df883
2013-09-17 15:53:34 -07:00
Jeff Sharkey
cf4052f6b5
am e48569a8: Merge "Guard against null Context in attachInfo()." into klp-dev
...
* commit 'e48569a87057e46a30d3dcbb2d788a4e4da7f21c':
Guard against null Context in attachInfo().
2013-09-17 15:40:56 -07:00
Jeff Sharkey
e48569a870
Merge "Guard against null Context in attachInfo()." into klp-dev
2013-09-17 22:38:18 +00:00
Jean-Michel Trivi
144835aef8
am f03ceff2: Merge "Revise new public API for ratings in RemoteControlClient" into klp-dev
...
* commit 'f03ceff2f506133a238848c2f5db4322285cc2b7':
Revise new public API for ratings in RemoteControlClient
2013-09-17 15:37:19 -07:00
Jean-Michel Trivi
f03ceff2f5
Merge "Revise new public API for ratings in RemoteControlClient" into klp-dev
2013-09-17 22:35:08 +00:00
Jeff Sharkey
10cb312ecd
Guard against null Context in attachInfo().
...
Some CTS tests were running into this.
Bug: 10805216
Change-Id: I425d2a0064612af70a64f457e159498cb6257a28
2013-09-17 15:18:43 -07:00