111109 Commits

Author SHA1 Message Date
Chong Zhang
1cb4d42c56 am a3132d97: Merge "MediaPlayer.TrackInfo: add getFormat() method" into klp-dev
* commit 'a3132d975b218b3d973711ebf347da3c433a9afb':
  MediaPlayer.TrackInfo: add getFormat() method
2013-08-20 11:27:02 -07:00
Tim Murray
cf8e6778c2 Merge "Handle updates to C++ API." into klp-dev 2013-08-20 18:27:01 +00:00
Chong Zhang
ea18a8db65 Merge "MediaPlayer: add listener for subtitle data" into klp-dev 2013-08-20 18:25:05 +00:00
Andy McFadden
ed55c8db1c Avoid crashing in unlockCanvasAndPost
It's possible to update the native surface pointer while the
surface is locked (via lockCanvas).  This leads to a surprise when
the surface is unlocked.  Avoid the surprise by tracking the
locked surface separately.

Bug 10289713

Change-Id: I84346c952be859bbd91ceae7df07b91dabe0948e
2013-08-20 11:23:17 -07:00
Chong Zhang
a3132d975b Merge "MediaPlayer.TrackInfo: add getFormat() method" into klp-dev 2013-08-20 18:23:12 +00:00
Tom O'Neill
19eefb2033 am f23993fb: Merge "Add the API to set and read the location mode" into klp-dev
* commit 'f23993fb52bd88c8512588c8a2cb0a53fecb2cf2':
  Add the API to set and read the location mode
2013-08-20 11:16:03 -07:00
Tom O'Neill
f23993fb52 Merge "Add the API to set and read the location mode" into klp-dev 2013-08-20 18:13:09 +00:00
Lorenzo Colitti
5c7daac2e3 Notify IP address changes to interface observers.
1. Add addressUpdated and addressRemoved methods to
   INetworkManagementEventObserver. (The -Updated method is not
   called -Added because it gets called for both adds and
   changes.) Update all its callers in the tree.
2. Make NetworkManagementService parse IP address notifications
   from NetlinkHandler and call the address{Removed,Updated} on
   its observers.

Bug: 10232006
Change-Id: Ieb185dbba052bdbff03caafc0cf5397a7f04dc6d
2013-08-20 21:29:05 +09:00
Lorenzo Colitti
df86a9f2e9 Make BaseNetworkObserver available to core code
Currently BaseNetworkObserver is in frameworks/base/services, but
there is code in frameworks/base/core that could use it. This
code typically extends INetworkManagementEventObserver.stub
because BaseNetworkObserver is not available.

Move BaseNetworkObserver to frameworks/base/core without changing
its package name, and use it to simplify two callers. The third
caller, Tethering, is much larger, and I'm not sure it's
appropriate to change it.

Bug: 10232006
Change-Id: Ifc0f2e619e3424e27e35730c048a1cc523df345e
2013-08-20 21:16:38 +09:00
Lorenzo Colitti
4faa027df0 Modify LinkProperties address update methods.
1. Make addLinkAddress a no-op if the address already exists.
2. Make addLinkAddress, addStackedLink and removeStackedLink
   return a boolean indicating whether something changed.
3. Add a removeLinkAddress method (currently there is no way of
   removing an address).
3. Move hasIPv6Address from ConnectivityService to
   LinkProperties, where it belongs.

Bug: 9625448
Bug: 10232006
Change-Id: If641d0198432a7a505e358c059171f25bc9f13d5
2013-08-20 21:16:37 +09:00
Lorenzo Colitti
6eb8a62a26 Add a string constructor to LinkAddress.
This will allow us to do new LinkAddress("2001:db8::1/64").

Bug: 10232006
Change-Id: If479bdbab16826afe9d82732215141841c282299
2013-08-20 14:19:20 +09:00
Yu Shan Emily Lau
9f9d48ce76 am 74596aaa: Merge "Add the checking for the camcorder profile." into klp-dev
* commit '74596aaa75ee648ca6593e98e94e76aa5a34ba4a':
  Add the checking for the camcorder profile.
2013-08-19 19:39:04 -07:00
Yu Shan Emily Lau
74596aaa75 Merge "Add the checking for the camcorder profile." into klp-dev 2013-08-20 02:36:53 +00:00
Yu Shan Emily Lau
c8d0756776 Add the checking for the camcorder profile.
Not all the devie have camera. Only run the
recording test when the camcorder profile is
not null.

Change-Id: Ib38df363fe5e6049b72e97ae229964fb65882269
2013-08-19 19:03:26 -07:00
Eric Laurent
d2bb835dd8 am 9f78d309: Merge "AudioSystem: new audioflinger restart detection" into klp-dev
* commit '9f78d309dc99668d5b06ca18af8b854be44cedfc':
  AudioSystem: new audioflinger restart detection
