156912 Commits

Author SHA1 Message Date
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
Rob Tsuk
6c96cbf581 Merge "Log shader source when it fails to compile" into lmp-mr1-dev 2014-11-05 22:22:52 +00:00
Winson Chung
559e6d34b4 Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
2014-11-05 14:13:55 -08:00
Dirk Dougherty
df4c4ac540 Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
Change-Id: Ib4c0b0d442b1ef879cb01b3972845ef93360c5b8
2014-11-05 14:08:58 -08:00
Eric Laurent
e43bf0821b Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 2014-11-05 22:02:54 +00:00
John Spurlock
cdb72e2392 am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit 'c2a0d9e54e778338d73c99598dc741eebd58a326':
  Docs: Fix typo in Preference android:order attribute.
2014-11-05 21:47:32 +00:00
John Spurlock
c2a0d9e54e am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '66c46c4a9289a8e21c8f36fe06679be5f6534841':
  Docs: Fix typo in Preference android:order attribute.
2014-11-05 21:40:46 +00:00
Winson Chung
9128396982 Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into lmp-mr1-dev 2014-11-05 21:39:16 +00:00
John Spurlock
66c46c4a92 am 3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '3a9321d407f71fa6c2a49db63e6eb30003c8ef4c':
  Docs: Fix typo in Preference android:order attribute.
2014-11-05 21:36:13 +00:00
Jeff Davidson
b42bdef51c Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 2014-11-05 21:33:16 +00:00
Rob Tsuk
fd15f47554 Log shader source when it fails to compile
So that there will be something to diagnose when such failures occur during
stability tests.

Bug: 18092655
Change-Id: I9a9d8d33b34273a477f2a9dbcf092887dcbc91c0
2014-11-05 13:26:19 -08:00
John Spurlock
3a9321d407 Docs: Fix typo in Preference android:order attribute.
Change-Id: Ib3a009ed1fba8396be1bd5055f4897b0cc7d8738
2014-11-05 21:20:36 +00:00
RoboErik
3e0cfcda31 skip MediaController callbacks if it's been unregistered
This gives slightly better gaurantees around when an app will receive
a callback. As long as they remove a callback on the same thread calls
get posted on they won't receive any callbacks after the remove.

bug:18104724
Change-Id: Id9878186f005bf0b35c0380cd35f8fd7e67d1d90
2014-11-05 13:07:38 -08:00
Rich Slogar
faac8b7983 am c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note
* commit 'c3d174a0304d3be57e485c48783d7c101553c78a':
  docs:remove  sdk/ndk note
2014-11-05 20:50:03 +00:00
Sanket Padawe
d12b69518d Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev 2014-11-05 20:30:30 +00:00
Andrew Solovay
fbc3bdec7a am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
automerge: 8d7d7b4

* commit '8d7d7b448f2df7e4fdff6a3ca890b32b83075ead':
  docs: Removed broken link to non-existent method.
2014-11-05 20:22:24 +00:00
Ricardo Cervera
5a57ec024f am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
automerge: b2f0f35

* commit 'b2f0f3514c20b478655e4c3f192a98cfea2335ce':
  docs: Add instructions to attach debugger to a running process.
2014-11-05 20:21:03 +00:00
Eric Laurent
b27a8a5bcc AudioEffect JNI: use new max preprocessing constant
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
2014-11-05 12:20:49 -08:00