17425 Commits

Author SHA1 Message Date
Jae Seo
3c784d6359 Merge "Put TV Input Framework under android.media.tv, including TvContract" into lmp-preview-dev 2014-06-02 21:03:58 +00:00
Craig Mautner
481acb86e4 Merge "Compare task userId with userId profiles." into lmp-preview-dev 2014-06-02 20:40:16 +00:00
Jae Seo
d5cc4a281e Put TV Input Framework under android.media.tv, including TvContract
Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
2014-06-02 11:02:52 -07:00
Craig Mautner
e0d50cc15b Compare task userId with userId profiles.
Change comparison of Task.mUserId from comparing with only the
current user id to comparing with all current profile user ids.

Fixes bug 14930145.

Change-Id: Ibbae08da6f4eaa31b171becdd8957293758f527b
2014-06-02 10:11:53 -07:00
RoboErik
e78755e180 Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev 2014-06-02 17:10:07 +00:00
Jungshik Jang
3ef57d99b3 DO NOT MERGE: Start Device Discovery after logical address allocation.
Usually TV initiates Device Discovery sequence after logical address
allocation of local devices. For that added new callback interface
to AddressAllocationCallback to HdmiCecDevice.
Along with this, add onAddressAllocated to HdmiLocalDevice so that
start sending local device information once logical allocation is done.

Change-Id: I4cdc5dd7770674a17a0f23c383a6c1ca221e3104
2014-06-02 11:07:25 +09:00
Jinsuk Kim
e74282b70b DO NOT MERGE: 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-06-02 11:02:51 +09:00
Jinsuk Kim
48a0729d62 DO NOT MERGE: 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-06-02 11:01:45 +09:00
Jinsuk Kim
e1e63c7c54 DO NOT MERGE: Dispatch incoming CEC messages to feature actions
This CL dispatches incoming CEC messages to feature actions that
the service manages.

Change-Id: I9221d6a25648846327d00fe5404aaf1e8ec786ce
2014-06-02 11:00:55 +09:00
Jungshik Jang
d42a7a322b DO NOT MERGE: 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-06-02 10:59:03 +09:00
Jinsuk Kim
a8fd44b74b DO NOT MERGE: Fix a couple of bugs in CEC services
- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable

Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
2014-06-02 10:58:02 +09:00
Jungshik Jang
c47e26ca2f DO NOT MERGE: Add cec message handler to hdmi cec jni implementation
Notification for incoming cec message can be issued
from any thread but jni can call java method
in the thread that jni knows like service thread.
So this change delegates incoming message to
jni-friendly thread, service thread by exploit
looper of service thread.

Change-Id: If3b141d917df3e209912af1778eb509777199969
2014-06-02 10:55:50 +09:00
Jinsuk Kim
2c2a301762 DO NOT MERGE: Fix a bug using wrong addresses for CEC logical address allocation
Change-Id: I41da586c16dca4f325d147bb3abe5d4e09f7b91c
2014-06-02 10:54:53 +09:00
Jinsuk Kim
16e24a2d14 DO NOT MERGE: Hook up the CEC playback API to service internal logic.
This change enables CEC playback API (oneTouchPlay, queryDisplayStatus).
Also updated local device list type to SparseArray to make it easy
to get one based on device type.

Change-Id: I6f88b2dac2d873c493a90411549a4e5719a5e460
2014-06-02 10:53:58 +09:00
Jungshik Jang
562ef5c513 DO NOT MERGE: Add HdmiCecDeviceInfo to HdmiCecLocalDevice
As HdmiCecLoclaDevice is a wrapper for local devices
it should include cec device info.

Change-Id: I479665b2aa6bd56470b79dbbb7fb1015f6356090
2014-06-02 10:50:37 +09:00
Jungshik Jang
9d499bfe4a DO NOT MERGE: Implement <Polling Message>.
When Device Discovery is launched or Hot-plug detection is
launched, the first step of it is to send <Polling Message>
to all remote devices. According to type of feature,
it may have different retry count for sending <Polling Message>.

As <Polling Message> to all devices should be serialized operation
it runs on io thread as single operation.

Along with this, added assertRunOnIoThread and
assertRunOnServiceThread used to make sure that all methods are
called in proper thread.

Change-Id: I2d2df0216867c188e99ba24b216ec73f3396eeae
2014-06-02 10:48:57 +09:00
Yuncheol Heo
61ced38d61 DO NOT MERGE: Add the constants for the callback result of SendCecCommand().
- Move the send failure warning messages into HdmiCecController.sendCommand()
  from each Actions.
- Stringfy with more detail messages for some opcodes.

Change-Id: Ib7ce24dd2a1f290e6c3a0b26738772ef1d4a9630
2014-06-02 10:46:36 +09:00
Jinsuk Kim
47927f756a DO NOT MERGE: CEC Initialization per device type
CEC initialization may vary from device type to type. Changed logical address
map to HdmiCecLocalDevice map to handle it. These per-type classes for local
device will be extended also to take care of incoming CEC commands that should
require different action based on device type.

Change-Id: Ia59a464607b14e942fcf83e63aa1d6310ca6a575
2014-06-02 10:45:18 +09:00
Jungshik Jang
404d704158 DO NOT MERGE: Add SendMessageCallback to Hdmi control service.
As we have separate IO thread, we should have async callback
mechanism to get result of send request.
For that, I added SendMessageCallback interface to HdmiControl
Service
Along with this, replace message-based IO handling with
post Runnable based one for consistency