2013-08-19 18:36:28 -07:00
Eric Laurent
9f78d309dc Merge "AudioSystem: new audioflinger restart detection" into klp-dev 2013-08-20 01:33:27 +00:00
Eric Laurent
dfb881f96a AudioSystem: new audioflinger restart detection
Add a specific method to AudioSystem for AudioService to poll
for AudioFlinger service restart instead of relying on current
callback mechanism which is flaky.

Bug: 9693068.
Change-Id: Id21d142a22b257205700201978cce1cb8b15180d
2013-08-19 18:26:21 -07:00
Lorenzo Colitti
7515809107 am 743218d7: Merge "Display signal strength on data-only SIMs." into klp-dev
* commit '743218d7a121c02b0648f167e360518266e38419':
  Display signal strength on data-only SIMs.
2013-08-19 18:20:16 -07:00
Lorenzo Colitti
743218d7a1 Merge "Display signal strength on data-only SIMs." into klp-dev 2013-08-20 01:17:31 +00:00
Tom O'Neill
1f48b78e99 Add the API to set and read the location mode
- This will be more future-proof than the current GPS/NLP API

Change-Id: I9defe505e1372d9b601c3190eb49bd71604f04d1
2013-08-19 18:14:56 -07:00
Eric Laurent
6f1fda90a9 am 51d9652d: Merge "Revert "Fix media server restart detection mechanism"" into klp-dev
* commit '51d9652d45ec0a22b625a8529479ba61cdb55314':
  Revert "Fix media server restart detection mechanism"
2013-08-19 18:13:25 -07:00
Eric Laurent
51d9652d45 Merge "Revert "Fix media server restart detection mechanism"" into klp-dev 2013-08-20 01:11:50 +00:00
Eric Laurent
539719a7af Revert "Fix media server restart detection mechanism"
This reverts commit ca35e4823459189dd57ec5472caf3a617d03b568.
2013-08-19 17:44:30 -07:00
Jeff Brown
0bcd404542 am 194c140c: Merge changes Id3815fe8,I90a85921 into klp-dev
* commit '194c140c34d9f4874c64839c2e20ef61f41cbb97':
  Define AudioSource.REMOTE_SUBMIX.
  Remove setRemoteSubmixOn method.
2013-08-19 17:01:22 -07:00
Joe Fernandez
b8e6513e3b am 974e5975: am cf3aff67: am d1037efe: am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
* commit '974e5975d3bc16fd5b0db535ec825c045995d0fc':
  Android 4.3 Platform Google APIs r2 system image Release Notes
2013-08-19 16:57:51 -07:00
Jeff Brown
194c140c34 Merge changes Id3815fe8,I90a85921 into klp-dev
* changes:
  Define AudioSource.REMOTE_SUBMIX.
  Remove setRemoteSubmixOn method.
2013-08-19 23:57:11 +00:00
Joe Fernandez
974e5975d3 am cf3aff67: am d1037efe: am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
* commit 'cf3aff672ce9d7240de1e2e3cc98f21f833957ec':
  Android 4.3 Platform Google APIs r2 system image Release Notes
2013-08-19 16:55:10 -07:00
Joe Fernandez
cf3aff672c am d1037efe: am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
* commit 'd1037efe7edcc202c84cfd8a74c4593d1d03ea2d':
  Android 4.3 Platform Google APIs r2 system image Release Notes
2013-08-19 16:53:00 -07:00
Joe Fernandez
d1037efe7e am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
* commit '9d237204da9b000c5debfa1f5650d13a545bb7c8':
  Android 4.3 Platform Google APIs r2 system image Release Notes
2013-08-19 16:49:44 -07:00
Joe Fernandez
9d237204da Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs 2013-08-19 23:47:24 +00:00
Alan Viverette
058ac7cfe5 Use MULTI_LINE and OPENS_POPUP accessibility properties
BUG: 10391326
Change-Id: Ib2deeeef401802b6dde646e14ee5367141469a58
2013-08-19 16:44:30 -07:00
Joe Fernandez
312d29ed3d Android 4.3 Platform Google APIs r2 system image Release Notes
Google APIs System image update with Google Play Services 3.2.25

Change-Id: Iac6987a9dcb55bd971da9ca57c5a5dae0c357be5
2013-08-19 16:43:57 -07:00
Jeff Brown
64dfb604e7 Define AudioSource.REMOTE_SUBMIX.
Add an API to allow applications to record from the remote
submix when they have the required permissions.

Bug: 10265163
Change-Id: Id3815fe82a6713e058ce4b8ab6128a898481df7e
2013-08-19 16:42:07 -07:00
Alan Viverette
02f5680363 Add implicit parent dependency for Preferences
Also removes unused dependency change listener interface.

