Commit Graph

41081 Commits

Author SHA1 Message Date
Yorke Lee
1d80a877d6 Merge "Unhide more ContactsContracts fields" 2014-06-26 18:42:03 +00:00
Yorke Lee
8d3700988e Unhide more ContactsContracts fields
These are needed for unbundling of Dialer/Contacts

Bug: 6948882
Change-Id: I1640387a44608acc9c737bebea9c4f77e774fab1
2014-06-27 11:23:33 -07:00
Andre Eisenbach
d0cba405bc Merge "LE: Hide new congestion constant for now" 2014-06-27 16:52:20 +00:00
Andre Eisenbach
fad6726724 LE: Hide new congestion constant for now
Change-Id: I86455be16bc3356a1ad24db6d6e6835cb299eb5f
2014-06-27 11:42:19 -07:00
George Mount
566cbf20cc Merge "Fix activity transitions enter transition." 2014-06-26 18:07:29 +00:00
George Mount
2eb983be20 Merge "Activity Transitions: change default behavior." 2014-06-27 16:52:20 +00:00
Andre Eisenbach
dadefdad8e LE: Add notification sent and congestion callbacks (3/4)
This change introduces two new callbacks for applications to better
handle LE notification flow control and transport congestion. The
notification callback is invoked when the remote platform confirms an
indication or when a local notification has been passed to the
controller. No new notifications should be sent until a callback is
received.

Congestion callbacks are triggered when a GATT operation cannot be sent
to the local Bluetooth controller. Repeatedly calling
writeCharacteristic() for example will eventually trigger a congestion
callback. Applications cannot send additional data until a further
callback is received, indicating that the congestion has cleared up.

Also made server callbacks "oneway" in the AIDL definition file.

Change-Id: I7fa3324712205c79efce58e5e3df8b80a265a442
2014-06-27 10:31:41 -07:00
George Mount
8885ac9518 Merge "Add IN/OUT flag for all Visibility transitions." 2014-06-26 17:57:04 +00:00
Hector Dearman
5622e8b669 Merge "Add Third Party Cookie API" 2014-06-26 21:23:48 +00:00
Yohei Yukawa
a1fda005f9 Use CharSequence instead of String in CursorAnchorInfo
This might be useful if we need to pass some spans from the
application to the input method through CursorAnchorInfo.

This change makes CursorAnchorInfo more consistent with other
input method APIs where CharSequence is preferred over String.

BUG: 15088391
Change-Id: Ie04e8a27050849fee1c93ef14b9944acc70fafe4
2014-06-27 16:23:09 +09:00
George Mount
18ab79967c Add IN/OUT flag for all Visibility transitions.
Bug 15758206

Change-Id: If9b1871117a6808c87adc84ab9215b913ebd2704
2014-06-26 07:30:11 -07:00
Hector Dearman
fc9a27aa5a Add Third Party Cookie API
Bug: 11678084
Change-Id: Ieb74fb6caae3d5a18dbfe748be47ebebad003cf7
2014-06-25 16:34:37 +01:00
George Mount
60625b02ac Fix activity transitions enter transition.
Bug 15851310

Change-Id: I25ccbe4466251eaa0991fc6f25713772871e5f7b
2014-06-24 15:23:28 -07:00
George Mount
abb63cb622 Activity Transitions: change default behavior.
Bug 15746767

The default for activity transitions with the material theme
should be to enable them when makeSceneTransitionAnimation is
used, but disable them when no ActivityOptions is used.

Change-Id: I4c777a72e4401b367e30b9ba971f7280646d5017
2014-06-24 07:01:27 -07:00
George Mount
a0a0260e48 Activity Transitions: Fix memory leak.
Bug 15731459

Change-Id: Id357d841a0db832e2525b7bbd75c8d8ccdb757d1
2014-06-24 06:39:29 -07:00
Alexandra Gherghina
70882cd654 Merge "Expose per-user APIs for content services." 2014-06-24 06:38:28 +00:00
Alexandra Gherghina
0363c3eb08 Expose per-user APIs for content services.
Bug: 15466880
Change-Id: Ib5a030e78559307627fe0d2e80ce6f1a7825109d
2014-06-26 10:47:19 +01:00
Lorenzo Colitti
309a75dbc3 Modify DNS server update methods.
1. Make addDnsServer not add duplicate servers and return a
   boolean value incating whether it changed anything. This is
   consistent with what we do for LinkAddresses and routes.
2. Add a setDnsServers method that sets all the DNS servers to
   the specified collection. This is consistent with what we do
   for LinkAddress.

