147672 Commits

Author SHA1 Message Date
Sungsoo Lim
8a22f0180f Merge "Add version attribute in tv_content_rating_system.xml" into lmp-dev 2014-08-11 19:46:21 +00:00
Sungsoo Lim
6219fa8b2d Add version attribute in tv_content_rating_system.xml
- 'version' attribute is added in 'rating-system-definitions' tag.
- Update javadoc for the format change of XML file in TvContentRating.
- Fix some errors in the javadoc comment.

Bug: 16805703
Change-Id: If9473c89cef0777232470d67f1542a5e5eac3182
2014-08-12 21:49:20 +09:00
Yuncheol Heo
e5910f70fc Merge "Use the system property for the HdmiControlService configuration." into lmp-dev 2014-08-11 19:42:53 +00:00
Yuncheol Heo
7d9acc7a3e Use the system property for the HdmiControlService configuration.
- We've used the system resoure overlay for this purpose, but we found
  that it's hard for OEM which uses PDK to override this.  Since the
  resource was already compiled and provided as a binary, so it's hard
  to change it.

Bug: 16965963
Change-Id: I868305d6f76c128d79c00ab6a8023656cd476c62
2014-08-12 15:55:52 +09:00
Wonsik Kim
05182b2d69 Merge "TIF: small refactoring around audio configuration update" into lmp-dev 2014-08-11 19:46:21 +00:00
Wonsik Kim
7587d298c9 TIF: small refactoring around audio configuration update
Bug: 16880310
Change-Id: Ic519ff0f67cb35a876784530d956fcf8cb7edbf7
2014-08-12 13:04:17 +09:00
Jinsuk Kim
302938e9b5 Merge "CEC: Fix two bugs" into lmp-dev 2014-08-11 19:46:21 +00:00
Jinsuk Kim
1f8d1c576f CEC: Fix two bugs
- <Routing Change> goes out with invalid parameter (F.F.F.F) for
  old path if the active source/path is not set. Should have been
  set to internal path (0.0.0.0)
- <User Control Pressed> was still sent when active source was not
  set. Fixed to discard it.

Bug: 16966486
Bug: 16965446
Change-Id: I5abb062be42c17514b3ed7ac930d7a3535fc9132
2014-08-12 15:47:19 +09:00
Jungshik Jang
54662165b5 Merge "Set active port path to HdmiControlService" into lmp-dev 2014-08-11 19:42:53 +00:00
Jungshik Jang
867b4e0c55 Set active port path to HdmiControlService
Set active port path to HdmiControlService so that the service
can handle proper event patch between cec and mhl devices.

Bug: 16215362
Change-Id: I2bd703916a422429b1029067fa3422e24de39274
2014-08-12 14:23:21 +09:00
Amit Mahajan
ff2efd5299 Revert "add apn setting parameters, and set apn parameters to bp"
This reverts commit 3fd217b3f492c95c8550da2a36fffbc6f3a3b724.

Change-Id: Icf32debc07b858c5ae2eb8a7bf4a6e95445a7466
2014-08-12 05:14:36 +00:00
Jinsuk Kim
502d8b3beb Merge "CEC: Make sure CEC switch info is always updated" into lmp-dev 2014-08-11 19:42:53 +00:00
Jinsuk Kim
bcfa0677d4 CEC: Make sure CEC switch info is always updated
The CEC switch information was not updated as expected if
Device Discovery action is in progress. Refactored to have the
update routine gets called regardless of the presence of action.

Conflicts:
	services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java

Bug: 16931883
Change-Id: I629e8b646bef54599c1a706bf1c797ecebf8616b
2014-08-12 07:54:58 +09:00
Selim Cinek
bee465f9e1 Merge "Fixed a ordering bug with the notification shade" into lmp-dev 2014-08-11 18:41:55 +00:00
Selim Cinek
becf5e30ed Fixed a ordering bug with the notification shade
The dismiss view was not always guaranteed to be on the bottom,
which could lead to a weird hole.

Bug: 16900568
Change-Id: Ib46ec0011dcdd47a8f678b5e3f9756f6a128f286
2014-08-12 14:29:18 +02:00
Selim Cinek
4581cf8206 Fixed a jump in the stack scroller algorithm
The bottom stack jumped slightly when scrolling in landscape.

Bug: 16954513
Change-Id: I11ed9074cf5286b01f4f57ce37b4476c2ee9cd7e
2014-08-12 10:50:55 +00:00
Ihab Awad
6013583cb9 Merge "Fix incorrect connection ID for remote connection service" into lmp-dev 2014-08-11 18:20:32 +00:00
Ihab Awad
8aecfedb7b Fix incorrect connection ID for remote connection service
Also cleans up incidental issues including:
* Remote connection service disconnects from the service it
  represents if it is not currently handling any connections;
  hope to avert excessive service pinning in the future.
