Commit Graph

37646 Commits

Author SHA1 Message Date
Zhijun He
5eaf6d2161 Merge "Camera2: Add timestampCalibration tag" 2014-06-13 21:09:46 +00:00
Zhijun He
45fa43a181 Camera2: Add timestampCalibration tag
Also update the video/optical stabilization docs.

Change-Id: I444cc8d46c0a460bc4311e58bf6166b5c6dbfd14
2014-06-13 18:29:37 -07:00
Selim Gurun
4473427f85 Merge "Address the API review" into lmp-preview-dev 2014-06-12 05:34:42 +00:00
Selim Gurun
ee89ab4dd5 Address the API review
Bug: 15432556

The api council asks to change the interface to an abstract class
and clarify the clearClientCertPreferences api. This change addresses
these.

Change-Id: I7979788c7c041bacbfef5ea4d94309f91279ef22
2014-06-13 10:53:55 -07:00
Sol Boucher
b8cee5175d camera2: Remove stray </p> in CameraDevice#createCaptureSession
This was causing strange indentation.
The change also clarifies how to get the supported output sizes in the
ImageReader flow: Although the doc (correctly) instructed the developer to use
StreamConfigurationMap#getOutputSizes(int) with an ImageReader, this instruction
appeared after the bulleted list of output types. Since all other items in that
list specify that getOutputSizes(Class<?>) should be used, the reader shouldn't
be expected to read beyond the list only in this specific case.

Bug: 15574400
Change-Id: Id952b46ae52322d75abbcaffea678d5ba50b22a5
2014-06-12 17:39:11 +00:00
Eino-Ville Talvala
fb587f4f6b Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev 2014-06-12 17:09:07 +00:00
Eino-Ville Talvala
5ae1ca5b69 camera2 docs: Fix instructions for using SurfaceView.
Bug: 15597178
Change-Id: I802369e61725451ddd8df855c384608c80e12693
2014-06-12 17:02:17 -07:00
Craig Mautner
d163e75189 Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
This reverts commit dd5c947170.

Change-Id: I7bac1aa1d96fa7922cc835949730a26204f15f2f
2014-06-13 17:39:35 -07:00
Alan Viverette
cebc6bab51 Support hotspots in View drawables
BUG: 15285217
Change-Id: Iad44454fe16ac27ed20b9c17ae2df69649339eed
2014-06-13 15:52:13 -07:00
Qiwen Zhao
677d4ae6ea Merge "Merge commit '0f3d3dd2'" 2014-06-13 21:09:46 +00:00
Qiwen Zhao
220cad6d97 Merge commit '0f3d3dd2'
Conflicts:
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
2014-06-13 14:43:51 -07:00
Zhijun He
0cb41fd5ad Merge "Camera2: Add rollingShutterSkew tag" 2014-06-13 21:09:46 +00:00
Zhijun He
0bda31afe0 Camera2: Add rollingShutterSkew tag
Change-Id: Icbedaeda9fc64a9dda509493ad9d14569c56cd18
2014-06-13 14:38:39 -07:00
Justin Koh
0f3d3dd26c am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly."
* commit 'dd5c94717077c9366dee364c88a86a78e5ee2688':
  Revert "Close ActivityView and ActivityContainer cleanly."
2014-06-13 17:27:48 +00:00
Justin Koh
dd5c947170 Revert "Close ActivityView and ActivityContainer cleanly."
This reverts commit 4a9f129874.

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2
2014-06-13 09:55:09 -07:00
Craig Mautner
f5030ecbca am 4a9f1298: Close ActivityView and ActivityContainer cleanly.
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.
2014-06-12 00:00:17 +00:00
Craig Mautner
4a9f129874 Close ActivityView and ActivityContainer cleanly.
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
2014-06-11 16:33:00 -07:00
Wink Saville
24683f1e15 Merge "Merge kwd to master" 2014-06-12 05:34:42 +00:00
Wink Saville
fb40dd4d00 Merge kwd to master
Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
2014-06-13 13:30:57 +00:00
Przemyslaw Szczepaniak
6dfa6e2a9b Fix typo and broken sdk build.
Change-Id: Icd1641955d1ca88396219db05312a4a9fd77ea80
2014-06-13 13:43:26 +01:00
Przemyslaw Szczepaniak
e31ab2d8fc Merge "Expose "default tts locale" to the TTS V2 API." 2014-06-11 15:57:38 +00:00
Przemyslaw Szczepaniak
1b5637ee32 Expose "default tts locale" to the TTS V2 API.
This change allows TTS V2 API client applications to honor the
"default TTS locale" set by the user in the TTS settings.

