19654 Commits

Author SHA1 Message Date
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
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
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
Jason Monk
95d9ad0f79 Merge "Fixes to lock task API from API review" into lmp-dev 2014-08-16 04:32:18 +00: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
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
Michael Wright
d1858574d0 Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 2014-08-18 23:27:42 +00:00
Michael Wright
d86ecd26d7 Add callbacks for MediaProjection start / stop.
Also, enforce that there is only one valid MediaProjection at a time.

Bug: 16488053
Change-Id: Id05445d798c98cb208bc4dab186296392e15d30b
2014-08-17 16:06:56 -07:00
Dianne Hackborn
ccc8c29af1 Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev 2014-08-16 04:32:18 +00:00
Dianne Hackborn
4a88bf9985 Fix issue #17114392: android.com.phone crashes - PackageManager code
Change-Id: Ib02119c6f313384a73fa7cb7b2b62dbd716fa6ca
2014-08-18 18:07:23 -07:00
Nicolas Prevot
f52233df74 Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev 2014-08-16 04:29:45 +00:00
Ji-Hwan Lee
0c3b4ad7b6 Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev 2014-08-16 04:25:55 +00:00
Ji-Hwan Lee
4835497886 TIF: Remove session state when hardware wrapper input crashes
Change-Id: I2306cc407a19892c1895ee70bd6bd52b1a3bd4f3
2014-08-17 04:51:18 +09:00
Michael Wright
468fef6870 Merge "Persist Show IME option." into lmp-dev 2014-08-18 23:27:42 +00:00
Michael Wright
7b5a96ba83 Persist Show IME option.
Add a new setting to persist whether to show the IME when a hard
keyboard is connected.

Bug: 14066881
Change-Id: I2237ded850a0d4ab43ca441d0b7df13e0958e630
2014-08-17 17:51:19 -07:00
Michael Wright
665366a305 Change 'disable hardware keyboard' to 'show input method'
Previously it implied that the hardware keyboard would be disabled,
but really the toggle would just enable showing the IME even if a
hardware keyboard was present. Changed the string and swapped the
semantics to be more clear about the behavior.

Bug: 14066881
Change-Id: I9c8a7eb98b5277f1d09cc19fa7402e9b4cf51d92
2014-08-17 17:51:19 -07:00
John Spurlock
73f84480af Merge "Zen: Remove "allow disable" filter from noman." into lmp-dev 2014-08-16 04:32:18 +00:00
John Spurlock
dd753c00d5 Zen: Remove "allow disable" filter from noman.
No longer used by dialer.

Bug:15344099
Change-Id: Ib2d00804f671fae520303531e8ccde9e44f817ec
2014-08-19 16:16:58 -04:00
Lorenzo Colitti
0a82e80073 Stop using LinkProperties for static configuration.
LinkProperties can represent way more complicated configurations
than what we can actually apply to interfaces. This makes it
error-prone to use it to represent static configuration, both
when trying to apply configuration coming from LinkProperties
and when trying to save configuration from current
LinkProperties.

Instead, move static configuration (IPv4 only, since we don't
support static IPv6 configuration) into a separate
StaticIpConfiguration class.

Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
2014-08-19 11:59:43 -07:00
Julia Reynolds
afe7a2c9c3 Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev 2014-08-16 04:03:42 +00:00
Julia Reynolds
2cb384f425 Prevent profile owners from setting certain user restrictions.
Bug: 16351901
Bug: 16701492
Change-Id: Ie866bc24d2d7cc15f86c5b50062a730e099612a1
2014-08-20 16:06:29 -04:00
Esteban Talavera
12450c72eb Merge "Add cross profile intent in order after intent filter resolution" into lmp-dev 2014-08-16 04:36:39 +00:00