53200 Commits

Author SHA1 Message Date
Alexandra Gherghina
7b79c17c1b Merge "Rename managed profile string" 2014-06-26 22:01:31 +00:00
Alexandra Gherghina
aaec57d0ae Rename managed profile string
Bug: 15827349
Change-Id: I61b80171e7b6010f062d2e0bfa950b6b47858edf
2014-06-27 10:30:07 +01:00
Yohei Yukawa
9a9c112737 Fix test failures due to unexpected overload resolution
Starting with Ie04e8a27050849fee1c93ef14b9944acc70fafe4,
CursorAnchorInfo#getComposingText() returns CharSequence rather
than String.  This causes unexpected overload resolution,
which results in test failures.

BUG: 15088391
Change-Id: I51e2b23573e92be7e5b1dcca6402e85364408215
2014-06-27 17:13:32 +09: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
Dan Stoza
0c9b72b09f Merge "SurfaceTexture: Allow creation in detached mode" 2014-06-26 18:02:09 +00:00
Dan Stoza
493f2e1190 SurfaceTexture: Allow creation in detached mode
Adds a constructor that doesn't require a GLES texture name and sets
up the SurfaceTexture in detached mode.

Bug: 15616428
Change-Id: I375495f481bfbe43b3830ab7d124cef8f1be0ac6
2014-06-26 13:36:19 -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
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
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
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
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
Baligh Uddin
8e27c6b20f Import translations. DO NOT MERGE
Change-Id: I4025ec551f09fb81735c85fab65d54cca7fe0835
Auto-generated-cl: translation import
2014-06-25 02:35:23 +00: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
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
Lorenzo Colitti
1603eadc5a Unbreak LinkPropertiesTest.
This was broken by the changes that made addRoute add routes
only if they did not already exist.

Change-Id: I1d227df9223fbecf106efde05b709f320824ee9d
2014-06-25 18:19:47 +00:00
Yorke Lee
5a2f488b70 Add REMOVE_VOICEMAIL permission to system
Add a permission that will allow any app that has this permission
to remove any voicemails in the user's call log, even those that
don't belong to it.

This will be needed for the unbundled dialer to be able to manage
the user's voicemails.

Bug: 6948882
Change-Id: Idca23ee83e541ba8aef24d6cb7fe09d5adac1e10
2014-06-25 10:12:31 -07:00
Jean-Michel Trivi
e4e223ced0 Merge "AudioTrack Java constructor with AudioAttributes and AudioFormat" 2014-06-25 03:33:37 +00:00
George Mount
88f5993692 Merge "Allow custom transitions from XML." 2014-06-25 03:44:18 +00:00
Jean-Michel Trivi
a1d80e3b1d AudioTrack Java constructor with AudioAttributes and AudioFormat
Change-Id: I82758a4231b8dc0b8d8e72acf3c896a289c28f60
2014-06-24 17:02:06 -07: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
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
Dianne Hackborn
04d480e1c3 Merge "Fix some problems with proc stats collection." 2014-06-24 17:32:43 +00:00
Dianne Hackborn
306af678a5 Fix some problems with proc stats collection.
Also start debugging why we aren't being able to open
/proc files.

Change-Id: I4655904691ac22108c29858cbd01153a251ccbf5
2014-06-24 15:41:03 -07:00
Christoph Studer
9e58b3c61c Merge "Remove notification APIs from StatusBar service" 2014-06-24 06:38:28 +00:00
Adrian Roos
239d99c4d3 Merge "Trust Agents: Add lock now facility to global actions" 2014-06-24 06:38:28 +00:00
Adrian Roos
d4d6136eb3 Trust Agents: Add lock now facility to global actions
Change-Id: I732d7e989892081f6b53142953de71f90ec62d37
2014-06-26 01:54:53 +02: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
Adrian Roos
dded065c86 Merge "Trust Agents: Add facility to request credential entry" 2014-06-24 06:38:28 +00: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
Andres Morales
d96e4948da Merge "interface for nfc handover supplicant commands" 2014-06-25 17:34:05 +00:00
John Reck
6487bccfff Merge "Change config_ui_enableFadingMarquee default to false" 2014-06-25 17:34:02 +00:00