3013 Commits

Author SHA1 Message Date
Jinsuk Kim
f860be88a9 Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev 2014-08-21 05:53:51 +00:00
Jinsuk Kim
2626958c4b CEC: Fix a bug not sending <Set Stream Path>
Passes the right flag to manual routing switching method for TV
to send out <Set Stream Path> to the newly selected device(path).

Bug: 17169555
Change-Id: I4a14925e366a433f36b28170e37d041053c0060d
2014-08-21 14:31:40 +09:00
Jinsuk Kim
6800cddd6f Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev 2014-08-21 05:26:19 +00:00
Jae Seo
14355950d5 API Review: android.media.tv
TvContentRating:
- The XML file: attributes should have android: prefix and should allow
  string resource references for labels.

Bug: 17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
2014-08-20 20:59:51 -07:00
Jinsuk Kim
e9f6ed3b11 CEC: Invoke input change for RAP request from MHL device
Transform RAP[ContentOn/Off] to input change event.

Bug: 17141884
Change-Id: Ic2d8e305f482ebb4f4f3b3e167f726a66dc174cf
2014-08-21 12:54:18 +09:00
Lorenzo Colitti
827296b7dd Merge "Update state to failed if the VPN fails to connect." into lmp-dev 2014-08-21 00:11:43 +00:00
Lorenzo Colitti
438406092e Update state to failed if the VPN fails to connect.
Without this, the VPN settings dialog stays in "Connecting..."
forever.

Bug: 17140195
Change-Id: I4771be464384b62114839523fb2a6b36aa6520ee
2014-08-20 16:01:44 -07:00
Jeff Davidson
c8f0ffa297 Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev 2014-08-20 21:47:20 +00:00
Jeff Davidson
05542603dd Less intrusive VPN dialog and other UX tweaks.
-The ability to launch VPNs is now sticky; once approved by the user,
further approvals are not needed UNLESS the connection is revoked in
Quick Settings.

-The old persistent notification has been removed in favor of the new
Quick Settings UI.

-The name of the VPN app is now pulled from the label of the VPN
service rather than the app itself, if one is set.

Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
2014-08-20 16:55:28 -07:00
Diego Pontoriero
3f38f72a1b Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev 2014-08-20 21:47:20 +00:00
Jason Monk
abc2358778 Merge "Lock task doesn't always end properly." into lmp-dev 2014-08-20 20:15:45 +00:00
Jason Monk
835495c117 Lock task doesn't always end properly.
This can result in the keyguard not being re-enabled, the status
bar being in a bad state, and various other weirdness.  When a task
is going away, it needs to send the standard lock task ending
messages so that exiting the state can be handled properly.

Bug: 16010327
Change-Id: Id7ee632f4765af0af209b70fb69dd75f2e541820
2014-08-20 15:29:06 -04:00
Adrian Roos
550bd55257 Merge "Allow SystemUI to control Bluetooth for secondary users" into lmp-dev 2014-08-16 04:36:39 +00:00
Jeff Sharkey
ed118e1e9f Merge "More progress towards split APKs in ASECs." into lmp-dev 2014-08-19 02:43:23 +00:00
Jeff Sharkey
bb7b7bea19 More progress towards split APKs in ASECs.
Teach DefaultContainerService to install split APKs, which will be
needed when moving to/from ASECs.  Also support forward locking for
testing purposes, even though its deprecated.

Move native library unpacking code to NativeLibraryHelper location
where it can be shared by both DCS and PMS.  Also update footprint
calculation logic to mirror the later unpack codepaths.

Immediately persist sealed sessions.  When resolving install
locations, prefer location of any existing install of that
package.  Lightweight parse requesting certificates now always
verifies that all contents are signed correctly.

