55497 Commits

Author SHA1 Message Date
Dongwon Kang
3babc1d15e am b0ee5931: Merge "TIF: Add content rating system for Spain" into lmp-dev
* commit 'b0ee59317533e2cac0efe24a85499fbfe56bee25':
  TIF: Add content rating system for Spain
2014-08-06 02:58:02 +00:00
Michael Wright
5425dbb1a6 am 104bc43d: Add supported refresh rate to displays
* commit '104bc43d148704cc6ecefa295cb8320ede34a4bd':
  Add supported refresh rate to displays
2014-08-06 02:08:15 +00:00
Michael Wright
3f145a2f95 Add supported refresh rate to displays
Change-Id: I51231dd6dd231d57dd1ac499349d6335121f07d5
2014-08-06 02:03:49 +00:00
Adam Powell
50a2bf8bca am 30d5400c: Merge "Fall-through for ActionModes with ToolbarActionBar" into lmp-dev
* commit '30d5400cfc5b3ef777398ebf78911d21f3e1ffc6':
  Fall-through for ActionModes with ToolbarActionBar
2014-08-06 01:23:46 +00:00
Winson Chung
061e315cea am 244ea328: Fixing issue where home was triggered on top of other activities being launched. (Bug 16823617)
* commit '244ea328ca503b4c77d911df3955ad5c20622d94':
  Fixing issue where home was triggered on top of other activities being launched. (Bug 16823617)
2014-08-06 01:17:57 +00:00
Sungsoo Lim
6939314af8 am eafeec2b: Merge "TIF: Add content ratings for Netherlands" into lmp-dev
* commit 'eafeec2b464437c627aa6a95b0d6b5d32da9e18d':
  TIF: Add content ratings for Netherlands
2014-08-06 01:17:46 +00:00
Sungsoo Lim
5b65d3c990 am 33ff97e5: Merge "TIF: Add content ratings for Germany" into lmp-dev
* commit '33ff97e556455e77a2ed0b1d21f98a4868b72e3f':
  TIF: Add content ratings for Germany
2014-08-06 01:17:37 +00:00
Sungsoo Lim
e7a6cc3e6b am 8dfb07f4: Merge "TIF: Add content ratings for France" into lmp-dev
* commit '8dfb07f432bf278554786e8795e87f1940212723':
  TIF: Add content ratings for France
2014-08-06 01:17:32 +00:00
Winson Chung
cdcd487aba Fixing issue where home was triggered on top of other activities being launched. (Bug 16823617)
- Also fixes issue with the Recents hide message being clobbered
2014-08-06 01:02:15 +00:00
Amith Yamasani
50982b60b2 am 41179448: Merge "Allow phone UID to export singleton providers" into lmp-dev
* commit '4117944897d3e4e8abbdbac253c4e123f914f4b7':
  Allow phone UID to export singleton providers
2014-08-05 23:09:48 +00:00
Michael Wright
a31a41b1bd am 0bfcf09a: Mark all Meta combos as system combos
* commit '0bfcf09a260681d374ca89f63c0deae45815a928':
  Mark all Meta combos as system combos
2014-08-05 23:05:23 +00:00
Michael Wright
ce0c13a169 Mark all Meta combos as system combos
Also make a meta-tab a recents accelerator.

Bug: 14066931
Change-Id: Iac6aab276e4e16d5f70c92a5a03172bd81559afa
2014-08-05 23:01:15 +00:00
Sandeep Siddhartha
b6d9d532aa am d5099116: Merge "Use @IntDef for manage actions" into lmp-dev
* commit 'd50991164bb75fd670062b108d0923f739d4b3d5':
  Use @IntDef for manage actions
2014-08-05 22:32:19 +00:00
Michael Wright
32ef803606 am c9938987: Add resize method for virtual displays
* commit 'c9938987b04e785424322d3a9553a8843804484b':
  Add resize method for virtual displays
2014-08-05 21:14:22 +00:00
Michael Wright
01e840ff94 Add resize method for virtual displays
Change-Id: I2632fc56c2d2cba356379e42f5c1a3e283b11d1e
2014-08-05 21:10:03 +00:00
Svetoslav
b13075e332 am 8cd27c3c: Allow adding widgets from user profiles.
* commit '8cd27c3c20e59088a2a26f9a05307d17c949ce58':
  Allow adding widgets from user profiles.
2014-08-05 21:05:25 +00:00
Svetoslav
976e8bd201 Allow adding widgets from user profiles.
The goal of this change is to enable support for appwidget from
user profiles to the user main profile. A user profile is a user
which is associated as a child of the main user profile. For example,
a user may have a personal (parent) and corporate (child) profile.
The device policy should be able to control whether adding a widget
from a child profile and given packages is allowed. This change
assumes that all packages from managed profiles are white listed.
Another change will add the device policy changes.