* Fix destroyed connection handling.

Bug: 16828152
Change-Id: Id4555f91ddac5e9c1a12ce00bfd1ee0d6d2cb1d9
2014-08-12 03:27:12 +00:00
Barnaby James
2bed283743 Merge "Fix VoiceInteractionService.isActiveService()." into lmp-dev 2014-08-11 18:14:57 +00:00
Jeff Sharkey
93f871126c Merge "Hack and ship: NetworkStats edition." into lmp-dev 2014-08-12 00:32:51 +00:00
Jeff Sharkey
eb2c2c790c Hack and ship: NetworkStats edition.
Some devices use clatd for catching raw IPv4 traffic when running on
a pure-IPv6 carrier network.  In those situations, the per-UID
stats are accounted against the clat iface, so framework users need
to combine both the "base" and "stacked" iface usage together.

This also means that policy rules (like restricting background data
or battery saver) need to apply to the stacked ifaces.

Finally, we need to massage stats data slightly:

-- Currently xt_qtaguid double-counts the clatd traffic *leaving*
the device; both against the original UID on the clat iface, and
against UID 0 on the final egress interface.

-- All clatd traffic *arriving* at the device is missing the extra
IPv6 packet header overhead when accounted against the final UID.

Bug: 12249687, 15459248, 16296564
Change-Id: I0ee59d96831f52782de7a980e4cce9b061902fff
2014-08-11 18:40:23 -07:00
Hui Wang
fdd78e06a7 add apn setting parameters, and set apn parameters to bp
Change-Id: I2720b6f8eba707691b9c3f481b6182c98ae3f10b
2014-08-12 00:44:40 +00:00
John Spurlock
77e54d905f Talkback: Ensure TTS stream is not affected by ringer mode.
Now that the policy for tablets and phones are unified, follow
the same policy when deciding which streams are never affected
by ringer mode.

Bug:16885683
Change-Id: Iaf526b391de9f429cb9e99ec18a417108443acf6
2014-08-12 00:22:44 +00:00
Jeff Brown
6d2a9492e2 Eliminate power manager latency for boot completed.
The power manager disables the power button until boot completed
occurs.  If there are many pending broadcasts in the queue, it
may be possible for BOOT_COMPLETED to be delayed for several
seconds after boot.

To avoid the delay, introduced a new boot phase which is
sent to system services immediately when boot completed happens.

Bug: 13398280
Change-Id: I1833d2ffb20305009dd76363b43e534034f1d0a2
2014-08-11 17:13:03 -07:00
Etan Cohen
77437731a7 Revert "Added debug system property to enable/disable IMS VoLTE/VT."
Superseded by "Enhanced 4G LTE Mode" official setting.

This reverts commit d32e5aa844307221785bfe64b3a1b7ef36958cbd.
2014-08-11 23:55:11 +00:00
Barnaby James
e2c020a449 Fix VoiceInteractionService.isActiveService().
Change-Id: Ifda467bfae0d15fe4ea0fd15ffc0e9612401b218
2014-08-11 15:29:12 -07:00
Jungshik Jang
652705f229 Merge "Hook up native mhl api to HdmiControl Service." into lmp-dev 2014-08-11 19:46:21 +00:00
Jungshik Jang
7df52862da Hook up native mhl api to HdmiControl Service.
This change hooks up all apis defined in mhl hal to
java layer's HdmiMhlController and HdmiControlService.
Along with HdmiMhlController, this change includes followings.

1. HdmiMhlLocalDevice
A logical container for a mhl device connected to specific hdmi port

2. HdmiMhlFeatureAction
A base feature action class for mhl's state behaviors like RAP and RCP.

Bug: 16215362

Change-Id: If177999853f60b68bd079549660a3f4982cb9d9e
2014-08-12 11:05:42 +09:00
Jinsuk Kim
91e25eda41 Merge "Move input change event handling out of TVInputManager" into lmp-dev 2014-08-11 19:42:53 +00:00
Jinsuk Kim
d38bf476f6 Move input change event handling out of TVInputManager
HDMI input change event should be handled best in TIS implementation
of HDMI input since the input change request from TV/other device
needs to be properly coordinated. This requires the listener be
moved the input service.

Provided an interface in HdmiTvClient for the input service to access
the API through getSystemService(Context.HDMI_CONTROL_SERVICE).

Conflicts:
	services/core/java/com/android/server/tv/TvInputHardwareManager.java