Change-Id: I61cf5b751b4f2af3b34956060869f3512f161d11
2014-06-02 10:42:03 +09:00
Dongwon Kang
0bf8a21464 Merge "Add a path for generic event from a session to an application in Tv Input Framework." into lmp-preview-dev 2014-06-01 23:09:31 +00:00
Jorim Jaggi
d48d7a6d50 Merge "Fade scrim in unlock animation." into lmp-preview-dev 2014-05-31 01:09:19 +00:00
Jorim Jaggi
e29b2dbc76 Fade scrim in unlock animation.
This also introduces a startTime which gets sent from window manager
to SystemUI, which tells when the animation should start, to allow
for a more synchronized animation with fading out the scrim and
fading in the activity behind.

Bug: 15163546
Change-Id: I16212b1ef9eb76f1f98734da1d14fc5b7e626937
2014-05-31 02:48:06 +02:00
Jeff Sharkey
05dc18d69a Merge "Per-app media directories on external storage." into lmp-preview-dev 2014-05-30 23:47:00 +00:00
Jeff Sharkey
2ee3c1e189 Per-app media directories on external storage.
This change defines per-app directories on external storage that
will be scanned and included in MediaStore.  This gives apps a way
to write content to secondary shared storage in a way that can
easily be surfaced to other apps.

Bug: 14382377
Change-Id: I4cb367c870509e76f0c2c598f01e2f699780030a
2014-05-30 16:26:45 -07:00
RoboErik
b69ffd4dc2 Minimum work to make volume handling work with sessions
This is the minimum change to make adjusting volume work with
MediaSessions. This only affects adjusting the volume and adjusting
the volume with a suggested stream. Adjusting a specific stream or
setting a specific stream will still use the same code.

This does not fix existing remote volume handling in RCC, which
will require a separate change to MediaController.

Change-Id: I5b957ff4bece1ee11e2364e1f216e1c08343c983
2014-05-30 15:47:58 -07:00
RoboErik
283c907a6a Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev
* changes:
  Refactor transport controls APIs
  API changes to sessions
2014-05-30 22:18:54 +00:00
Chris Wren
99f963ea04 Add people signals to Zen mode.
Depends-On: I51fcf689ddbee7715e3387b865f18a715887c943
Change-Id: I7c91dec1afeb54505426c4da59ec4d072a60c240
2014-05-30 16:16:23 -04:00
Chris Wren
4f0e39a929 Merge "Track Zen Mode status in the NotificationRecord" into lmp-preview-dev 2014-05-30 20:15:38 +00:00
Chris Wren
333a61c3a5 Track Zen Mode status in the NotificationRecord
This requires the record to be present in makeRankingUpdateForListener,
however, if the ranking object is created before the post to the handler,
then no cloning is necessary.

Depends-On: I907a1ff28123219db1c08889d723ad1b70b191ab
Change-Id: I51fcf689ddbee7715e3387b865f18a715887c943
2014-05-30 16:09:51 -04:00
Sreeram Ramachandran
515350a5e2 Support legacy routes added by apps via ensureRouteToHost().
Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9
(cherry picked from commit fb17b32550de624b7f476b70b7a2fc77f31dde7d)
2014-05-30 18:21:34 +00:00
Dianne Hackborn
20d9474904 More work on voice interaction visuals.
There is now a special theme for voice interaction activities
to use, so they can be a panel that is better intergrated with
the rest of the voice interaction experience.  This is still
not completely working, I have some hacks in the demo app to
get it right; I'll fix that in a future change.

Also improve VoiceInteractor to be retained across activity
instances, for things like rotation.

And bump up the number of concurrent broadcasts that are allowed
on non-svelte devices, since they can handle more and this makes
the boot experience better when dispatching BOOT_COMPLETED.

Change-Id: Ie86b5fd09b928da20d645ec2200577dee3e6889d
2014-05-30 10:06:16 -07:00
Youngsang Cho
832860fb9f Add a path for generic event from a session to an application in Tv Input Framework.
Plus, Video size changed event is also added.

Bug: 14126559
Change-Id: I04c553481fbaf8d92adbcc34f3c9d26acc87b361
2014-05-29 21:04:52 -07:00
Jose Lima
4f8a92bd20 Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev 2014-05-30 01:41:18 +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
073c2e4ad1 Merge "Updating task view style, fixing performance on enter-recents animation." into lmp-preview-dev 2014-05-29 21:10:15 +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
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
219d7a50fb Merge "Add methods to coordinate unlock animation." into lmp-preview-dev 2014-05-29 16:45:36 +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
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
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
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
Christoph Studer
19a81a616f Merge "NoMan: Don't unbind system listeners" into lmp-preview-dev 2014-05-28 12:10:34 +00:00
Jose Lima
58e66d69f9 Only allow 1 Stack on Leanback-only devices
- For Leanback only devices we will force all activities to
   live in the same app stack. This is a design decision for the
   shy/gregarious changes we are planning to implement for
   leanback devices.

Change-Id: I5e65f9b079830a9485b5a136700993755c3f555f
2014-05-27 20:55:11 -07:00