Change-Id: I267260b55d74c48b112a29979a9f59eef7a8194e
2014-08-05 20:57:20 +00:00
Eric Laurent
49cdf572eb am 7b8c0c55: Merge "SoundTrigger API update." into lmp-dev
* commit '7b8c0c55178e668276dd8f6a02c920a3e9da9163':
  SoundTrigger API update.
2014-08-05 20:00:06 +00:00
ztenghui
d19461709a am c4924092: Update the system linear progress bar
* commit 'c492409264038d593514a88cf8ffb8b9fed59fc5':
  Update the system linear progress bar
2014-08-05 19:50:18 +00:00
ztenghui
af8a8f3a7d Update the system linear progress bar
bug:14622065

Change-Id: Ic08022d934763ba0cc6067af3e50c4afeb8a0e9e
2014-08-05 19:46:36 +00:00
Craig Mautner
405c001ee9 am 7e7f2b4d: Use actual number of packages rather than getCount()
* commit '7e7f2b4de003bd5aeef04500025cb2bc34e6df28':
  Use actual number of packages rather than getCount()
2014-08-05 19:16:18 +00:00
Craig Mautner
1c8eb5e3d0 Use actual number of packages rather than getCount()
The ResolverActivity method getCount() returns the number of
entries below the default entry, not the total number of entries.
But the onCreate() method expected the getCount() method to
return the total number of entries. This change provides the total
to onCreate().

Fixes bug 16800358.

Change-Id: I3915c3d5ad642e31d7248226fc91bd4047f16b2d
2014-08-05 19:11:59 +00:00
Chris Craik
a3ebc2f78d am c48b90be: Move clip bound execution into drawChild()
* commit 'c48b90be90c6ddd1d0a4833d2a457e21881fc241':
  Move clip bound execution into drawChild()
2014-08-05 18:06:29 +00:00
Chris Craik
e4cf152cb7 Move clip bound execution into drawChild()
bug:15698973

This makes native and java implementations match up in the sequence of
clip vs applying other properties / draw calls.

Change-Id: Ia75e00c5b42f81ecd516722ef1c5233d483e0c97
2014-08-05 18:01:53 +00:00
Jeff Sharkey
58d056c47f am 7c1ad552: Stronger constraints around install session IDs.
* commit '7c1ad552830c2de6c1ea8705db728ecbe5074a6a':
  Stronger constraints around install session IDs.
2014-08-05 17:50:10 +00:00
Jeff Sharkey
f174c6e6de Stronger constraints around install session IDs.
Generate positive, non-zero session IDs, and don't recycle them
within a given boot.  Guard against ID starvation by crazy apps.

Bug: 16792837
Change-Id: I6035afe4d942d358b5ca12b4f818c55885b74aba
2014-08-05 17:46:05 +00:00
Nicolas Prevot
9e24e5d513 am 95559c12: Merge "Security fixes related to cross-user content." into lmp-dev
* commit '95559c12f8350eb43373762a1335441187cf97d3':
  Security fixes related to cross-user content.
2014-08-05 17:16:22 +00:00
Andre Eisenbach
e5c0b7fb61 am 790eede3: Add transport parameter to createBond() function (4/4)
* commit '790eede36950774a5eb3a4105fed565f5cc4a175':
  Add transport parameter to createBond() function (4/4)
2014-08-05 17:07:23 +00:00
Andre Eisenbach
57210c7a1a Add transport parameter to createBond() function (4/4)
Bug: 14063256
Change-Id: I096248b60752992aa23ce5bfbfc47fda95773db2
2014-08-05 17:01:13 +00:00
Torne (Richard Coles)
ec6cdce9e4 am 9d52e5f1: Merge "Log the version of the WebView package used." into lmp-dev
* commit '9d52e5f11cf78d112f468cce4ef86287c8c31829':
  Log the version of the WebView package used.
2014-08-05 16:08:43 +00:00
Svet Ganov
929f57d52c am 670faea5: Properly update accessibility manager state.
* commit '670faea5665d6bee815f21942ff333a2efe34d41':
  Properly update accessibility manager state.
2014-08-05 16:04:17 +00:00
Hector Dearman
07f8160eb3 am 41d1648f: Merge "Fix CookieSyncManager package summary" into lmp-dev
* commit '41d1648ff28658a24551ce86fd1a2faeb2d69e60':
  Fix CookieSyncManager package summary
2014-08-05 16:04:12 +00:00
Svet Ganov
c946f14a67 Properly update accessibility manager state.
Applciations that fire accessibility events have to first check
it accessibility is on and then fire the event. If the app fires
an event when the feature is off an exception is thrown. However,
due to the way accessibility state is pushed to the local
accessibility manager it was possible that the app checks that
aaccessibility is off, fires an event, then the state of the
local manager changes by the time the event is propagated up
the view tree and an exception is thrown. This is a regression.

We really want this exception to prevent apps sending events
across processes if accessibility is off, so now the state
we get from the system manager service is applied via a
message so if the app checks that accessibility is off, then
it will remain off (locally) until the event is propagated.

