113322 Commits

Author SHA1 Message Date
Jason Monk
bc018d89c2 Fix PacManager to not unbind when no connection
PacManager previously would unbind service even when there was no
connection.  This means that multiple set proxies of no PAC after a PAC was
present would cause the framework to crash.

Bug: 10801296
Change-Id: I4387b50b6510cea3ee73425c8a0a837f816b0ce1
2013-09-18 09:28:29 -04:00
Jason Monk
fa4518f763 PAC Local Proxy to only receive lo connections
This changes the Local Proxy used in PAC to only accept connections coming
from the device.

Bug: 10230718
Change-Id: I5fbeb3aa018df5179a403301021f452e910a517d
2013-09-18 09:22:11 -04: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
Jonathan Dixon
5545d083d3 Update APIs for the Chromium WebView
Bug: 10361803
Bug: 8565831

Several obsolete APIs now deprecated.
TEXT_AUTOSIZING can now be unhidden.

Change-Id: Ib0afa4bb010f35816d3b9dd3695e8997f0ff0793
2013-09-17 20:47:10 -07: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
David Braun
fdacf74764 am 345d491b: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev
* commit '345d491b77d70942f7a4390645fae7748b418459':
  Implement new method for handling SMS/MMS on the platform
2013-09-17 15:15:44 -07:00
Craig Mautner
e0dcb7df52 am bc65c1db: Merge "Do not assign InputMethod to non-input windows." into klp-dev
* commit 'bc65c1dbccfe936856e9a2c4066c1ec9115140e2':
  Do not assign InputMethod to non-input windows.
2013-09-17 15:15:41 -07:00
David Braun
345d491b77 Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev 2013-09-17 22:14:54 +00:00
Craig Mautner
bc65c1dbcc Merge "Do not assign InputMethod to non-input windows." into klp-dev 2013-09-17 22:13:10 +00:00
Jean-Michel Trivi
88183e67d4 Revise new public API for ratings in RemoteControlClient
Refactor RemoteControlClient.MetadataEditor to move functionality
 in new abstract class MediaMetadataEditor, so it can be also
 used on the "display" side of the RemoteControl functionality.
Compatibility of these changes has been tested against
 existing Play applications which use the RemoteControlClient API.

Move the new constants and method definitions related to the
 ratings feature to MediaMetadataEditor. This changes the
 yet-to-be-published ratings API, so this doesn't break
 compatibility.
Rating feature is handled by the new Rating class with a set
 of constructors that handle the different rating models.

Bug 8440498

Change-Id: I9b6dc2204bfc48594bad5cd6449d357f8a485da0
2013-09-17 15:13:00 -07:00
Svetoslav
10d44a762e am a245a4f1: Merge "Update the APIs to fix the build" into klp-dev
* commit 'a245a4f14ed9e477ce1c68b54bf14a745d7caf47':
  Update the APIs to fix the build
2013-09-17 15:01:08 -07:00
Brian Colonna
6d9b6beedc am 4811398b: Merge "Fix 10550373: Stopping FUL when emergency dialer opens" into klp-dev
* commit '4811398bfdaf4cf07f945c46d15977fd7418f498':
  Fix 10550373: Stopping FUL when emergency dialer opens
2013-09-17 15:01:06 -07:00