148518 Commits

Author SHA1 Message Date
Selim Cinek
059a49f834 Merge "Reset the notification expanded states on screen off" into lmp-dev 2014-08-12 23:14:48 +00:00
Alexandra Gherghina
7f8821c5a2 Merge "Bugfix: adds extra null check" into lmp-dev 2014-08-12 23:14:48 +00:00
Ji-Hwan Lee
09015492e5 Merge "TIF: Fix release logic for hardware wrapper input" into lmp-dev 2014-08-12 23:14:48 +00:00
Ji-Hwan Lee
0c38fc764b TIF: Fix release logic for hardware wrapper input
Change-Id: I7aad26682738e7a20bc6a053c3827ab79e83e925
2014-08-13 15:41:20 +09:00
Wonsik Kim
dd8e48f306 Merge "TIF: fix parental control data inconsistency" into lmp-dev 2014-08-12 23:14:48 +00:00
Wonsik Kim
276ec84b5d TIF: fix parental control data inconsistency
Bug: 16987144
Change-Id: I43cc7de92663d50073d5c4da1dbffe4e9a2b26a6
2014-08-13 14:34:28 +09:00
Yuncheol Heo
b734e9d2b8 Merge "Implement MHL RAP transmission." into lmp-dev 2014-08-12 23:14:42 +00:00
Yuncheol Heo
9cb536e4f7 Implement MHL RAP transmission.
- The creation of this action will be integrated later after the device-id is ready.

Bug: 16966458
Change-Id: I7bf46a8570534e2b021afea613b355a55e9f549f
2014-08-14 16:13:14 +09:00
Sungsoo Lim
e9054ab3ab Merge "Update Java doc for TV Rating system" into lmp-dev 2014-08-12 23:14:42 +00:00
Sungsoo Lim
1d11640127 Update Java doc for TV Rating system
Bug: 17007100
Change-Id: Idb3f2184ea6d0421875ccd1e10b7539b3c17080a
2014-08-14 12:24:41 +09:00
Wonsik Kim
592ddc3f6e Merge "TIF: handle HDMI CEC power status change" into lmp-dev 2014-08-12 23:14:42 +00:00
Wonsik Kim
e92f857d50 TIF: handle HDMI CEC power status change
Bug: 16967261
Change-Id: I252dbb249ec818bcaad7d813d1065ebb0714bd54
2014-08-13 11:23:52 +09:00
Sungsoo Lim
dd0b7d083f Merge "Fix hashCode of TvContentRating" into lmp-dev 2014-08-12 23:14:42 +00:00
Sungsoo Lim
a9a29a29e5 Fix hashCode of TvContentRating
Bug: 16963556
Change-Id: I0d419e4a47cd4b0a364d3b05063dcdbfc8a168ae
2014-08-13 08:32:29 +00:00
Yuncheol Heo
e2f7f0a5b8 Merge "Implement MHL RAP reception." into lmp-dev 2014-08-12 23:14:42 +00:00
Yuncheol Heo
08a1be81d7 Implement MHL RAP reception.
Bug: 16966458
Change-Id: I77effc917e19072c387be8ba28d6ce1664d16415
2014-08-13 10:26:23 +09:00
Deepanshu Gupta
497f6a1c98 Merge "Whitelist fonts instead of blacklist." into lmp-dev 2014-08-12 23:14:35 +00:00
Glenn Kasten
3750e75f75 Merge "Move setting to disable automatic USB routing" into lmp-dev 2014-08-12 23:14:35 +00:00
Glenn Kasten
34cc4db180 Move setting to disable automatic USB routing
This moves the setting from System to Secure per review.

Bug: 16381952
Change-Id: I2497ca66b4f346839490c29295528fac70e94494
2014-08-13 13:31:04 -07:00
Chris Craik
3c3f601cc4 Merge "Fix action bar background drawing" into lmp-dev 2014-08-12 23:14:35 +00:00
Chris Craik
1e610d479f Fix action bar background drawing
bug:16940717

Fixes regression from 0de8add60e0d40c59def41663acae4d57d0b4b15

