17658 Commits

Author SHA1 Message Date
Jose Lima
4f8a92bd20 Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev 2014-05-30 01:41:18 +00:00
Jeff Brown
094b2136f0 resolved conflicts for merge of 92ab0b91 to master
Change-Id: I66d6849700759163669faa930f07a7e968df5155
2014-05-29 18:25:11 -07:00
Jeff Brown
92ab0b91cd am aeb4e071: Merge "Add dumpsys to dock observer." into klp-modular-dev
* commit 'aeb4e071abb100d10c39d154b05c2911d399395d':
  Add dumpsys to dock observer.
2014-05-30 01:01:17 +00:00
Jeff Brown
010e561a70 Add dumpsys to dock observer.
Minor refactoring of dock observer to allow its state to be
inspected and modified via dumpsys for debugging purposes.

eg. View current state.
adb shell dumpsys DockObserver

eg. Simulate being docked.
adb shell dumpsys DockObserver set state 1

eg. Reset back to normal.
adb shell dumpsys DockObserver reset

Change-Id: Ie48db775290ebed9aa4d9d9d5ac5a6fcb6122ac9
2014-05-29 17:48:33 -07:00
Eric Laurent
ae4506e9b5 indicate in and out audio device connection separately
Modified AudioService and WiredAccessoryManager to use separate
device connection indications for input and oputput devices in case
of combined devices like wired headset or BT SCO headset.

Change-Id: Ifebaaab177191e2f505824420a13998d7a424aec
2014-05-29 17:36:35 -07:00
Jinsuk Kim
b8861f8b6b Merge "Stop publishing HdmiCecService, start publishing HdmiControlService" 2014-05-29 21:36:47 +00:00
Christopher Tate
3d5e5c7b26 Merge "DO NOT MERGE Implementation of TaskManager reschedule/cancel" into lmp-preview-dev 2014-05-29 21:17:32 +00:00
Winson Chung
c5b5275b8d am 48e3f61c: Merge "Updating task view style, fixing performance on enter-recents animation." into lmp-preview-dev
* commit '48e3f61cfcd804575780d2958bd4e53420bd8266':
  Updating task view style, fixing performance on enter-recents animation.
2014-05-29 21:15:20 +00:00
Winson Chung
073c2e4ad1 Merge "Updating task view style, fixing performance on enter-recents animation." into lmp-preview-dev 2014-05-29 21:10:15 +00:00
Jinsuk Kim
8692fc68a4 Stop publishing HdmiCecService, start publishing HdmiControlService
HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
2014-05-29 21:09:43 +00:00
Winson Chung
24cf152483 Updating task view style, fixing performance on enter-recents animation.
Change-Id: I42ca9296170a93a14184ae8963abbd3f0494e503
2014-05-29 12:30:26 -07:00
RoboErik
79fa4630bb API changes to sessions
Changes requested by API Council review. A second CL will refactor
TransportController and TransportPerformer based on feedback.

Change-Id: Ie26a7d01d7021232a66c2edf1eb58120437fdfde
2014-05-29 11:28:48 -07:00
Chris Wren
8756a9897a Merge "add tests for ValidateNotificationPeople.getExtraPeople()" 2014-05-29 17:59:37 +00:00
Narayan Kamath
246469a355 Log process abis during start.
Adds to the info log that the activity manager emits
during every app launch.

Change-Id: Icd442334cb0e0e0fd0cc529c6b9c315a47d4aadc
2014-05-29 18:04:57 +01:00
Nicolas Prevot
1015efb143 Merge "Making the content resolver work with result intents." 2014-05-29 17:02:20 +00:00
Craig Mautner
7a18498559 am b5b37c2b: Merge "Add methods to coordinate unlock animation." into lmp-preview-dev
* commit 'b5b37c2babe744acb002ed9b8556a9d9cd2202fc':
  Add methods to coordinate unlock animation.
