Commit Graph

41058 Commits

Author SHA1 Message Date
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
93e6d9db78 Initial RDNSS tracking implementation.
Add a DnsServerRepository to NetlinkTracker that keeps track of
IPv6 DNS servers received via RDNSS. It supports expiring
existing DNS servers when their lifetimes go below zero and
keeping track of more than just the 2 or 3 DNS servers that are
currently in use, so that if they all expire DNS will continue to
work.

It does not yet expire DNS servers using timers, only when a new
update comes in.

Bug: 9180552
Change-Id: I455699076198f43570a3b0b8ec7e5967514d6086
2014-06-27 01:06:21 +09:00
Paul Jensen
b5f6bf7ad1 Merge "Convert BluetoothTetheringDataTracker into a NetworkFactory." 2014-06-24 07:59:24 +00:00
Paul Jensen
81c884ee52 Convert BluetoothTetheringDataTracker into a NetworkFactory.
bug:15407087

Change-Id: I0437ca52dedf73e8ec69ac82e46353f6fafc4a42
2014-06-26 09:13:51 -04:00
Ang Li
39e7a54568 Merge "Fix comment for sendData." 2014-06-26 08:19:24 +00:00
Ang Li
707fd39f8b Fix comment for sendData.
Merging kwd commit dfb40d5c51411b0d10ec22a9af283f349d8904d7
Change-Id: I5f3c16f3e99dce8bbb0011af3322ce3e6487d6d9
2014-06-25 13:45:42 -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
Ruben Brunk
ef14da3280 camera2: Fix handling for abandoned bufferqueues.
Bug: 15116722

- Adds exception handling utility for legacy device.
- Skip/ignore abandoned surfaces in legacy camera.

Change-Id: Id4de587779d3bc2415e22b10bcc841cc46ac5f1d
2014-06-25 13:00:50 -07:00
George Mount
bcd8365197 Merge "Activity Transitions: Don't do a shared element exit transition twice." 2014-06-25 17:34:05 +00:00
George Mount
1677b6b830 Merge "Activity Transitions: Fix memory leak." 2014-06-25 17:34:02 +00:00
George Mount
5770f18e82 Merge "Activity Transitions: don't require transitionName." 2014-06-25 17:34:07 +00: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
George Mount
f451d8a6d1 Activity Transitions: Don't do a shared element exit transition twice.
Bug 15671433

Change-Id: I888702df5661c769cc1c093d859fd85e5e33d282
2014-06-24 06:57:08 -07:00
George Mount
a0a0260e48 Activity Transitions: Fix memory leak.
Bug 15731459

Change-Id: Id357d841a0db832e2525b7bbd75c8d8ccdb757d1
2014-06-24 06:39:29 -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
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
Igor Murashkin
e1968f6f9d camera2: Fix maxNumOutputs CTS test on Legacy devices
Change-Id: Ice2ee8490438b84d9a99d6179dca248491557694
2014-06-25 14:04:26 -07:00
John Spurlock
bf37099250 Create a basic doze dream in SystemUI.
The doze dream is not configured by default.

When configured, the doze dream does not show anything by default.
It teases a dark version of the keyguard (showing only the time
and notifications) when a notification arrives or significant motion
is detected.

Bug:15863249
Change-Id: Icfceb054d35d6fd4d9178eda7480e2464873ca4b
2014-06-25 13:33:09 -04:00
Christoph Studer
9e58b3c61c Merge "Remove notification APIs from StatusBar service" 2014-06-24 06:38:28 +00:00
George Mount
1fecfb2ddc Activity Transitions: don't require transitionName.
Bug 15585623
Bug 15607591

Exit transitions now run because exit transitions are executed
with startActivity.

Change-Id: Ie55793a9514c64d96e2cf1abdd2d39c4d2606a23
2014-06-23 17:06:13 -07:00
Bo Liu
bbc9cd32d7 Merge "Remove View.executeHardwareAction" 2014-06-23 21:56:00 +00:00
Bo Liu
26cab31d78 Remove View.executeHardwareAction
Webview does not need this anymore.

BUG: 13961296
Change-Id: Ia0681dea35155513b916844ecf83faf6d544a2e3
2014-06-23 14:57:19 -07:00
Adam Powell
755c919ba2 Merge "Set the default content description for Toolbars acting as action bars" 2014-06-23 21:50:10 +00:00
Adam Powell
7901b2a549 Set the default content description for Toolbars acting as action bars
Bug 15814044

Change-Id: I07c20de1349cb07f21eaf0db718da94c0ba7043d
2014-06-24 17:32:06 -07:00
Adam Powell
4212d1f2e9 Merge "Inflate fragments from layout into child FragmentManagers" 2014-06-23 21:50:10 +00:00
Adam Powell
371a809179 Inflate fragments from layout into child FragmentManagers
Previously, if an app inflated a layout in a Fragment's onCreateView
that itself had fragments included, those fragments would be added to
the Activity-level FragmentManager and would not share the same
lifecycle with the fragment it was inflated for. This led to some
nasty management headaches.

If an app targets L or above, add the fragment to the child
FragmentManager of the current fragment when inflated using the
LayoutInflater passed to the parent fragment.

Bug 12763389

Change-Id: Iad4ed7d5df602aea9579bf1503e206fa894630c1
2014-06-24 12:29:32 -07:00
Yigit Boyar
e8c8617c28 Merge "Clone animators before running in StateListAnimator" 2014-06-23 21:50:10 +00:00
Jason Monk
7218e9c6be Merge "The profile owner shouldn't control lock task" 2014-06-24 07:59:24 +00:00
Jason Monk
c5185f2bf1 The profile owner shouldn't control lock task
Since managed profiles are started on bootup, the managed profile
would be allowed to set an app (possibly itself) as a lock task
app and then run itself on bootup and constantly control the
device.  This privelege should be restricted to device owners.

Change-Id: I4a93aabd6054cbe75076ef0517fce03ffa74dc93
2014-06-24 14:12:20 -04:00