Change-Id: I7ec30a9c0c9422874cad106a2caeb7dcbe75e1b6
2014-08-13 13:44:40 -07:00
Jeff Sharkey
437e61d5ad Merge "Fix javadoc attr reference." into lmp-dev 2014-08-12 23:14:35 +00:00
Jeff Sharkey
9f991a2f3e Fix javadoc attr reference.
Change-Id: I330ba0cac66b4515388287c0ec4856e3ce6c93cb
2014-08-13 18:38:55 +00:00
keunyoung
2c1c74afca Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev 2014-08-12 23:14:35 +00:00
keunyoung
c093bf2645 rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
bug: 16959030
Change-Id: I413a2ba676488bfc18e393465b98681682ec88d4
2014-08-13 18:58:03 +00:00
Chulwoo Lee
b5d88d8973 Merge "TIF: Enable to build uri for browsableOnly channels" into lmp-dev 2014-08-12 23:14:35 +00:00
Chulwoo Lee
81d1b4def0 TIF: Enable to build uri for browsableOnly channels
BUG: 16966138
Change-Id: Idf3a349547a269777a8336b6bbbf933b52f5582a
2014-08-13 12:28:34 -07:00
Ihab Awad
df22cbc9ad Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev 2014-08-12 23:14:35 +00:00
Ihab Awad
b19a0bcdd8 Final structural tweaks to Telecomm API (1/8)
Bug: 16416927
Bug: 16494880
Change-Id: I45fbe287c410cbb5e1b985f320b862d732811f43
2014-08-13 11:16:46 -07:00
kmccormick
a0197180e7 Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 2014-08-12 23:14:35 +00:00
kmccormick
71f8f1d81f Doc Change: Remove obsolete sample link.
Fix for:

b/16685592

Change-Id: If15951ee783e8c05b4dfb32983a87a3518cdbe82
2014-08-12 18:08:58 -07:00
Craig Mautner
eb829f2f9f Merge "Disassociate system windows from apps" into lmp-dev 2014-08-12 23:14:35 +00:00
Craig Mautner
a5d29971f8 Disassociate system windows from apps
If an app launches a system window remove the app token.

Fixes bug 16825063.

Change-Id: I7c7403e0958f3cd9f6dd5e2964b2e9cabc51ded7
2014-08-12 18:57:49 -07:00
destradaa
2d8964cca7 Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev 2014-08-12 23:14:35 +00:00
destradaa
ff8e6093fa Update FlpHardwareProvider native layer, to stop raising FatalErrors.
b/16800814

Change-Id: Ic619f37c02c7e4dddc4ef06369f8730cbd66e6bd
2014-08-12 19:05:33 -07:00
Dianne Hackborn
3c9ad6ebd8 Merge "Fix some IntentFilter docs." into lmp-dev 2014-08-12 23:14:35 +00:00
Dianne Hackborn
dc894046be Fix some IntentFilter docs.
Change-Id: I1dc6feb41bf275583d8b25ed5ca98d2b1432c752
2014-08-12 18:59:28 -07:00
destradaa
da97066d5a Merge "Add additional logging around AGPS IP Address handling." into lmp-dev 2014-08-12 23:14:35 +00:00
destradaa
931a37f992 Add additional logging around AGPS IP Address handling.
The additional logging is expected to help troubleshoot and prevent the issue tracked by the
following bugs:
b/16875580
b/16961654

Change-Id: Ibee7fe0774efa3db77ab53af96c128ced186b40e
2014-08-12 17:51:01 -07:00
kmccormick
bcdbe1a0fc Merge "Doc Change: remove obsolete links." into klp-modular-docs 2014-08-12 23:14:35 +00:00
kmccormick
cb62407d7a Doc Change: remove obsolete links.
Fixes for:

b/16494813

Change-Id: I2aaae520cdafadf8707f2fbf38c10588f0de2987
2014-08-12 17:52:27 -07:00
Jean-Michel Trivi
ceb4d41846 Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 2014-08-12 23:14:35 +00:00
Dianne Hackborn
3eb780bc17 Merge "Turn off voice interaction service restrction for now" into lmp-dev 2014-08-12 23:14:35 +00:00
Dianne Hackborn
ecc7498b2b Turn off voice interaction service restrction for now
Need to wait for the prebuilt to update.

Change-Id: I5501c2ba23e6e18379aa0859b248446c82de6cdc
2014-08-12 23:05:24 -07:00
Dianne Hackborn
deb434ca08 Merge "Add 560dpi, and some other stuff." into lmp-dev 2014-08-12 23:14:35 +00:00
Jae Seo
e253fabbc7 Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev 2014-08-12 23:14:35 +00:00
Jae Seo
550c4b0d4d TIF: Temporarily disable permission check for parental controls
Bug: 16979343
Change-Id: I00ff70194faaf7218151388dc10ce8e4dd3d2728
2014-08-12 17:50:37 -07:00
Alan Viverette
f2546bf423 Merge "Add API for obtaining max text length for accessibility" into lmp-dev 2014-08-12 23:14:35 +00:00
Jon Miranda
177f08e593 Merge "Changed flow in export methods to continue through the loop if it encounters an int[] return type." into lmp-dev 2014-08-12 23:14:35 +00:00
Alan Viverette
2adf8902ce Merge "Prevent re-entry when clearing animating hotspots" into lmp-dev 2014-08-12 23:14:35 +00:00