Bug: 9180552
Change-Id: I5baed09253261b66ea42ae2ea82398118e3ab0ac
2014-06-26 17:04:38 +09:00
Christoph Studer
13a11d8ead Merge "Remove ZEN notification visibility setting" 2014-06-24 06:38:52 +00:00
Christoph Studer
d1b67bcd4e Remove ZEN notification visibility setting
Bug: 15286335
Change-Id: I150b13c6c7272db596bee908822760f1fd82b7ed
2014-06-24 18:37:19 +02:00
Christoph Studer
e71fefcc8b Remove notification APIs from StatusBar service
Bug: 15324972
Bug: 15436573
Change-Id: I838370a23fb07cb876e08c41ef11653f2658719e
2014-06-24 16:47:56 +02:00
Alexandra Gherghina
d4ee3952a3 Merge "Skip forwarding launcher intents" 2014-06-24 06:38:52 +00:00
Alexandra Gherghina
fa4533f3a0 Skip forwarding launcher intents
If we forward intents when looking up launcher icons, we end up
having an icon for a disambig activity instead of the apps for that user.

Bug: 15769854
Change-Id: Ia57525466dba57b6669b2b5cedf98f202d08f586
2014-06-24 19:25:15 +01:00
Jinsuk Kim
a09489c39e Merge "Handle incoming active source-related commands for HdmiControlService" 2014-06-24 01:52:26 +00:00
Jinsuk Kim
8333571bd5 Handle incoming active source-related commands for HdmiControlService
Handles incoming commands <Active Source>, <Inactive Source>, <Request
Active Source> that concern the active source update/report.

Defined mPrevPortId which is used to allow switching back to the input
set previously by <Active Source> or deviceSelect() when receiving
<Inactive Source>.

Also fixed a bug sending <Active Source> with wrong parameters.

Change-Id: I47fd804755c5c6beca38ddb21bb388a455d74f63
2014-06-27 07:06:33 +09:00
Zhijun He
e040418f47 Camera2: Add high speed video support
Below tags are added/updated:
- Add HIGH_SPEED_VIDEO in android.control.sceneMode
- android.control.availableHighSpeedVideoConfigurations

Change-Id: Ice2497c81d9feead7519f5d11f2bd5598093b4bc
2014-06-26 20:34:56 +00:00
Winson Chung
2cb86c7231 Saving last TaskDescription for TaskRecord.
Change-Id: I531e0fc661fdedeb78bee7d5472668de8e9c2104
2014-06-26 12:37:28 -07:00
Yin-Chia Yeh
0cd62d65dc Camera2: Add 3A maxRegions tag to legacy device
Change-Id: I8ab4164a7f4c6f210b000cb623cbc686e0e79a35
2014-06-26 18:26:17 +00:00
Paul Jensen
d5d80801d2 Merge "Use return values from JNI functions binding sockets and processes to networks." 2014-06-24 08:05:46 +00:00
Paul Jensen
32a58f00d3 Use return values from JNI functions binding sockets and processes to networks.
bug:15757549
Change-Id: If23b14febc923b9a0348f0cf9029fd4bf6e8d725
2014-06-26 16:33:58 +00:00
John Reck
cd0741d962 Merge "Animator refactoring & fixes" 2014-06-25 03:44:18 +00:00
John Reck
68bfe0a37a Animator refactoring & fixes
Tweaks animators to have less unnecessary refcounting

 Pull animator management out into seperate class

 More control to tweak animator lifecycle, such as doing
 Java-side handling of start delay by attaching but not
 starting the animator

Change-Id: I4ff8207580ca11fb38f45ef0007b406e0097281c
2014-06-26 10:45:43 -07:00
Jeff Davidson
a3b9ca5ade Merge "Use/expose the receiver's label as the scorer name." 2014-06-26 08:19:24 +00:00
Jeff Davidson
c741553644 Use/expose the receiver's label as the scorer name.
Allows scorer apps to set a custom name for the scoring functionality,
even if the app has other non-scoring responsibilities, in which case
the application's label would be too generic.

Bug: 15775300
Change-Id: I61a7d1966742d463508e6801b7845ced8392db84
2014-06-24 09:24:19 -07:00
Lorenzo Colitti
c0b9efa49e Merge "Teach LinkProperties whether it's provisioned or not." 2014-06-24 01:52:26 +00:00
Andre Eisenbach
631495609e Merge "Fix bug where GATT descriptors weren't being added to right characteristic" 2014-06-26 05:52:59 +00:00
Lorenzo Colitti
76ea6c68d3 Teach LinkProperties whether it's provisioned or not.
In IPv4, a link is provisioned when DHCP succeeds. In IPv6, a
there is no such signal, because addresses and DNS servers can
be notified by the kernel at different times.