2014-05-29 16:52:13 +00:00
Craig Mautner
71ac80c46a Merge "Revert "Modify task navigation to return to recent tasks." DO NOT MERGE" into lmp-preview-dev 2014-05-29 16:51:24 +00:00
Craig Mautner
b9a6c8ad99 Revert "Modify task navigation to return to recent tasks." DO NOT MERGE
This reverts commit 1a4e211e03f1f795d935058e27356a0e8bc5df7c.

Change-Id: Ia691b93347c7eb2395933e5a5ba385ea94e08d6f
2014-05-29 16:50:59 +00:00
Craig Mautner
fdaaf91f35 Merge "Revert "Modify task navigation to return to recent tasks."" 2014-05-29 16:50:11 +00:00
Craig Mautner
719e621186 Revert "Modify task navigation to return to recent tasks."
This reverts commit 19174878e25ebfd8806595f83df7bdea1d239c07.

Change-Id: I98db2c9aa975495c5828b3d16b8b45f515e6a5fa
2014-05-29 16:49:41 +00:00
Craig Mautner
219d7a50fb Merge "Add methods to coordinate unlock animation." into lmp-preview-dev 2014-05-29 16:45:36 +00:00
Chris Wren
92af372fc6 add tests for ValidateNotificationPeople.getExtraPeople()
Change-Id: Ieb8acce58574c25cccce674b4494f75d96b57125
2014-05-29 16:14:31 +00:00
Nicolas Prevot
a422a07d29 Merge "Small fix related to Cross-profile intents." 2014-05-29 12:58:39 +00:00
Lorenzo Colitti
bce0106c41 Don't break things if a network goes back to CONNECTED.
Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected.  This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052

(cherry picked from commit cfff026ec47afc7e31f60f80e3deea7f4e2f9be5)

Change-Id: I52c2220e8f1d98fca765880be3040593e92722ed
2014-05-29 21:36:07 +09:00
Lorenzo Colitti
adbb17906e Merge "Don't break things if a network goes back to CONNECTED." 2014-05-29 12:25:46 +00:00
Nicolas Prevot
ad0634c50c Small fix related to Cross-profile intents.
Change-Id: Id4cadd051c337776451ed807a2edac6d869b372a
2014-05-29 13:11:31 +01:00
Nicolas Prevot
c6cf95c0f5 Making the content resolver work with result intents.
prepareToLeaveUser is called if necessary on result intents.
Adding the targetUserId to grantUriPermissionFromIntentLocked
This allows the GET_CONTENT intent to work across profiles.

Change-Id: Id81280c23247aeda7ad56e34af9b12a6f3a00a3c
2014-05-29 11:30:36 +01:00
Lorenzo Colitti
51ed158a94 Don't break things if a network goes back to CONNECTED.
Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected.  This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052
Change-Id: Ifd73558e5be452d9ef88c64cca429d5f302bf354
2014-05-29 19:19:54 +09:00
Dianne Hackborn
d3a5b916b1 am c2091a1f: Merge "Add system layer for voice interaction services." into lmp-preview-dev
* commit 'c2091a1fbc463941b3e42db36e369124ac3c1013':
  Add system layer for voice interaction services.
2014-05-29 09:42:56 +00:00
Christopher Tate
415f354134 am ba922631: Merge "Don\'t crash on boot" into lmp-preview-dev
* commit 'ba9226316df301fb612606f919aa69e109645c82':
  Don't crash on boot
2014-05-29 09:42:36 +00:00
Jinsuk Kim
3a2f74373a Do not reply with <Feature Abort> to CEC Broadcast message
Broadcast message is not targeted to a specific device but for
announcement. Individual reponse with <Feature Abort> is neither
necessary nor useful. Changed to send the message back only for
direct messages.

Change-Id: I927aa8e58a9868e158ed945c753492207e7c97f6
2014-05-29 05:17:16 +00:00
Jinsuk Kim
c3923ea50d Dispatch incoming CEC messages to feature actions
This CL dispatches incoming CEC messages to feature actions that
the service manages.

Change-Id: I9221d6a25648846327d00fe5404aaf1e8ec786ce
2014-05-29 05:16:41 +00:00
Jungshik Jang
cc5ef8c918 Implement device discovery sequence.
When device discover is launched it goes through the following step

