OSDN Git Service
RoboErik [Thu, 6 Nov 2014 21:42:55 +0000 (21:42 +0000)]
Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev
automerge:
b1d52e1
* commit '
b1d52e1d2095d0df986d4c338af43c5cd2b6efc5':
Update metadata artwork and uri docs
skip MediaController callbacks if it's been unregistered
Sailesh Nepal [Thu, 6 Nov 2014 21:41:44 +0000 (21:41 +0000)]
Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev
automerge:
7d901cb
* commit '
7d901cb6f54f31b01b9951599ba6abdcff580e42':
Make APIs to get system phone accounts public
Jeremy Joslin [Thu, 6 Nov 2014 21:38:17 +0000 (21:38 +0000)]
Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev
automerge:
1a2b99e
* commit '
1a2b99ea2692a357f68368f7117bc529ef5dab06':
Implemented requestNetwork with a PendingIntent.
Amith Yamasani [Thu, 6 Nov 2014 21:37:06 +0000 (21:37 +0000)]
Merge "Fix singleUser provider grants" into lmp-mr1-dev
automerge:
775d104
* commit '
775d104db29dc8bdd8922fd7627cf646869d90c8':
Fix singleUser provider grants
Craig Mautner [Thu, 6 Nov 2014 21:34:25 +0000 (21:34 +0000)]
Merge "More fixes for keyguard animations." into lmp-mr1-dev
automerge:
7b1b0f6
* commit '
7b1b0f63bcb76585621e856ecc8c8b71450735ee':
More fixes for keyguard animations.
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:41:35 +0000 (20:41 +0000)]
am
efec89f2: am
1d6d4272: Adding wallpaper animations
* commit '
efec89f2edd09c021e4e52f9aa37b6a6ca6f31b8':
Adding wallpaper animations
Ricardo Cervera [Thu, 6 Nov 2014 20:41:31 +0000 (20:41 +0000)]
am
a2c2014d: am
126eda32: am
b4a19198: am
58dc8c42: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
a2c2014d399c9637c06614872c6d5c08d33a1267':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Paul Lawrence [Thu, 6 Nov 2014 20:41:26 +0000 (20:41 +0000)]
am
b282cc30: am
3bde026a: am
afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit '
b282cc308f13a464c7e2455e5b2b67c622ffce30':
DO NOT MERGE: Don't log passwords returned from vdc
Ricardo Cervera [Thu, 6 Nov 2014 20:41:21 +0000 (20:41 +0000)]
am
f90d9c23: am
0a285d4a: am
9bc1b15a: am
cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
* commit '
f90d9c235435116fbefc8b92f73553355ccec87e':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Dirk Dougherty [Thu, 6 Nov 2014 20:41:17 +0000 (20:41 +0000)]
am
1d270087: am
61a76f2d: am
f15017fc: am
326c70ef: Doc change: Add play dev guide page with index card and shareable download.
* commit '
1d270087a30a3610c56c65700f61c800a9797dc3':
Doc change: Add play dev guide page with index card and shareable download.
Dirk Dougherty [Thu, 6 Nov 2014 20:41:11 +0000 (20:41 +0000)]
am
0b315994: am
2acfc3b9: am
d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
* commit '
0b315994f079be109d5ddcfff382b5c72c85bad6':
Doc change: Add play dev guide page with index card and shareable download.
Joe Fernandez [Thu, 6 Nov 2014 20:41:06 +0000 (20:41 +0000)]
am
0c03031b: am
93f89657: am
ab6e9048: am
2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs
* commit '
0c03031b3e4db987df8af25360f97f4d5c3207ea':
docs: Add more information for getting started with TV app
Justin Koh [Thu, 6 Nov 2014 20:40:56 +0000 (20:40 +0000)]
am
2d42f484: am
b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
* commit '
2d42f484494e4183c42114ce5918fc4592a33fb6':
Hide Surface#lockHardwareCanvas DO NOT MERGE
Dirk Dougherty [Thu, 6 Nov 2014 20:40:50 +0000 (20:40 +0000)]
am
012849f4: 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 '
012849f452ee7cc72a28df3054fdbe68b5133cee':
Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
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:31:08 +0000 (20:31 +0000)]
am
d69dacb0: Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev
* commit '
d69dacb06f98e85f5624737f376e89108f11cb23':
Zen: Track next-alarm condition across reboots.
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
Jason Monk [Thu, 6 Nov 2014 20:17:11 +0000 (20:17 +0000)]
am
265160e0: Merge "Show recents button while pinned and locked" into lmp-mr1-dev
* commit '
265160e03a9e3447a4874e5820108730dcd05194':
Show recents button while pinned and locked
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:56:06 +0000 (19:56 +0000)]
am
8161ed81: Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev
* commit '
8161ed8121f88d58cb7a2bab3a7197e3d661ba49':
RSSI indicator says that SIMless device has a SIM
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:26:17 +0000 (19:26 +0000)]
am
5191861c: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)" into lmp-mr1-dev
* commit '
5191861c8896bf4ceaca2dc210423a7f86924644':
Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)
Winson Chung [Thu, 6 Nov 2014 19:26:11 +0000 (19:26 +0000)]
am
e0325fe9: Merge "Don\'t reload the layout every time we enter Recents. (Bug
18160176)" into lmp-mr1-dev
* commit '
e0325fe956c2a33b79added92f0e53be2246506a':
Don't reload the layout every time we enter Recents. (Bug
18160176)
ztenghui [Thu, 6 Nov 2014 19:25:46 +0000 (19:25 +0000)]
am
786d0a03: Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev
* commit '
786d0a0353cdbd335b50c6b560073d8d21ec2ee8':
VD:test:Remove open animation AVD
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
John Reck [Thu, 6 Nov 2014 18:55:00 +0000 (18:55 +0000)]
Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev
automerge:
9c13b8c
* commit '
9c13b8cfcc6e1d8b422488596538bd8b1f38df57':
Yank ResourceCache out of Caches
ztenghui [Thu, 6 Nov 2014 18:54:48 +0000 (18:54 +0000)]
Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev
Stuart Scott [Thu, 6 Nov 2014 18:52:29 +0000 (18:52 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
automerge:
c7f1ae8
* commit '
c7f1ae8146d3f4bb9e8e1c0e58543379b854060e':
Fix NPE when parceling SubInfoRecord
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:26:12 +0000 (16:26 +0000)]
am
418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev
* commit '
418f4ed077ee0559e7f61b8ea10d53e9784fd631':
Round charging indication to nearest minute
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:15:54 +0000 (16:15 +0000)]
am
49af6359: Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev
* commit '
49af6359e04095fa71162c7658f10cf93c94d341':
Adapted HUN behavior when swiping vertically
Selim Cinek [Thu, 6 Nov 2014 16:15:49 +0000 (16:15 +0000)]
am
140e3f88: Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev
* commit '
140e3f88fbd176530f89b3f5f4a29b2a77b97bac':
Fixed a bug where the HUNs were not clickable
Selim Cinek [Thu, 6 Nov 2014 16:15:43 +0000 (16:15 +0000)]
am
6d7065f5: Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev
* commit '
6d7065f50d1e65707f7decc3f56042f808d5488f':
Fixed a bug that the notifications were not animating when reset
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 10:22:13 +0000 (10:22 +0000)]
Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev
automerge:
b9744c1
* commit '
b9744c1c1f5e8cc936da7f1832665f77ad5bb18f':
Add a cross-profile intent filter only if it wasn't previously added.
Yuncheol Heo [Thu, 6 Nov 2014 10:21:09 +0000 (10:21 +0000)]
CEC: Allow no parameters with <System Audio Mode Request>.
automerge:
0361147
* commit '
03611473bc1d13f8e55ac92e37a9716c2fd8e412':
CEC: Allow no parameters with <System Audio Mode Request>.
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:17:54 +0000 (06:17 +0000)]
am
db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev
* commit '
db66e1d2b9b63eb1612820dc6572de1e42880646':
Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
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:53:31 +0000 (05:53 +0000)]
am
ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev
* commit '
ff636d383c8f0464e543866ae73ec4a367efd15a':
CEC: Don't send <Feature Abort> on the short message
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:57:39 +0000 (02:57 +0000)]
am
262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev
* commit '
262dc4dafede871712d89f35d630ab2a332ee6cb':
Update TrustAgentService API after review
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:48:58 +0000 (02:48 +0000)]
am
8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev
* commit '
8355c500ea6f809ef2e6885aee673d39f1cb223b':
Adding method to get disconnect cause from conference
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:39:11 +0000 (02:39 +0000)]
am
fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '
fc4e6f70f64676ab375c3e233b6c07e3bc56cb64':
Add missing secure stop methods
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
Jeff Davidson [Thu, 6 Nov 2014 01:32:55 +0000 (01:32 +0000)]
Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev
automerge:
24f535b
* commit '
24f535b87341b8729d6d4235acc51f0e87916d3a':
Allow apps with SCORE_NETWORKS to set the active scorer.
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
OSDN Git Service