Bug: 16514385
Change-Id: Ida1c4eb0f95b065104dd971e19126d4085ebf1f0
2014-08-20 12:47:27 -07:00
Michael Lentine
0c9a62dc8d Reduce shutdown animation duration.
Change-Id: Idb58e8ff9a7e05c6f3d6964970b32a6aa69615c1
2014-08-20 13:19:14 -07:00
Adrian Roos
bd9a9a53ed Allow SystemUI to control Bluetooth for secondary users
Bug: 15818610
Change-Id: I9eaeaffc73f7675957ed3cd6a896ea83a79d6cff
2014-08-18 16:28:45 +02:00
Justin Koh
0fc2ff7b8a Merge "Add check to allow notification listener packages to post >50 notifications" into lmp-dev 2014-08-16 04:32:18 +00:00
Justin Koh
38156c504e Add check to allow notification listener packages to post >50 notifications
Bug: 13433398
Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68
(cherry picked from commit 2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d)
2014-08-19 10:02:39 -07:00
Robert Greenwalt
35228d72e1 Merge "Avoid reusing a currently active NetID." into lmp-dev 2014-08-16 04:32:18 +00:00
Robert Greenwalt
1bbcaa0fc4 Merge "Fix listening NetworkRequests to listen for all networks." into lmp-dev 2014-08-20 20:15:45 +00:00
Robert Greenwalt
c671c8ded6 Merge "Add missing break statements to avoid unnecessary network validation." into lmp-dev 2014-08-20 20:15:45 +00:00
Robert Greenwalt
0d39e6722b Merge "Fix CS/NetworkMonitor race." into lmp-dev 2014-08-20 20:15:45 +00:00
Paul Jensen
60061a6ebf Avoid reusing a currently active NetID.
There are only a limited number (65526) of NetIDs so the chance for reusing
one exists.  Reusing a currently active NetID will cause problems like netd
failures and overwriting entries in mNetworkForNetId.

bug:16815182

Change-Id: Ib75302beae3179c3f3b90c345cf4d2cf5f4ad2be
2014-08-20 19:23:59 +00:00
Robert Greenwalt
73ed9d8dee Fix CS/NetworkMonitor race.
If we have a message in flight about a NetworkAgentInfo when it gets disconnected
we are left with a zombie network.  Fixes this by verifing the network is still
live before we process the msg.

bug:17142206
Change-Id: I2c94a39b3ea97c1562066571b277280c1f69f71c
2014-08-20 09:30:15 -07:00
Paul Jensen
0311b2b31a Fix listening NetworkRequests to listen for all networks.
This is a small change but should fix a number of functional problems:
1. When registering a listening NetworkRequest and when a Network is
   validated, we should always add the listening NetworkRequest to the
   Network's list of NetworkRequests if the Network satisfies the
   NetworkRequest.  Previously in both cases this was only done for
   the highest scoring network.  This enables the listening
   NetworkRequest to listen for all networks, not just the highest
   scoring network.
2. No longer add listening NetworkRequests to mNetworkForRequestId as
   it doesn't make sense as it's a 1:1 mapping but listening
   NetworkRequests to Networks is a many:many mapping.
3. Don't "keep" a Network that's finished validating when only a
   listening NetworkRequest requests it.
4. Don't send updated scores to NetworkFactories from listening
   NetworkRequests.  NetworkFactories and NetworkAgents shouldn't
   concern themselves with listening NetworkRequests.

bug:16680764
Change-Id: Iaba14263227771e4bd84ee4bce488beaef20a8a3
2014-08-20 14:46:11 +00:00
Paul Jensen
d6a3f7ed90 Add missing break statements to avoid unnecessary network validation.
The missing break statements were causing unnecessary network
validation for VPNs and networks that don't provide internet access.

bug:16680764
Change-Id: I714bacdff350a818f7bfba2f505b95c4b3559699
2014-08-20 10:12:50 -04:00
Selim Cinek
255dd04271 Added notification color to all system notifications
Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb
2014-08-20 14:25:18 +02:00
Jose Lima
34ff492978 Fixes for a few bugs related to visible-behind activities
- Allow activities currently not visible to switch back to not
     visible-behind state.
   - Do not allow an activity that is not set as the visible-behind
     activity to cancel the visible-behind state.
   - Immediately mark a finishing activity as no longer visible behind.

Bug: 17070266
Change-Id: I2c5016793e5264013b8a54b84098e6ffae34ae6c
2014-08-19 23:20:51 +00:00
Nicolas Prevot
d26bfec44b Merge "Allow the system in other users to call startActivityAsCaller." into lmp-dev 2014-08-16 04:36:37 +00:00
Nicolas Prevot
5ef7e19a0e Allow the system in other users to call startActivityAsCaller.
BUG: 17148852

Change-Id: I4c9811b7da90b5705e72001dd36bf67d559cb189
2014-08-20 11:09:29 +01:00
Terry Heo
5e85359a36 Merge "CEC: Broadcast language setting whenever it changes" into lmp-dev 2014-08-16 04:15:21 +00:00
Terry Heo
1ca0a43251 CEC: Broadcast language setting whenever it changes
Bug: 16995278
Change-Id: Id695d4d2f213cd8039c9915f3d4e451e829e715c
2014-08-18 11:16:05 +09:00
Jungshik Jang
8e6e1e2e82 Merge "Use id to find proper HdmiDeviceInfo instead of ojbect itself." into lmp-dev 2014-08-16 04:25:55 +00:00
Jungshik Jang
cf445877c6 Use id to find proper HdmiDeviceInfo instead of ojbect itself.
TvInputHardwareManager manages internal device info and update
it by remove or add method of List collection. However,
HdmiDeviceInfo overrides equals method and remove may not work
if incoming HdmiDeviceInfo has different power status.
Instead, this change iterates all HdmiDeviceInfo and compares
id of HdmiDeviceInfo.