1. clear all existing devices
2. send <Polling Message> of all logical addresses
  excecpt one of local device
3. Once got all allocated logical addresses, gather physical address of
  them
4. Once got physical address of them, gather display name of them
5. Once got display names, gather vendor id of them
5. Once got vendor id of them, register all gathered info to
  internal device info list.

Change-Id: Ic9aca3b15d88ac7650f10b6d0bfa9c97923975e8
2014-05-29 14:04:53 +09:00
Jungshik Jang
bab6ee2fa9 Merge "Add cec message handler to hdmi cec jni implementation" 2014-05-29 00:45:17 +00:00
Matthew Williams
9b9244b694 DO NOT MERGE Implementation of TaskManager reschedule/cancel
Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions
2014-05-29 00:45:02 +00:00
Adam Cohen
c1011c1d26 Merge "Fix security issue in bindRemoteViewsService" 2014-05-29 00:27:30 +00:00
Dianne Hackborn
a923758d80 Merge "Add system layer for voice interaction services." into lmp-preview-dev 2014-05-29 00:18:25 +00:00
Dianne Hackborn
e30e02f5d9 Add system layer for voice interaction services.
New window layer that voice interaction service windows
go in to.  Includes a new voice-specific content rectangle
that voice activities are placed in to.

Add specific animations for this layer, sliding down from
the top (though this can be customized by the voice interaction
service).

Also add the concept of activities running for voice interaction
services for purposes of adjusting the animation used for them,
again sliding from the top, but not (yet?) customizable by the
voice interaction service.

Change-Id: Ic9e0e8c843c2e2972d6abb4087dce0019326155d
2014-05-28 17:16:51 -07:00
Christopher Tate
56f2daab14 Merge "Don't crash on boot" into lmp-preview-dev 2014-05-28 23:37:30 +00:00
Christopher Tate
f889ed11d2 Don't crash on boot
...when removing dangling preferred-activity entries.

Bug 15310848

Change-Id: Ibe9d82a06f8c608b866a2c3c6b286da2ededacca
2014-05-28 16:31:58 -07:00
Brian Carlstrom
77b170cedc resolved conflicts for merge of 452c5921 to klp-modular-dev-plus-aosp
Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678
2014-05-28 16:10:53 -07:00
Brian Carlstrom
452c592191 am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '197565e0e800be3c731e679914f40afa1aab98fd':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:39 +00:00
Brian Carlstrom
5bc93866b0 Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175

(cherry-picked from commit 2ef5abb8d534f016582d6023054cbe69d8114b6b)

Change-Id: Icd91982c09076e87092906106cbff4a81589e8de
2014-05-28 14:53:40 -07:00
Brian Carlstrom
245b8f054b am a2260c26: Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev
* commit 'a2260c26fc2499e1338a25f6f787a8d48ae48ddf':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 21:44:55 +00:00
Brian Carlstrom
3c1ff826e0 Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175
Change-Id: I8afa91bddfb6fec6b61c39286a16594eb947830e
2014-05-28 14:31:47 -07:00
Christopher Tate
560ce61c59 Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-preview-dev 2014-05-28 19:03:03 +00:00
Dan Stoza
00f535845b Merge "SurfaceFlinger: Add sourceCrop to screenshot" 2014-05-28 18:31:38 +00:00
Amith Yamasani
d5ba868b0d Merge "Fix singleUser attribute" 2014-05-28 16:42:42 +00:00
Amith Yamasani
4b9d79c30e Fix singleUser attribute
Make it work correctly for singleton content providers.
Relax which apps can export singleton content providers.

Change-Id: I43d315c25ed76a876bfa6d5e0d1351bc19c9bdba
2014-05-28 09:39:36 -07:00
Christoph Studer
29fae7b394 am 1468841a: Merge "NoMan: Don\'t unbind system listeners" into lmp-preview-dev
* commit '1468841afc1431ddd0d3c843e41fa7a14c16e430':
  NoMan: Don't unbind system listeners
2014-05-28 12:13:14 +00:00