OSDN Git Service
destradaa [Thu, 6 Nov 2014 21:50:39 +0000 (21:50 +0000)]
Merge "Fix reference leak in GPS measurement JNI layer. b/
16727892 b/
17075171" into lmp-mr1-dev
RoboErik [Thu, 6 Nov 2014 21:20:17 +0000 (21:20 +0000)]
Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev
* changes:
Update metadata artwork and uri docs
skip MediaController callbacks if it's been unregistered
Sailesh Nepal [Thu, 6 Nov 2014 21:06:34 +0000 (21:06 +0000)]
Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev
Jeremy Joslin [Thu, 6 Nov 2014 20:51:23 +0000 (20:51 +0000)]
Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev
Amith Yamasani [Thu, 6 Nov 2014 20:50:59 +0000 (20:50 +0000)]
Merge "Fix singleUser provider grants" into lmp-mr1-dev
Craig Mautner [Thu, 6 Nov 2014 20:49:35 +0000 (20:49 +0000)]
Merge "More fixes for keyguard animations." into lmp-mr1-dev
Vinod Krishnan [Thu, 6 Nov 2014 20:34:58 +0000 (20:34 +0000)]
am
1d6d4272: Adding wallpaper animations
* commit '
1d6d427278d22d08ef60e5d76162b823e8ad58ed':
Adding wallpaper animations
Ricardo Cervera [Thu, 6 Nov 2014 20:34:53 +0000 (20:34 +0000)]
am
126eda32: am
b4a19198: am
58dc8c42: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
126eda32ebc1c61ff0a6a7a93093c71f2ac73d43':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Paul Lawrence [Thu, 6 Nov 2014 20:34:49 +0000 (20:34 +0000)]
am
3bde026a: am
afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit '
3bde026aebffdaea8ab1315977b05e53e4a75185':
DO NOT MERGE: Don't log passwords returned from vdc
Ricardo Cervera [Thu, 6 Nov 2014 20:34:45 +0000 (20:34 +0000)]
am
0a285d4a: am
9bc1b15a: am
cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
* commit '
0a285d4a3483011a57ecd4201db3fd38bb1d628f':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Dirk Dougherty [Thu, 6 Nov 2014 20:34:28 +0000 (20:34 +0000)]
am
61a76f2d: am
f15017fc: am
326c70ef: Doc change: Add play dev guide page with index card and shareable download.
* commit '
61a76f2d7919cd6375cf4463b8bd69a608057d93':
Doc change: Add play dev guide page with index card and shareable download.
Dirk Dougherty [Thu, 6 Nov 2014 20:34:18 +0000 (20:34 +0000)]
am
2acfc3b9: am
d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
* commit '
2acfc3b9e2aca9277e8e4763352fc2976d0c2094':
Doc change: Add play dev guide page with index card and shareable download.
Joe Fernandez [Thu, 6 Nov 2014 20:34:14 +0000 (20:34 +0000)]
am
93f89657: am
ab6e9048: am
2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs
* commit '
93f8965768484e758c2c87b919340ee932fcfd9d':
docs: Add more information for getting started with TV app
Justin Koh [Thu, 6 Nov 2014 20:33:36 +0000 (20:33 +0000)]
am
b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
* commit '
b8038d58da04456e9e7b6e264af69226bf21592c':
Hide Surface#lockHardwareCanvas DO NOT MERGE
Dirk Dougherty [Thu, 6 Nov 2014 20:33:12 +0000 (20:33 +0000)]
am
c6f2ec20: 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 '
c6f2ec20a6a8ed30801debf9715aff3ddb982933':
Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
John Spurlock [Thu, 6 Nov 2014 20:27:06 +0000 (20:27 +0000)]
Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev
Sailesh Nepal [Thu, 6 Nov 2014 05:30:43 +0000 (21:30 -0800)]
Make APIs to get system phone accounts public
This is used by Wi-Fi calling to handoff and incoming
call to a cellular call.
For example, when doing an handoff we can look through
the outgoing phone accounts and find the one that the user
has verified with their google account. We can then
handoff to that phone account.
Bug:
17686424
Change-Id: I06d42aa8f4a36d11e5293ed6f7c62b796226f5c1
Craig Mautner [Thu, 6 Nov 2014 20:13:23 +0000 (12:13 -0800)]
More fixes for keyguard animations.
Add a state machine for calling comeOutOfSleepIfNeededLocked() so
that it is only called after the lockscreen has started dismissing
but not before resumeTopActivityLocked(). Also keep
resumeTopActivityLocked() from being called from
comeOutOfSleepIfNeededLocked() recursively.
Have starting windows count towards notifying the keyguard that a
window has been drawn.
Do not update wallpaper animations based on their not being included
in the windows being animated if there are no windows being animated.
And always improve logging.
Fixes bug
15991916.
Change-Id: I0d21c5337f0e89d9eacc8dab2cdaa52fec43ac0b
Jason Monk [Thu, 6 Nov 2014 20:13:06 +0000 (20:13 +0000)]
Merge "Show recents button while pinned and locked" into lmp-mr1-dev
xinhe [Thu, 6 Nov 2014 19:50:44 +0000 (19:50 +0000)]
Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev
Jeremy Joslin [Wed, 5 Nov 2014 18:32:09 +0000 (10:32 -0800)]
Implemented requestNetwork with a PendingIntent.
ConnectivityManager.requestNetwork(NetworkRequest, PendingIntent)
was unhidden and implemented.
Added ConnectivityManager.removePendingIntentRequest(PendingIntent) as
the companion method.
Bug:
17356414
Change-Id: I656a1e149cc1292c443ebfe9e61ee3eb5a80f143
Winson Chung [Thu, 6 Nov 2014 19:20:58 +0000 (19:20 +0000)]
Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)" into lmp-mr1-dev
Winson Chung [Thu, 6 Nov 2014 19:20:55 +0000 (19:20 +0000)]
Merge "Don't reload the layout every time we enter Recents. (Bug
18160176)" into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 21:12:27 +0000 (16:12 -0500)]
Zen: Track next-alarm condition across reboots.
During a reboot, wait for the initial alarm registration -
which is traditionally done in response to ACTION_BOOT_COMPLETED.
Bug:
16373455
Change-Id: I00dd737fa5c9ea15d646779c5b92e5637a69595a
xinhe [Wed, 5 Nov 2014 22:55:03 +0000 (14:55 -0800)]
RSSI indicator says that SIMless device has a SIM
For dummy case, subId = -1/-2, we need compare the phoneId
Bug:
18247106
Change-Id: I310d8b466ef83936e920d3921267241f42c2243f
RoboErik [Thu, 6 Nov 2014 18:55:06 +0000 (10:55 -0800)]
Update metadata artwork and uri docs
This updates the Javadoc on the bitmap and uri fields to strongly
suggest Uris be used for high res artwork and strongly suggest Uris
use the content: style and support EXTRA_SIZE.
Change-Id: If4c38bfec20d049473457784b1b56fa4d78abe5e
ztenghui [Thu, 6 Nov 2014 18:54:48 +0000 (18:54 +0000)]
Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev
John Reck [Thu, 6 Nov 2014 18:48:16 +0000 (18:48 +0000)]
Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev
Stuart Scott [Thu, 6 Nov 2014 18:25:48 +0000 (18:25 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
John Reck [Thu, 6 Nov 2014 17:45:10 +0000 (09:45 -0800)]
Yank ResourceCache out of Caches
Bug:
17947547
Pull the ResourceCache (aka, ref-counting side channel) out of
Caches so that DisplayListRenderer doesn't use Caches, avoiding
the risk of instantiating Caches on the wrong thread or
without a GL context
Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
Vinod Krishnan [Wed, 5 Nov 2014 17:16:30 +0000 (09:16 -0800)]
Adding wallpaper animations
- this has the best behavior. Sometimes the behavior is not consistent
Bug:
18058382
Change-Id: I744169ea333d3cef9d7b3618b940280aa8db4dc3
Ricardo Cervera [Thu, 6 Nov 2014 17:19:00 +0000 (17:19 +0000)]
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
Paul Lawrence [Thu, 6 Nov 2014 17:14:35 +0000 (17:14 +0000)]
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
Ricardo Cervera [Thu, 6 Nov 2014 17:13:58 +0000 (17:13 +0000)]
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
Ricardo Cervera [Thu, 6 Nov 2014 17:09:12 +0000 (17:09 +0000)]
am
9bc1b15a: am
cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
* commit '
9bc1b15a66647e63f15383c1f82d5ed7cca0a304':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Paul Lawrence [Thu, 6 Nov 2014 17:08:25 +0000 (17:08 +0000)]
Merge "DO NOT MERGE: Don't log passwords returned from vdc" into lmp-dev
Ricardo Cervera [Thu, 6 Nov 2014 17:03:00 +0000 (17:03 +0000)]
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
Ricardo Cervera [Thu, 6 Nov 2014 17:02:56 +0000 (17:02 +0000)]
am
cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
* commit '
cc0753b077abb1ad5e5e95885567261b35067ed4':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Ricardo Cervera [Fri, 10 Oct 2014 23:04:11 +0000 (16:04 -0700)]
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
(cherry picked from commit
2871e05b48f0b932885986322ce01212717a6399)
Ricardo Cervera [Thu, 6 Nov 2014 16:57:12 +0000 (16:57 +0000)]
Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
Jason Monk [Thu, 6 Nov 2014 16:26:14 +0000 (11:26 -0500)]
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
Adrian Roos [Thu, 6 Nov 2014 16:22:05 +0000 (16:22 +0000)]
Merge "Round charging indication to nearest minute" into lmp-mr1-dev
Selim Cinek [Thu, 6 Nov 2014 16:12:58 +0000 (16:12 +0000)]
Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev
Selim Cinek [Thu, 6 Nov 2014 16:12:47 +0000 (16:12 +0000)]
Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev
Selim Cinek [Thu, 6 Nov 2014 16:12:00 +0000 (16:12 +0000)]
Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev
Nicolas Prevot [Thu, 6 Nov 2014 09:42:44 +0000 (09:42 +0000)]
Merge "Add a cross-profile intent filter only if it wasn't previously added." into lmp-mr1-dev
Yuncheol Heo [Thu, 6 Nov 2014 08:21:04 +0000 (17:21 +0900)]
CEC: Allow no parameters with <System Audio Mode Request>.
Bug:
18266992
Change-Id: I4399e34d1178f3d4b17b4749ca543c2bb14c0765
Sailesh Nepal [Thu, 6 Nov 2014 06:14:14 +0000 (06:14 +0000)]
Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev
Yuncheol Heo [Thu, 6 Nov 2014 05:47:48 +0000 (05:47 +0000)]
Merge "CEC: Don't send <Feature Abort> on the short message" into lmp-mr1-dev
Dirk Dougherty [Thu, 6 Nov 2014 05:25:51 +0000 (05:25 +0000)]
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.
Dirk Dougherty [Thu, 6 Nov 2014 05:20:29 +0000 (05:20 +0000)]
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.
Sailesh Nepal [Thu, 6 Nov 2014 02:37:53 +0000 (18:37 -0800)]
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
Dirk Dougherty [Thu, 6 Nov 2014 04:14:15 +0000 (20:14 -0800)]
Doc change: Add play dev guide page with index card and shareable download.
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
(cherry picked from commit
0ce73219be7f37170eb19dba690a5cd8d3e22e21)
Dirk Dougherty [Thu, 6 Nov 2014 04:29:44 +0000 (04:29 +0000)]
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.
Joe Fernandez [Thu, 6 Nov 2014 04:23:30 +0000 (04:23 +0000)]
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
Dirk Dougherty [Thu, 6 Nov 2014 04:22:10 +0000 (04:22 +0000)]
Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
Joe Fernandez [Thu, 6 Nov 2014 04:14:26 +0000 (04:14 +0000)]
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
Dirk Dougherty [Thu, 6 Nov 2014 04:14:15 +0000 (20:14 -0800)]
Doc change: Add play dev guide page with index card and shareable download.
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
Paul Lawrence [Wed, 5 Nov 2014 22:36:34 +0000 (14:36 -0800)]
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
Jim Miller [Thu, 6 Nov 2014 02:52:19 +0000 (02:52 +0000)]
Merge "Update TrustAgentService API after review" into lmp-mr1-dev
mike dooley [Thu, 6 Nov 2014 02:43:59 +0000 (02:43 +0000)]
Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev
Jeff Tinker [Thu, 6 Nov 2014 02:33:22 +0000 (02:33 +0000)]
Merge "Add missing secure stop methods" into lmp-mr1-dev
Yuncheol Heo [Wed, 5 Nov 2014 23:25:39 +0000 (08:25 +0900)]
CEC: Don't send <Feature Abort> on the short message
Bug:
18261915
Change-Id: I722392afacc29ec9f2af27df49b68bd773b53e3d
Jim Miller [Wed, 27 Aug 2014 00:12:29 +0000 (17:12 -0700)]
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
Joe Fernandez [Thu, 6 Nov 2014 01:31:56 +0000 (01:31 +0000)]
Merge "docs: Add more information for getting started with TV app" into lmp-docs
Joe Fernandez [Wed, 5 Nov 2014 06:31:55 +0000 (22:31 -0800)]
docs: Add more information for getting started with TV app
- required manifest entries
- more information on permissions that imply hardware features
Change-Id: I55454ba8725185094bef35b9be653d50b58c8137
Jeff Davidson [Thu, 6 Nov 2014 01:25:03 +0000 (01:25 +0000)]
Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev
Winson Chung [Tue, 28 Oct 2014 22:21:35 +0000 (15:21 -0700)]
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
Justin Koh [Wed, 5 Nov 2014 23:49:03 +0000 (23:49 +0000)]
Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
Amith Yamasani [Wed, 5 Nov 2014 23:46:09 +0000 (15:46 -0800)]
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
Robert Greenwalt [Wed, 5 Nov 2014 23:36:00 +0000 (23:36 +0000)]
Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev
Jeff Davidson [Wed, 5 Nov 2014 23:10:57 +0000 (23:10 +0000)]
Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev
Stuart Scott [Wed, 5 Nov 2014 23:01:07 +0000 (15:01 -0800)]
Fix NPE when parceling SubInfoRecord
bug:
18256375
Change-Id: I3567f98aeb82b5c0a11060319186460678661bb2
Robert Greenwalt [Wed, 29 Oct 2014 21:04:06 +0000 (14:04 -0700)]
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
George Mount [Wed, 5 Nov 2014 23:04:17 +0000 (23:04 +0000)]
Merge "Cancel animation when target changes." into lmp-mr1-dev
Dirk Dougherty [Wed, 5 Nov 2014 22:57:36 +0000 (22:57 +0000)]
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.
Dirk Dougherty [Wed, 5 Nov 2014 22:51:31 +0000 (22:51 +0000)]
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.
Dirk Dougherty [Wed, 5 Nov 2014 22:44:23 +0000 (22:44 +0000)]
Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs
Jeff Davidson [Wed, 5 Nov 2014 19:14:19 +0000 (11:14 -0800)]
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
Rob Tsuk [Wed, 5 Nov 2014 22:22:51 +0000 (22:22 +0000)]
Merge "Log shader source when it fails to compile" into lmp-mr1-dev
Winson Chung [Wed, 5 Nov 2014 21:41:12 +0000 (13:41 -0800)]
Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)
Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
Dirk Dougherty [Fri, 31 Oct 2014 23:14:29 +0000 (16:14 -0700)]
Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
Change-Id: Ib4c0b0d442b1ef879cb01b3972845ef93360c5b8
Eric Laurent [Wed, 5 Nov 2014 22:02:52 +0000 (22:02 +0000)]
Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 21:47:32 +0000 (21:47 +0000)]
am
c2a0d9e5: am
66c46c4a: am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
c2a0d9e54e778338d73c99598dc741eebd58a326':
Docs: Fix typo in Preference android:order attribute.
John Spurlock [Wed, 5 Nov 2014 21:40:46 +0000 (21:40 +0000)]
am
66c46c4a: am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
66c46c4a9289a8e21c8f36fe06679be5f6534841':
Docs: Fix typo in Preference android:order attribute.
Winson Chung [Wed, 5 Nov 2014 21:39:15 +0000 (21:39 +0000)]
Merge "Fixing crash in recents window transition. (Bug
18246975,
18159006)" into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 21:36:13 +0000 (21:36 +0000)]
am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
3a9321d407f71fa6c2a49db63e6eb30003c8ef4c':
Docs: Fix typo in Preference android:order attribute.
Jeff Davidson [Wed, 5 Nov 2014 21:33:14 +0000 (21:33 +0000)]
Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev
Rob Tsuk [Wed, 5 Nov 2014 21:26:19 +0000 (13:26 -0800)]
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
John Spurlock [Wed, 5 Nov 2014 21:17:50 +0000 (16:17 -0500)]
Docs: Fix typo in Preference android:order attribute.
Change-Id: Ib3a009ed1fba8396be1bd5055f4897b0cc7d8738
RoboErik [Tue, 4 Nov 2014 22:47:44 +0000 (14:47 -0800)]
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
Rich Slogar [Wed, 5 Nov 2014 20:50:03 +0000 (20:50 +0000)]
am
c3d174a0: am
848d9125: am
1afa82dc: docs:remove sdk/ndk note
* commit '
c3d174a0304d3be57e485c48783d7c101553c78a':
docs:remove sdk/ndk note
Sanket Padawe [Wed, 5 Nov 2014 20:30:28 +0000 (20:30 +0000)]
Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev
Andrew Solovay [Wed, 5 Nov 2014 20:22:24 +0000 (20:22 +0000)]
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.
Ricardo Cervera [Wed, 5 Nov 2014 20:21:03 +0000 (20:21 +0000)]
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.
Eric Laurent [Wed, 5 Nov 2014 20:18:05 +0000 (12:18 -0800)]
AudioEffect JNI: use new max preprocessing constant
Bug:
18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
Rich Slogar [Wed, 5 Nov 2014 20:17:55 +0000 (20:17 +0000)]
am
848d9125: am
1afa82dc: docs:remove sdk/ndk note
* commit '
848d912505079cc3cbd362a4333f0eabfac3c1c5':
docs:remove sdk/ndk note
Rich Slogar [Wed, 5 Nov 2014 20:13:35 +0000 (20:13 +0000)]
am
1afa82dc: docs:remove sdk/ndk note
* commit '
1afa82dce06ec03bcc2f58c4e144ba25c2ea1b2d':
docs:remove sdk/ndk note
John Spurlock [Wed, 5 Nov 2014 19:17:20 +0000 (19:17 +0000)]
Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev
Adam Lesinski [Wed, 5 Nov 2014 19:15:55 +0000 (19:15 +0000)]
Merge "Add error checking to aapt for split generation" into lmp-mr1-dev