156982 Commits

Author SHA1 Message Date
Ricardo Cervera
126eda32eb am b4a19198: am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs
* commit 'b4a1919816f4563390f2416038a66cd36b4f06aa':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
2014-11-06 17:19:00 +00:00
Paul Lawrence
3bde026aeb am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit 'afb6b50e824153de5e2f0c4d49dd95fde79fa04f':
  DO NOT MERGE: Don't log passwords returned from vdc
2014-11-06 17:14:35 +00:00
Ricardo Cervera
b4a1919816 am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs
* commit '58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
2014-11-06 17:13:58 +00:00
Ricardo Cervera
0a285d4a34 am 9bc1b15a: am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
* commit '9bc1b15a66647e63f15383c1f82d5ed7cca0a304':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
2014-11-06 17:09:12 +00:00
Paul Lawrence
afb6b50e82 Merge "DO NOT MERGE: Don't log passwords returned from vdc" into lmp-dev 2014-11-06 17:08:27 +00:00
Ricardo Cervera
58dc8c42f2 am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs
* commit 'e7cd5f2e9cf76ed789534dfe5cc60c27a3b4984f':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
2014-11-06 17:03:00 +00:00
Ricardo Cervera
9bc1b15a66 am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
* commit 'cc0753b077abb1ad5e5e95885567261b35067ed4':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
2014-11-06 17:02:56 +00:00
Ricardo Cervera
cc0753b077 docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
(cherry picked from commit 2871e05b48f0b932885986322ce01212717a6399)
2014-11-06 16:57:50 +00:00
Ricardo Cervera
e7cd5f2e9c Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 2014-11-06 16:57:14 +00:00
Jason Monk
17488b9944 Show recents button while pinned and locked
When an app is show when locked and in screen pinning the 'overview'
button needs to be shown, regardless of its disabled state.

Bug: 18224921
Change-Id: I896c803347738c936873c0ce5a7480562eb9f639
2014-11-06 11:29:16 -05:00
Adrian Roos
418f4ed077 Merge "Round charging indication to nearest minute" into lmp-mr1-dev 2014-11-06 16:22:06 +00:00
Selim Cinek
49af6359e0 Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev 2014-11-06 16:12:59 +00:00
Selim Cinek
140e3f88fb Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev 2014-11-06 16:12:48 +00:00
Selim Cinek
6d7065f50d Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev 2014-11-06 16:12:01 +00:00
Nicolas Prevot
b9744c1c1f Merge "Add a cross-profile intent filter only if it wasn't previously added." into lmp-mr1-dev 2014-11-06 09:42:47 +00:00
Yuncheol Heo
03611473bc CEC: Allow no parameters with <System Audio Mode Request>.
Bug: 18266992
Change-Id: I4399e34d1178f3d4b17b4749ca543c2bb14c0765
2014-11-06 08:27:58 +00:00
Yohei Yukawa
b21220efae Minimize the number of default enabled IMEs part 4
This is a follow up CL for recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845

It turned out that the changes made in part2 and part3 are
a bit overkill, and users will see no software keyboards
in some particular situations. The problem we missed in
the previous CLs is the fact that
InputMethodInfo#isDefault is indeed a locale-dependent
value, hence it may vary depending on the system locale.
Existing unittests also failed to abstract such
locale-dependent nature.

In order to addresses that regression, the selection logic
is a bit widely reorganized in this CL.  Now the logic is
implemented as a series of fallback rules.

Also, unit tests are updated to be able to 1) test the
order of the enabled IMEs, and 2) emulate the
locale-dependent behavior of InputMethodInfo#isDefault
to enrich test cases.

BUG: 17347871
BUG: 18192576
Change-Id: I871ccda787eb0f1099ba3574356c1da4b33681f3
2014-11-06 15:28:06 +09:00
Sailesh Nepal
db66e1d2b9 Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 2014-11-06 06:14:15 +00:00
Yuncheol Heo
ff636d383c Merge "CEC: Don't send <Feature Abort> on the short message" into lmp-mr1-dev 2014-11-06 05:47:49 +00:00
Dirk Dougherty
61a76f2d79 am f15017fc: am 326c70ef: Doc change: Add play dev guide page with index card and shareable download.
* commit 'f15017fc0af505e8fd5efab3791d153020621084':
  Doc change: Add play dev guide page with index card and shareable download.
2014-11-06 05:25:51 +00:00
Dirk Dougherty
f15017fc0a am 326c70ef: Doc change: Add play dev guide page with index card and shareable download.
* commit '326c70efeed9c01e8c8d0f38f7ae27891f726e6b':
  Doc change: Add play dev guide page with index card and shareable download.
2014-11-06 05:20:29 +00:00
Sailesh Nepal
7a69c9277f Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
This CL adds a new disconnect cause. Connection managers
can specify this disconnect cause when it doesn't want
to route calls.

Bug: 16903083
Change-Id: I05822991c5c34ca3533652a10fbcb8845a604925
2014-11-05 21:02:37 -08:00
Dirk Dougherty
326c70efee Doc change: Add play dev guide page with index card and shareable download.
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
(cherry picked from commit 0ce73219be7f37170eb19dba690a5cd8d3e22e21)
2014-11-06 04:37:34 +00:00
Dirk Dougherty
2acfc3b9e2 am d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
* commit 'd7476cf42fd397ae8dc70fd9eae636c845842df1':
  Doc change: Add play dev guide page with index card and shareable download.
2014-11-06 04:29:44 +00:00
Joe Fernandez
93f8965768 am ab6e9048: am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs
* commit 'ab6e9048ebe2ac6cd4897378b56017267d6ee16e':
  docs: Add more information for getting started with TV app