Add an isProvisioned method that returns true if we believe that
enough information has configured to use a network. For IPv6,
this requires an IP address, default route, and DNS server. For
IPv4, this requires only an IPv4 address, because we support
static configuration that doesn't have a default route or DNS
server.

To do this we use the existing hasIPv4Address method, rename the
all-but unused hasIPv6Address method to hasGlobalIPv6Address
(which is what we want anyway) and add new hasIPv[46]DefaultRoute
and hasIPv[46]DnsServer methods.

Bug: 9180552
Change-Id: Ib2f5ff8af920f7b6f1edf0e2afaaa0edce9bc72d
2014-06-26 03:23:31 +09:00
Lorenzo Colitti
64c43b1948 Minor changes to RouteInfo.
1. Realize that mDestination can never be null and update the
   code accordingly.
2. Simplify isDefaultRoute.
3. Provide two new hidden utility methods, isIPv4Default() and
   isIPv6Default(), that can be used by LinkProperties to
   to determine if the system has connectivity.
4. Update tests.

Bug: 9180552
Change-Id: I85028d50556c888261d250925962bdedfe08e0c6
2014-06-25 18:22:12 +00:00
George Mount
88f5993692 Merge "Allow custom transitions from XML." 2014-06-25 03:44:18 +00:00
Mike J. Chen
2975c683bc Fix bug where GATT descriptors weren't being added to right characteristic
When there's more than one characteristic with the same UUID in
a service, the descriptors for the non-zero instanceID characteristics
were being assigned to the zero instanceID one, so descriptor
fetching wouldn't work.  This is particularly bad for HID devices
since separate reports would show up as multiple characteristics
with the same UUID but there'd be no way to identify them
without their descriptor attributes.

Change-Id: I92bb4be34aa941dd3c6750874bef2e8a261ded92
Signed-off-by: Mike J. Chen <mjchen@google.com>
2014-06-24 10:19:45 -07:00
Adrian Roos
dded065c86 Merge "Trust Agents: Add facility to request credential entry" 2014-06-24 06:38:28 +00:00
Adrian Roos
2c12cfa1d5 Trust Agents: Add facility to request credential entry
Bug: 15871777
Change-Id: I43c80151f6403ff62961aeb3dc7aafe049e18a62
2014-06-25 23:28:53 +02:00
Winson Chung
c286444f14 Merge "Use Task last active time to ensure we don't reload items for the cache." 2014-06-25 17:34:05 +00:00
Zhijun He
ed2fdb5656 Merge "Camera2: update supportedHardwareLevel" 2014-06-25 17:34:05 +00:00
Zhijun He
28288ca72c Camera2: update supportedHardwareLevel
Make the full hardware supportedHardwareLevel more accurately reflect the
spec requirement. Also fixed some other minor spec issues.

Change-Id: I7b55be03dcdeface15e73eff098f690f4f99a23f
2014-06-25 15:49:13 -07:00
Winson Chung
f1fbd77cf0 Use Task last active time to ensure we don't reload items for the cache.
Change-Id: I29206de0453f5d7d1370b27a27ef6d3594eff8e7
2014-06-24 18:09:00 -07:00
Igor Murashkin
5096defdaa camera2: (legacy) Write the JPEG size as part of the blob transport
This fixes StillCaptureTest#testStillPreviewCombination

Change-Id: Ifbaae7828b2efcc1a768c77ce50718abd7f691d0
2014-06-24 18:29:18 +00:00
Igor Murashkin
a296fece2b camera2: Fix cts test StillCaptureTest#testTakePicture
* Introduce 'fake' metadata for 3A+flash (hardcoded to support nothing)
(will be removed in a later release)

* Open the camera1 device in its own thread, so that the looper it
captures is also our own (and not the main looper)

* Set the picture size based on the size of the JPEG surface outputs

Change-Id: Iaeb5031c6b352115b73d2261a39d65347d75fdc8
2014-06-24 10:56:26 -07:00
John Spurlock
25b3b8e537 Merge "Create a basic doze dream in SystemUI." 2014-06-24 08:05:46 +00:00
Igor Murashkin
dcad4f8a6a Merge "camera2: Fix maxNumOutputs CTS test on Legacy devices" 2014-06-25 17:34:05 +00:00