BUG: 10117838
Change-Id: I03f0eb37e7ba69942f7997a8b32adb38a3dee0bd
2013-08-19 16:32:56 -07:00
Craig Mautner
7b88aa7c12 am 00775127: Merge "Notify ViewRootImpl when it\'s safe to modify Canvas." into klp-dev
* commit '007751276c210c39bd405ae9fa69854e67e80951':
  Notify ViewRootImpl when it's safe to modify Canvas.
2013-08-19 16:16:27 -07:00
Craig Mautner
007751276c Merge "Notify ViewRootImpl when it's safe to modify Canvas." into klp-dev 2013-08-19 23:13:47 +00:00
John Du
48f8b5dbf6 Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()
BluetoothGatt.abortReliableWrite() should not take a BluetoothDevice
parameter. Instead, it should use mDevice instance variable.
bug 10152994

Change-Id: I7fc79b9011cf878414128cc9f1696e5ccc597056
2013-08-19 16:01:24 -07:00
Craig Mautner
bc57cd1b24 Notify ViewRootImpl when it's safe to modify Canvas.
When Activity.convert{To|From}Translucent() is called the
ViewRootImpl is now notified when it is safe to convert the Canvas
from translucent to opaque and back to translucent. This will make
it possible to save resources when compositing opaque layers.

Fixes bug 10349536.

Change-Id: I7282aee1d54601fb00611d20be204bf164d873f6
2013-08-19 15:47:42 -07:00
Eino-Ville Talvala
b5d5099b02 am b6c38e9d: Camera2: Remove redundant Keys classes
* commit 'b6c38e9de1a2824ce599d7074fa4a226926177c1':
  Camera2: Remove redundant Keys classes
2013-08-19 13:54:17 -07:00
Eino-Ville Talvala
b6c38e9de1 Camera2: Remove redundant Keys classes
Also update tests accordingly

Bug: 10345522
Change-Id: I8c7d17cdfbda6faba09134745a96089bf1b70cb7
2013-08-19 20:37:37 +00:00
Svetoslav
269403b032 Implemented advanced printer selection and API refactoring.
1. Added past printer history tracking and merging favorite printers
   with discovered printers.

2. Added save as PDF support.

3. Added all printers activity with search capability and optional
   add printers chooser (if any print service provides add printers
   activity)

4. Refactored the printer discovery session APIs. Now one session
   can have multiple window discovery windows and the session stores
   the printers found during past discovery periods.

5. Merged the print spooler and the print spooler service - much
   simpler and easier to maintain.

Change-Id: I4830b0eb6367e1c748b768a5ea9ea11baf36cfad
2013-08-19 13:24:11 -07:00
Martijn Coenen
b4ed624996 am b6e89439: Merge "NFC: Allow HostApduService to indicate transaction unhandled." into klp-dev
* commit 'b6e8943933f745f5e3f248ac058fc8dbca8f8ab1':
  NFC: Allow HostApduService to indicate transaction unhandled.
2013-08-19 13:16:34 -07:00
Tom O'Neill
184e75146c Warn that SettingInjectorService must be fast
- Move UPDATE_INTENT to SettingInjectorSErvice

Change-Id: I9c8f8dc0878647a051cb852721b3436e9d55b391
2013-08-19 13:13:21 -07:00
Martijn Coenen
b6e8943933 Merge "NFC: Allow HostApduService to indicate transaction unhandled." into klp-dev 2013-08-19 20:11:09 +00:00
Jeff Sharkey
f39b8d2c22 am 6b73eb28: Merge "Request more documents when EXTRA_HAS_MORE." into klp-dev
* commit '6b73eb28d734e9dd65d3551e43f7c41445fdc8c9':
  Request more documents when EXTRA_HAS_MORE.
2013-08-19 13:02:21 -07:00
Jeff Sharkey
6b73eb28d7 Merge "Request more documents when EXTRA_HAS_MORE." into klp-dev 2013-08-19 19:58:56 +00:00
Jeff Sharkey
dd5b9e38bb am f7e2a2e9: Merge "Management actions, invalidate caches." into klp-dev
* commit 'f7e2a2e96321f56c53cad01a69bd71b281900030':
  Management actions, invalidate caches.
2013-08-19 12:58:43 -07:00
Jeff Sharkey
f7e2a2e963 Merge "Management actions, invalidate caches." into klp-dev 2013-08-19 19:55:20 +00:00
Alan Viverette
ad9793501d am 92d2a318: Merge "Remove duplicate sealed node checks, add missing checks" into klp-dev
* commit '92d2a318074d8c5400d93bccfa6c5282125401ee':
  Remove duplicate sealed node checks, add missing checks
2013-08-19 12:51:53 -07:00
Alan Viverette
92d2a31807 Merge "Remove duplicate sealed node checks, add missing checks" into klp-dev 2013-08-19 19:50:29 +00:00