bug:16672964

Change-Id: Icf5d1b1bdff87b58f285f0d9e1a098552513bbe8
2014-08-05 16:02:21 +00:00
Przemyslaw Szczepaniak
c79ff762cd am e27f1632: Merge "Set the TTS voice name for the default language." into lmp-dev
* commit 'e27f1632a62e332daa7d167ca8c992a13f0e31bd':
  Set the TTS voice name for the default language.
2014-08-05 14:35:35 +00:00
Sungsoo Lim
edf15bd171 am 291e9b9d: Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev
* commit '291e9b9d30c461ad96e7619ee680d3dfe029f75c':
  TIF: A preliminary CL to add multiple rating systems
2014-08-05 13:06:31 +00:00
Jungshik Jang
ca1a00e397 am 69f08659: Merge "Refine recode apis." into lmp-dev
* commit '69f08659eeb72137798ae8d43ed83b97e9b1722e':
  Refine recode apis.
2014-08-05 13:06:26 +00:00
Jungshik Jang
fdba000ba2 am ef1e889d: Merge "Fix invalid annotation, @throw" into lmp-dev
* commit 'ef1e889d0c39aed12df1441363263b54e6adb0bf':
  Fix invalid annotation, @throw
2014-08-05 13:05:49 +00:00
Jinsuk Kim
8fe39a904b am c4319a19: Plumbing for HdmiTvClient and HdmiControlService
* commit 'c4319a19cb18d223f2fe3b9834fee6e920d9057c':
  Plumbing for HdmiTvClient and HdmiControlService
2014-08-05 13:05:37 +00:00
Jinsuk Kim
6ffb03816f Plumbing for HdmiTvClient and HdmiControlService
Added a few more methods in HdmiTvClient to use the API provided
by HdmiControlService

Change-Id: Ib506699b9661b99cefc837b96ac64347a4e9420c
2014-08-05 13:05:49 +09:00
Jungshik Jang
0ff1639113 am 70ac06d8: Merge "Implement clear timer." into lmp-dev
* commit '70ac06d844c12df388af6de22dd25a71be28af7f':
  Implement clear timer.
2014-08-05 00:37:09 +00:00
Hector Dearman
ae9251262a Merge "Fix CookieSyncManager package summary" into lmp-dev 2014-08-05 00:35:13 +00:00
Hector Dearman
24f7e61a38 Fix CookieSyncManager package summary
Putting the deprecated at the beginning of a class comment seems
to cause problems with JavaDoc so I've moved it to the end.

Bug: 16799480
Change-Id: Ia23dab2ad8ceb8e107e047480b5cb324d11a1457
2014-08-05 10:55:30 +01:00
Przemyslaw Szczepaniak
1eb47e1624 Merge "Set the TTS voice name for the default language." into lmp-dev 2014-08-05 00:35:13 +00:00
Przemyslaw Szczepaniak
fd80746bb9 Set the TTS voice name for the default language.
This changes makes the initial, default language set and
the #setLanguage call with the default language as input
exactly the same.

Previously, the requests made after the initial default language
set were missing the name of the default voice.

+ Some tests clean-up. Some of them fail due to issues with
Locale#toLanguageTag upper-casing the variant field.

Change-Id: I5470617007fe45462b7198bf62a03eb5fe47a590
2014-08-05 14:50:34 +01:00
Eric Laurent
40b8ef99a5 Merge "SoundTrigger API update." into lmp-dev 2014-08-05 00:34:22 +00:00
Amith Yamasani
f17e498fea Merge "Allow phone UID to export singleton providers" into lmp-dev 2014-08-05 00:19:02 +00:00
Amith Yamasani
41c1ded7f0 Allow phone UID to export singleton providers
Also add a user variant of replacePreferredActivity for use
by SmsApplication.

Map user restrictions for SMS/MMS to AppOps perms.

Bug: 16681533
Change-Id: I3dfed5fc754e33bb51c6f571851653a7c2770e46
2014-08-05 14:37:27 -07:00
Adam Powell
11a6ddbb6e Merge "Fall-through for ActionModes with ToolbarActionBar" into lmp-dev 2014-08-05 00:15:52 +00:00
Adam Powell
1dcedbac34 Fall-through for ActionModes with ToolbarActionBar
When using ToolbarActionBar simply fall through to the default window
decor behavior for showing action modes.

Bug 16660506

Change-Id: Ib90282287b2af48f39f9d9ace296581565431eed
2014-08-05 16:38:53 -07:00
Nicolas Prevot
504d78ea10 Security fixes related to cross-user content.
Enforcing that only uri grants work across users (not permissions).
Fixing a security hole where malicious Apps could access a uri if they had uri grants to the same uri on another user.
Enforcing that userIds in uris, if they exist, are the one of the ContentProvider.

BUG: 16779492

Change-Id: Iaa5264bd6c3aa0e15be3a4a64f9dc88238e0cb2e
2014-08-05 17:05:09 +00:00