Bug: 17145753
Change-Id: Ia5de3e33cf05b28fa2bd108d99e78de09b838fb3
2014-08-20 15:06:01 +09:00
Jeff Brown
b135d06cb8 Remove incomplete media router API. (DO NOT MERGE)
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
2014-08-19 20:08:52 -07:00
Jinsuk Kim
9727b33297 Merge "CEC: Hook up device select API to MHL device RAP" into lmp-dev 2014-08-16 04:25:55 +00:00
Jinsuk Kim
87f22a2870 CEC: Hook up device select API to MHL device RAP
This lets the input selection on UI perform MHL RAP signalling, and
CEC routing control.

Bug: 17141884
Change-Id: Ic1605175c5779a9a3c43df954baf9fdb6f154d36
2014-08-20 12:35:32 +09:00
Terry Heo
03861d0721 Merge "CEC: Handle Remote Control command" into lmp-dev 2014-08-16 04:12:14 +00:00
Terry Heo
3e1564ee39 CEC: Handle Remote Control command
Generate an Android key event when a UserControl message is received.
And report menu state active when a MenuRequest message is received to
notify sender can send a UserControl message.

Bug: 16938007
Change-Id: Id8f393dc254508b9e7a6fa203f8e817fbe807e38
2014-08-18 16:09:10 +09:00
Jungshik Jang
5ba6906768 Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev 2014-08-16 04:12:14 +00:00
Jungshik Jang
2738e2d872 Implement missing mhl apis
1. get_supported_features
2. get_ecbug_device_rols
3. set_option in native.
4. get_mhl_version
5. get_peer_mhl_version
6. send_scratchpad_command
 - it includes send_scratchpad_command but does not include
  java side implementation. It will be added when we implement
  scratchpad.

Bug: 17096490

Change-Id: Iacb4a41234cbbd2d832908b48d188bd81a301b0f
2014-08-20 10:11:34 +09:00
Jungshik Jang
350e68d0b8 Clean up MHL local devices when HdmiControlService turns into disabled state
Bug: 17122583
Change-Id: Id8f17faf9891952c762f86b46a89732f1497c5fc
2014-08-19 18:56:21 +09:00
Ji-Hwan Lee
15c56aac98 TIF: Call setMain(false) when session is released.
Also, rename setMainTvView() and setMainSession() to setMain(), except
ITvInputManager.

Change-Id: I586e3fd42720f07a75d6f31b1ee955ce5c29dd68
2014-08-19 06:11:04 +00:00
Jinsuk Kim
8809f1e547 Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev 2014-08-16 04:25:55 +00:00
Jinsuk Kim
ed0864557b CEC: Invoke events listener upon MHL device state change
With this change, mobile devices state changes are propagated through
TIF to UI, hence the input pickers shows the mobile devices as
expected.

Bug: 16986744
Change-Id: Id633207acf4f814f57d43cc1de5f8cb88ac23ad6
2014-08-19 13:41:51 +09:00
Jon Miranda
611f8f17f3 Merge "Exposes style and theme data, adds developer option." into lmp-dev 2014-08-18 21:31:41 +00:00
Jon Miranda
836c0a8b94 Exposes style and theme data, adds developer option.
Adds support for a String[] return type in ViewDebug; and in addition to that,
the hasAdjacentMapping method can use the String array as means to map a key to
its value.

Adds DEBUG_VIEW_ATTRIBUTES to Settings so that the heavy per-view
computations only affect those who opt in. This setting is used in
CoreSettingsObserver to avoid impacting start time.

Change-Id: I8f507e4e5361414c30d247e8d9815205feb5e91f
2014-08-18 18:32:53 -07:00
Jungshik Jang
3b57e1d129 Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev 2014-08-16 04:25:55 +00:00
Jungshik Jang
5691b2f229 Remove parameter field in HdmiCecKeycode.
Since we don't support mapping between android key and parameterized
cec keycode, remove parameter fields in HdmiCecKeycode.

Bug: 17099253
Change-Id: I8b6b6b361f0c343b0a263240b49e41bf289d36ca
2014-08-19 09:49:30 +09:00