Bug: 15570939
Change-Id: Ie2ad10d77907de3d4501f9c892ca553b75365467
2014-08-12 08:27:32 +09:00
George Mount
78d1d0f94f Merge "Custom snapshot capture and reconstitution." into lmp-dev 2014-08-11 18:14:57 +00:00
RoboErik
7aef77bbf5 Remove sessions listeners that are disabled
Removes sessions listeners when their notification listener is
disabled. Also updates the dump for media sessions.

bug:15549450

Change-Id: Ibe51a4a42ef333e75a09f0fffa0f2b9b8939b85c
2014-08-11 22:32:55 +00:00
George Mount
480ca829e2 Custom snapshot capture and reconstitution.
Bug 16865996
Bug 14450297
Bug 16866642

Added a mechanism for custom capture and restore of snapshot
Views. By default, it captures a Bitmap and restores a View
using that Bitmap as a background.

Change-Id: I77c2c62df53b552872e467380565bbe0e6d5c114
2014-08-11 14:28:45 -07:00
Chelsea Derrick
2ef022d23a Merge "Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]"" into lmp-dev 2014-08-11 17:55:01 +00:00
Chelsea Derrick
c216c473eb Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]"
This reverts commit 41158d90a69cae2a9c4ced0e04f235e8cfef5259.

Bug: 16871063
Change-Id: I93623be92f2de41789b16827867f3f95bf0480c5
2014-08-11 12:51:18 -07:00
ztenghui
6661341596 Don't double count the left/top when using bitmap cache in VectorDrawable.
bug:16861184

Change-Id: I0530602957a434b222725b6fcbc1af165ee05835
2014-08-11 10:16:22 -07:00
Adam Lesinski
d4c25dbe67 Merge "Fix shared library bug in bag attributes" into lmp-dev 2014-08-11 17:09:06 +00:00
Selim Cinek
0fe5bf9106 Merge "Changed the color of low-priority notifications" into lmp-dev 2014-08-11 17:09:03 +00:00
Selim Cinek
e4e2cc3c80 Merge "Fixed an animation bug with inline view updates" into lmp-dev 2014-08-11 17:09:03 +00:00
Sandeep Siddhartha
97887cf255 Merge "Remove direct field access from event payload" into lmp-dev 2014-08-11 17:09:03 +00:00
Sandeep Siddhartha
a3a5af04a0 Merge "Add debugging info to VIS via dump()" into lmp-dev 2014-08-11 17:09:01 +00:00
Sandeep Siddhartha
d5730bc88c Remove direct field access from event payload
Change-Id: I0b4462e56a977bfbaaebd2dd31d9246051af1b99
2014-08-11 09:53:44 -07:00
Yorke Lee
a79e2bedba Block access to call logs from the corp profile
Bug: 16812842
Change-Id: Ie4342b5efb2419097c35c0ddebd486a098cea523
2014-08-11 09:43:18 -07:00
Sandeep Siddhartha
6df952ec22 Add debugging info to VIS via dump()
Change-Id: I9e8f4536de309256db835b30d94765bfc27d4e80
2014-08-11 09:38:38 -07:00
Adam Lesinski
ccf25c7bf6 Fix shared library bug in bag attributes
A ResTable_map entry has a name attribute, which
could be a dynamic reference if it comes from
a shared library. It was not being patched with
the correct package id.

Bug:16795890
Change-Id: Ia8df6a943269b2fefb2132c3ed74eb1997d7701b
2014-08-11 09:16:01 -07:00
Raph Levien
24ce053861 Copy fonts.xml to /system/etc
This patch actually copies the new font config file to the /system/etc
directory on the device, where frameworks and apps will be able to read
it.

Bug: 14538154
Change-Id: I53a932210763b718f469d80cc92816edf4e5b14e
2014-08-11 08:54:51 -07:00
Selim Cinek
9063461752 Changed the color of low-priority notifications
Bug: 16010701
Change-Id: I7afc351a5a669bbb71b2620afe310b250da66b77
2014-08-11 17:53:18 +02:00
Selim Cinek
a5e211b1f2 Fixed an animation bug with inline view updates
The height is now updated in an animated fashion.

Bug: 16947659
Change-Id: I4e89e6ca78f8d3c0f1e6f7eb61134a394c6d7d73
2014-08-11 17:53:18 +02:00
Etan Cohen
1584609f42 Add configuration flag controlling whether IMS can be completely disabled.
Change-Id: I70e6fc163d65bba7d1260df0acb74ca614e54b68
2014-08-11 08:41:19 -07:00
Ricardo Cervera
18718444b9 am 97dbb136: am 6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs
* commit '97dbb136473b18a6d7171577ef2a7136819b4a18':
  docs: Fixed minor issue with Studio shortcuts
2014-08-11 15:22:03 +00:00