Note that the TTS V1 API uses 3 character country/language codes
for locale encoding. It's the only system component that does
that. TTS V2 uses the standard, valid Locale objects. The default
TTS locale setting was stored as a 3 character locale string with
"-" as the separator.

This change switches the TTS locale setting format to the output of
Locale.toString() call (on a valid Locale object). Methods used for
reading this value can interpret both forms and try to return a valid
Locale object as an output.

Change-Id: Ice2e6c25a43eb9dd6e17d371ee582c2dae3329c9
2014-06-11 13:49:48 +01:00
John Reck
5efb7a2776 Merge "Don't buildLayer if size == 0" 2014-06-11 08:41:11 +00:00
John Reck
1e96bdf344 Don't buildLayer if size == 0
Bug: 15598692

Change-Id: Ia4e9e68c712b318b8d66e8cdfb2aceda4e892289
2014-06-13 13:01:28 -07:00
Selim Gurun
4ffd507e67 am a5aa4b48: Merge "Address the API review" into lmp-preview-dev
* commit 'a5aa4b4879761a93c936303cf5c34d499aa0fe76':
  Address the API review
2014-06-13 19:25:35 +00:00
Mike Lockwood
94b59de852 BluetoothAvrcpController: Move AVRCP controller support to new BluetoothProfile subclass
Change-Id: Id988040a7ce623ed68e0349920301ff48db1fbce
2014-06-13 09:06:36 -07:00
Hemant Gupta
3b76a4b2b6 Add Support for AVRCP Controller Feature
- Provide support for AVRCP Controller CAT 1 and CAT 2
    passthrough commands.

Change-Id: Iefbb7fcd6273c49dc8a305b7a25ec6e94c60a5a9
2014-06-13 09:06:36 -07:00
Mike Lockwood
2263dd1ddd BluetoothA2dpSink: Add new BluetoothProfile subclass for A2DP sink
Change-Id: I09d5cb8fdaea4c4828f333949b7c18deffd22722
2014-06-13 09:06:35 -07:00
Mike Lockwood
0b611b5f3b Add BluetoothHeadsetClientCall.toString method
Change-Id: I8a95fda4f67daa09dfefedffec804c06af53ebe0
2014-06-13 09:06:35 -07:00
Mike Lockwood
cf916d3467 Rename BluetoothHandsfreeClient to BluetoothHeadsetClient
This makes our terminology consistent with the existing BluetoothHeadset profile

Also updated arguments to Context.bindService()

Change-Id: I27cc5a6fde256b1f5dccca53a7a15ec8f58691c2
2014-06-13 09:06:35 -07:00
Hemant Gupta
7aca90fcc0 Bluetooth: Add support for HFP Client role.
Implementation changes in frameworks to support
HFP Client role.

Change-Id: Ifb10527cd6c1301297cae4f923b20734af672034
2014-06-13 09:06:35 -07:00
Amith Yamasani
1d11436eae Merge "Undo some API changes that affect third party launcher writers" into lmp-preview-dev 2014-06-10 21:44:22 +00:00
Amith Yamasani
992fdbeff2 Undo some API changes that affect third party launcher writers
Remove hidden interface methods that were added temporarily for
launcher compatibility. These cannot be implemented by third parties
if they're hidden from the SDK.