2014-11-06 04:23:30 +00:00
Dirk Dougherty
d7476cf42f Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 2014-11-06 04:22:11 +00:00
Joe Fernandez
ab6e9048eb am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs
* commit '2490ec83702985bd70ac2d28322dc5c9625dc26a':
  docs: Add more information for getting started with TV app
2014-11-06 04:14:26 +00:00
Dirk Dougherty
0ce73219be Doc change: Add play dev guide page with index card and shareable download.
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
2014-11-05 20:14:15 -08:00
Paul Lawrence
70c9a06af0 DO NOT MERGE: Don't log passwords returned from vdc
Turns off logging of responses from native daemon connector altogether.
Proper solution to follow in LMP MR1

Bug: 18260068
Change-Id: I25bc9cb61049a3efdd9a9cd11195864a04ef05fd
2014-11-05 19:07:57 -08:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
mike dooley
8355c500ea Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 2014-11-06 02:44:00 +00:00
Jeff Tinker
fc4e6f70f6 Merge "Add missing secure stop methods" into lmp-mr1-dev 2014-11-06 02:33:23 +00:00
Yuncheol Heo
a95f1a9b89 CEC: Don't send <Feature Abort> on the short message
Bug: 18261915
Change-Id: I722392afacc29ec9f2af27df49b68bd773b53e3d
2014-11-06 11:27:25 +09:00
Jim Miller
e303bf4435 Update TrustAgentService API after review
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.

It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.

Fixes bug 17008504

Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
2014-11-05 18:17:56 -08:00
Joe Fernandez
2490ec8370 Merge "docs: Add more information for getting started with TV app" into lmp-docs 2014-11-06 01:31:56 +00:00
Joe Fernandez
9fe42219c6 docs: Add more information for getting started with TV app
- required manifest entries
- more information on permissions that imply hardware features

Change-Id: I55454ba8725185094bef35b9be653d50b58c8137
2014-11-05 17:29:31 -08:00
Jeff Davidson
24f535b873 Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev 2014-11-06 01:25:04 +00:00
Winson Chung
b0a28ea5d3 Don't reload the layout every time we enter Recents. (Bug 18160176)
Ensure that we don't reinflate new TaskViews whenever we enter Recents by
keeping the existing TaskStackViews active and returning the existing
TaskViews back into the view pool when Recents is no longer visible.

This CL also ensures that we are preloading the appropriate task metadata
when the user first touches the nav bar, and also reverts the change to use
onEnterAnimationComplete() in favor of the explicitly animation-started
broadcast (to ensure we always get the signal) which fixes a regression
with launching Recents in landscape.

Change-Id: I169fea3cf07a6da3f90b32b005819773c6049ada
2014-11-05 16:39:13 -08:00
Jeff Hao
2e594cfe98 Change boot screen title to "Android is starting" when not upgrading.
Bug: 17565501
Bug: 18247218

(cherry picked from commit 9f60c08a446e38f9e2d5271546ef69ca5941eba9)

Change-Id: I1ec32b318b6221277fc3ffbc19966bf3330c2d93
2014-11-05 23:51:42 +00:00
Justin Koh
b8038d58da Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 2014-11-05 23:49:04 +00:00
Amith Yamasani
7d2d4fd55e Fix singleUser provider grants
Fake the Uri for grant check, if we're checking access to
a singleUser provider. Inject the userId in the authority
so that the grant can be matched properly.

Bug: 18194892
Change-Id: I4a55ce593ac21722f394e89e13350aa205d76336
2014-11-05 15:46:09 -08:00
Robert Greenwalt
7efdb83cee Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 2014-11-05 23:36:01 +00:00
Jeff Davidson
8fe7676ee8 Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 2014-11-05 23:10:57 +00:00
Stuart Scott
bc6a9601d7 Fix NPE when parceling SubInfoRecord
bug:18256375
Change-Id: I3567f98aeb82b5c0a11060319186460678661bb2
2014-11-05 15:07:54 -08:00
Robert Greenwalt
06314e4eab Fix Legacy typing of net-specific requests.
We're starting to get network requests for specific SIMs
and the Legacy Type Inference was broken because the incoming
request included a network specifier while the legacy requests
it was compared with did not.  Only compare the things we care
about.

bug:18031008
Change-Id: If107042828c152ede51a2497a3859bc1a6c83694
2014-11-05 15:06:20 -08:00
George Mount
c838b67774 Merge "Cancel animation when target changes." into lmp-mr1-dev 2014-11-05 23:04:18 +00:00
Dirk Dougherty
c6f2ec20a6 am b2fe15f9: am 66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs
* commit 'b2fe15f9bf6ea06bd4c862547f830c355d95c60a':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
2014-11-05 22:57:36 +00:00
Dirk Dougherty
b2fe15f9bf am 66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs
* commit '662964511f88fddbf14941c66bf255acb3f30e2a':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
2014-11-05 22:51:31 +00:00
Dirk Dougherty
662964511f Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs 2014-11-05 22:44:23 +00:00
Jeff Davidson
e56f2bb5ec Allow apps with SCORE_NETWORKS to set the active scorer.
This allows for a more streamlined UX in the current world, where
scorer apps are trusted (by virtue of being in /system/priv-app).
Trusted apps can continue to use the system dialog for consent, but
they may also set the scorer directly, under the assumption that they
are using their own consent UX to explain the feature to the user.

Bug: 16577529
Change-Id: I2a6edb7f1f688aaacf9b0152fa1da1a88636c3dc
2014-11-05 14:25:20 -08:00