Bug: 15574383
Change-Id: I976256da4278b7077f8d357e971e8cadb4d2d686
2014-06-12 13:37:43 -07:00
Adam Powell
720924b6a9 Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout
Fix a bug where ActionBarOverlayLayout was using a private constructor
of WindowInsets to return empty insets that should have been marked
fully consumed. This caused dispatch to further child views not to
stop appropriately, corrupting application layout in some cases.

Bug 15588587

Change-Id: I97fcefa4755addf2385a7e7b0ffbf6d3e91adc5c
2014-06-12 14:53:10 -07:00
Robert Greenwalt
a83ce3451d Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev 2014-06-12 03:30:50 +00:00
Robert Greenwalt
6078b50b01 Apply API Council comments to ConnectivityManager
rename isNetworkActive -> isDefaultNetworkActive
rename registerNetworkActiveListener -> registerDefaultNetworkActiveListener
make listenForNetwork/requestNetwork take a NetworkRequest
rename NetworkCallbackListener -> NetworkCallback
rename listenForNetwork -> registerNetworkCallback
rename releaseNetworkRequest -> unregisterNetworkCallback
remove NetworkRequest param from NetworkCallback functions
rename onNetworkCapabilitiesChagned to onCapabilitiesChanged
remove onReleased
change time units in onLosing from Sec -> ms

bug: 15142362
Change-Id: Ibc96e3f461706efe1eafa0d85605249cfd6e9fdd
2014-06-11 23:17:46 -07:00
Robert Greenwalt
f09d128517 Merge "Fix wifi connectivity issues." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Sreeram Ramachandran
fb7690d4e1 Fix wifi connectivity issues.
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.

So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.

Bug: 15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556
2014-06-11 23:02:59 +00:00
Adam Powell
0d9fdbad75 Explicitly track consumed state for WindowInsets
Treating 0-insets as fully consumed is incorrect since it means that
you can't dispatch empty insets down the view hierarchy - traversal
terminates immediately. Track consumed state independent of actual
values. Replacing a given set of insets with all zeroes will mark it
consumed.

Bug 15341653

Change-Id: I55b33b7dfbf4cae1e906a82140537156cffdbf47
2014-06-11 15:35:51 -07:00
Robert Greenwalt
594b456b6e Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Robert Greenwalt
55213c8022 Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Sreeram Ramachandran
6307b35e1d Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
(cherry picked from commit 7d3b4b9a3d4de9673119632da0ebd583e50126f7)
2014-06-11 16:32:21 -07:00
Robert Greenwalt
7569f1811f Make NetworkCapabilities publicly immutable.
Applying API council comments.

bug: 15142362

(cherry picked from commit Ie0bde68b72656a676d90c0343b9756fe9268d8d6)
Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6
2014-06-11 23:29:39 +00:00
Lorenzo Colitti
00a0fd650b Minor changes to the LinkAddress API docs.
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
   callers in frameworks/base and add a shim method and a TODO
   for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
   one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
   been </ul>).
4. Remove the documentation that talks about creating
   LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
(cherry picked from commit 9ab53650cfcd91a2a151b44b3fd1381841f76269)
2014-06-11 18:52:19 +00:00
Dianne Hackborn
34468351ed Merge "Fix calling startConfirmation instead of startCommand." into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Dianne Hackborn
94d9370142 Fix calling startConfirmation instead of startCommand.
Duh!

Change-Id: Ia9785a1ab37e38b7a044c2d389a1015a209654c9
2014-06-11 13:23:18 -07:00
Eino-Ville Talvala
486ed08899 Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev 2014-06-11 08:41:11 +00:00
Robert Greenwalt
8fe0d0c84c Merge "Fix public API of LinkProperties." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Robert Greenwalt
25702b3967 Fix public API of LinkProperties.
bug:15142362
(cherry picked from commit 51d898fd0223a4b7c728980ab987dd985c02df5f)
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
2014-06-10 15:42:19 -07:00
Eino-Ville Talvala
e600d6ad60 Camera2: Misc + enum value documentation updates
- Update enum values for many entries
- Reword various sections of documentation for clarity.

Bug: 15475465
Change-Id: I2b03cac8d478e945c7d93717845a9ae44b97639b
2014-06-10 15:12:46 -07:00