OSDN Git Service
Abodunrinwa Toki [Tue, 26 May 2015 20:35:18 +0000 (21:35 +0100)]
Hide the floatingtoolbar when content rect is invisible.
Hide the floating toolbar when the content rect is outside the
source view's visible area.
Bug:
21304845
Change-Id: I0dd10ad2cda7a8d9b05c81334cdfbd68c22dbc6a
Paul Jensen [Tue, 26 May 2015 17:37:32 +0000 (17:37 +0000)]
Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev
Paul Jensen [Tue, 26 May 2015 17:33:24 +0000 (17:33 +0000)]
Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev
Alan Viverette [Tue, 26 May 2015 17:29:38 +0000 (17:29 +0000)]
Merge "Handle error states when refreshing accessibility node" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 17:27:06 +0000 (17:27 +0000)]
Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev
Rich Slogar [Tue, 26 May 2015 17:23:48 +0000 (17:23 +0000)]
am
59e5d718: am
a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs
* commit '
59e5d7189911fc86a65624a337a75d8f840cff3d':
docs: support library 22.2 updates
Jason Monk [Tue, 26 May 2015 17:19:09 +0000 (17:19 +0000)]
Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev
Chris Craik [Tue, 26 May 2015 17:19:01 +0000 (17:19 +0000)]
Merge "Unflip TextureView getBitmap readback" into mnc-dev
Chet Haase [Tue, 26 May 2015 17:15:57 +0000 (17:15 +0000)]
Merge "Clarify example for Deep Share" into mnc-dev
Jason Monk [Tue, 19 May 2015 18:21:28 +0000 (14:21 -0400)]
SysUI: Move LocationControllerImpl receiver to bg
Bug:
19520495
Change-Id: Ia0fbfb663076c296c65bcefdad62d36f98c9e757
Rich Slogar [Tue, 26 May 2015 17:07:42 +0000 (17:07 +0000)]
am
a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs
* commit '
a67fa862dc6b46b7642e2abfc2df3146d8be5d98':
docs: support library 22.2 updates
Jason Monk [Tue, 26 May 2015 17:01:50 +0000 (17:01 +0000)]
Merge "QS: Only show summary for active wifi" into mnc-dev
Rich Slogar [Tue, 26 May 2015 16:58:41 +0000 (16:58 +0000)]
Merge "docs: support library 22.2 updates" into mnc-preview-docs
Jason Monk [Tue, 26 May 2015 16:54:12 +0000 (12:54 -0400)]
QS: Only show summary for active wifi
Bug:
20432208
Change-Id: Iedf6e4d102e64c53a633f8d377b5eb57768b1f17
Jason Monk [Tue, 26 May 2015 16:32:52 +0000 (16:32 +0000)]
Merge "Add constants for permissions granted status api" into mnc-dev
James Cook [Tue, 26 May 2015 16:16:34 +0000 (16:16 +0000)]
Merge "Cancel voice assist session on user switch" into mnc-dev
Joseph Wen [Tue, 26 May 2015 15:11:08 +0000 (15:11 +0000)]
Merge "Update Statement Service" into mnc-dev
dcashman [Tue, 26 May 2015 14:57:24 +0000 (14:57 +0000)]
Merge "Set error code on failed keyset manifest parsing." into mnc-dev
Jason Monk [Fri, 22 May 2015 18:50:21 +0000 (14:50 -0400)]
Add constants for permissions granted status api
Bug:
21078474
Change-Id: I6b0bcf0c11258ae263eb08366c14f9298798afdb
Lorenzo Colitti [Tue, 26 May 2015 08:31:47 +0000 (17:31 +0900)]
Specify more information in DhcpClient PendingIntents.
- Specify the package name. This provides a bit of security, but
not much since the package is "android".
- Specify the interface name so we can run more than one client
at a time.
Bug:
21395858
Bug:
19704592
Change-Id: I91c9ea15285b36628b6aef0b975c16a0b08d061e
Martijn Coenen [Tue, 26 May 2015 08:11:26 +0000 (08:11 +0000)]
Merge "Don't count lowmem mappings as memory used." into mnc-dev
Selim Cinek [Tue, 26 May 2015 07:34:17 +0000 (07:34 +0000)]
Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev
David Friedman [Tue, 26 May 2015 06:04:54 +0000 (06:04 +0000)]
am
515444ff: am
db9274e7: am
f8cd49ae: am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
515444ff434ff93c7b5c24bc356973f385e39adf':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 06:04:49 +0000 (06:04 +0000)]
am
e0f14f48: am
c25ff8e2: am
e11744fe: am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
e0f14f48416484029a478e17e6b2c5708e0e0010':
Docs: Sample-walkthrough chapters for NDK documentation
Oliver Woodman [Tue, 26 May 2015 06:04:44 +0000 (06:04 +0000)]
am
a61df8f6: am
056bc731: am
1ddb7cae: am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
a61df8f63c55d96c5443449a9fb538ad97224a52':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Johan Euphrosine [Tue, 26 May 2015 06:04:38 +0000 (06:04 +0000)]
am
4170d9e0: am
165d4585: am
1ccbe54f: am
46350fea: frameworks/base/docs/ndk: add missing doxygen css
* commit '
4170d9e05b5477d75e4d8a12718e5d7b6aff3cdd':
frameworks/base/docs/ndk: add missing doxygen css
David Friedman [Tue, 26 May 2015 05:53:08 +0000 (05:53 +0000)]
am
db9274e7: am
f8cd49ae: am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
db9274e70fcedc21d08abe340e7ef47d35258e50':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 05:53:03 +0000 (05:53 +0000)]
am
c25ff8e2: am
e11744fe: am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
c25ff8e2513e78b5e22d30b6fe513fdfb2f63643':
Docs: Sample-walkthrough chapters for NDK documentation
Oliver Woodman [Tue, 26 May 2015 05:52:59 +0000 (05:52 +0000)]
am
056bc731: am
1ddb7cae: am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
056bc731ca7a53067027b0e72f58779aaf3c558a':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Johan Euphrosine [Tue, 26 May 2015 05:52:54 +0000 (05:52 +0000)]
am
165d4585: am
1ccbe54f: am
46350fea: frameworks/base/docs/ndk: add missing doxygen css
* commit '
165d4585605f0fd7bcab798d9759f465ce4dca44':
frameworks/base/docs/ndk: add missing doxygen css
David Friedman [Tue, 26 May 2015 05:42:13 +0000 (05:42 +0000)]
am
f8cd49ae: am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
f8cd49ae178a29471d1424726b23a593e9ab43a1':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 05:37:15 +0000 (05:37 +0000)]
am
e11744fe: am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
e11744fefdb1678dc369a7fea5aaaf0a290fb697':
Docs: Sample-walkthrough chapters for NDK documentation
Oliver Woodman [Tue, 26 May 2015 05:37:07 +0000 (05:37 +0000)]
am
1ddb7cae: am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
1ddb7caedba247aa9174fc6c78c4ea6b3b4f5a89':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Johan Euphrosine [Tue, 26 May 2015 05:37:01 +0000 (05:37 +0000)]
am
1ccbe54f: am
46350fea: frameworks/base/docs/ndk: add missing doxygen css
* commit '
1ccbe54f2d651df7b9f9e5dfd3b58eaa2d92a9c8':
frameworks/base/docs/ndk: add missing doxygen css
David Friedman [Tue, 26 May 2015 05:26:58 +0000 (05:26 +0000)]
am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
d580302d622e4583c7ab2db8759ea8036614df6e':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 04:53:23 +0000 (21:53 -0700)]
Docs: Submitting fix for build-breaking CL 695942.
Change-Id: Ic384cfca07f7317c07e33d584340f1678a9f99e4
Adrian Roos [Tue, 26 May 2015 01:09:13 +0000 (18:09 -0700)]
Fix initial keyguard user switcher state
Bug:
18411080
Change-Id: I506968ee6101069361d83f7ef386802f5856a68e
Guang Zhu [Mon, 25 May 2015 19:38:40 +0000 (19:38 +0000)]
Merge "update app compatibility post launch detection" into mnc-dev
Dirk Dougherty [Mon, 25 May 2015 19:32:10 +0000 (19:32 +0000)]
am
31a84561: am
0417dbac: Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs
* commit '
31a84561ee28278ee0995c6cc27054b96372041f':
Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.
Dirk Dougherty [Mon, 25 May 2015 19:19:50 +0000 (19:19 +0000)]
am
0417dbac: Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs
* commit '
0417dbac1358661e2101e7ff1c9a873c59714bb9':
Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.
Guang Zhu [Mon, 25 May 2015 19:09:12 +0000 (12:09 -0700)]
update app compatibility post launch detection
decide if the app is still running after launch by checking
running tasks and look for a task with base activity belonging
to the package launched.
Change-Id: Ibb3894e765ccbca62f803decc3c1c1f36dc2d454
Dirk Dougherty [Mon, 25 May 2015 19:07:23 +0000 (19:07 +0000)]
Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs
Geoff Mendal [Mon, 25 May 2015 18:09:36 +0000 (18:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 25 May 2015 18:03:26 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8918640ef803392c6ac66b2293d1a67841bbfaa3
Auto-generated-cl: translation import
Chet Haase [Mon, 25 May 2015 15:47:36 +0000 (08:47 -0700)]
Clarify example for Deep Share
Changed name of service to avoid using the actual class name
ChooserTargetService as the example service's name.
Issue #
21418354 Clarify doc example for ChooserTargetService
Change-Id: I59bf67299fe7a8307504baf5e999c14f84a1e50d
Geoff Mendal [Mon, 25 May 2015 15:07:39 +0000 (15:07 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 25 May 2015 15:05:44 +0000 (10:05 -0500)]
Import translations. DO NOT MERGE
Change-Id: I9662a21a18c78c1599c7ebf55300f22b2df1a458
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 May 2015 14:53:44 +0000 (09:53 -0500)]
Import translations. DO NOT MERGE
Change-Id: Id4da8170bceabc117824f81c25a6019f5584ce0b
Auto-generated-cl: translation import
David Friedman [Mon, 25 May 2015 07:00:32 +0000 (07:00 +0000)]
am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
4a6d5c9399179abcef7877c43f46855152129bd3':
Docs: Sample-walkthrough chapters for NDK documentation
David Friedman [Fri, 22 May 2015 09:31:51 +0000 (02:31 -0700)]
Docs: Sample-walkthrough chapters for NDK documentation
Change-Id: If7422f36d5489271776c7ed085059502e1cdebea
Dirk Dougherty [Sun, 24 May 2015 13:57:08 +0000 (13:57 +0000)]
am
82159cd5: am
10d44b75: Doc change: Updates to preview and distribute.
* commit '
82159cd537c706f3dd7e33d0683705ebccffc370':
Doc change: Updates to preview and distribute.
Dirk Dougherty [Sun, 24 May 2015 12:31:01 +0000 (12:31 +0000)]
am
10d44b75: Doc change: Updates to preview and distribute.
* commit '
10d44b7581b67d6619c7060ca1d339e0d355c7af':
Doc change: Updates to preview and distribute.
Dirk Dougherty [Sat, 23 May 2015 21:46:57 +0000 (14:46 -0700)]
Doc change: Updates to preview and distribute.
Change-Id: I097213ce68d50d10b23840f2ad61f26279293948
Dirk Dougherty [Sat, 23 May 2015 23:32:50 +0000 (16:32 -0700)]
Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.
Change-Id: Id3144b172808b1cde555d778f31ad5b4db0d941b
Svet Ganov [Sat, 23 May 2015 20:31:54 +0000 (20:31 +0000)]
Merge "Hide pakcage installer system APIs." into mnc-dev
Svet Ganov [Sat, 23 May 2015 20:25:11 +0000 (13:25 -0700)]
Hide pakcage installer system APIs.
Change-Id: If5245ed2be7a3ebb50a7af924be85894314f6f47
Oliver Woodman [Sat, 23 May 2015 11:29:02 +0000 (11:29 +0000)]
am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
eb09fe5e3a9911daf4cb8e95145d2a6936aa189d':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Oliver Woodman [Sat, 23 May 2015 11:15:34 +0000 (11:15 +0000)]
Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
Joe Fernandez [Sat, 23 May 2015 10:22:21 +0000 (10:22 +0000)]
am
3b521a6a: am
38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit '
3b521a6ad53710171efee6c2ea72b4c3c5f37101':
docs: M Preview - Automatic Backups (Dolly) page
Joe Fernandez [Sat, 23 May 2015 10:08:49 +0000 (10:08 +0000)]
am
38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit '
380975104a9246c4f72f7882d855aec524267b6f':
docs: M Preview - Automatic Backups (Dolly) page
Joe Fernandez [Wed, 13 May 2015 08:13:51 +0000 (01:13 -0700)]
docs: M Preview - Automatic Backups (Dolly) page
Change-Id: Ia9e6815271f5f22d6f11f1d61e68b6670f51a53d
Joe Fernandez [Sat, 23 May 2015 09:39:38 +0000 (09:39 +0000)]
am
08162fec: am
84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
* commit '
08162fec0c6fe49dbc190457e9a898c961467b60':
docs: M Preview - update the preview section TOC
Joe Fernandez [Sat, 23 May 2015 08:03:24 +0000 (08:03 +0000)]
am
84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
* commit '
84fff53cd73ed017ed1f9342d39cc496fe74cac2':
docs: M Preview - update the preview section TOC
Joe Fernandez [Sat, 23 May 2015 07:50:48 +0000 (07:50 +0000)]
Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
Joe Fernandez [Sat, 16 May 2015 00:38:39 +0000 (17:38 -0700)]
docs: M Preview - update the preview section TOC
Change-Id: I5776d367df3baec13aee27a8e920de9d9b69782d
Johan Euphrosine [Sat, 23 May 2015 04:45:32 +0000 (04:45 +0000)]
am
33a4f81e: am
6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
* commit '
33a4f81edbb0047aef34126e6d584b168d992862':
frameworks/base/docs/ndk: fix typo in landing page
Johan Euphrosine [Sat, 23 May 2015 04:33:18 +0000 (04:33 +0000)]
am
6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
* commit '
6a7406bc1787d0b555ca3a3226a291d42554a94c':
frameworks/base/docs/ndk: fix typo in landing page
Selim Cinek [Sat, 23 May 2015 01:56:22 +0000 (18:56 -0700)]
Fixed logspam and handling subwindows with the input consumer
Bug:
21402648
Change-Id: I4c1c73487dfd19ba452ff2077d8541547f149c3b
Joe Fernandez [Sat, 23 May 2015 01:22:10 +0000 (01:22 +0000)]
am
528cf52e: am
6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
* commit '
528cf52e76c340caf2f0f9e6ef5b84ab4bd5b887':
docs: Add sample links and descriptions for M Preview
Deepanshu Gupta [Sat, 23 May 2015 01:21:09 +0000 (01:21 +0000)]
Merge "Revert "Fix build."" into mnc-dev
Deepanshu Gupta [Sat, 23 May 2015 01:19:23 +0000 (01:19 +0000)]
Revert "Fix build."
This reverts commit
97b3ae1a8766616675ebf2323a97d8adfd41bfdc.
Reverted since
4bb6b751fbbb218e8a298db4aa008472a0aa8d31 reverts
the commit that warranted this change.
Change-Id: I56d0eb8ffba44a673ae357e9543dd18f6c03c54f
Jean-Michel Trivi [Sat, 23 May 2015 01:19:01 +0000 (01:19 +0000)]
Merge "More android.media.AudioFormat javadoc" into mnc-dev
Jean-Michel Trivi [Thu, 21 May 2015 22:51:15 +0000 (15:51 -0700)]
More android.media.AudioFormat javadoc
More doc about AudioFormat constants, use of the builder,
sample rate, channel masks (position vs index, examples)
Bug
20921159
Change-Id: Ie60c2f3558b8b6008c6d9fb646ad9f6de396859d
Joe Fernandez [Sat, 23 May 2015 01:09:02 +0000 (01:09 +0000)]
am
6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
* commit '
6cf938c3021dd3492b43de6ee2664609e041a0c8':
docs: Add sample links and descriptions for M Preview
Johan Euphrosine [Sat, 23 May 2015 01:01:57 +0000 (18:01 -0700)]
frameworks/base/docs/ndk: fix typo in landing page
Change-Id: Ie792506b73e85dd58ebf481339801aa1d8036031
Joe Fernandez [Sat, 23 May 2015 00:57:21 +0000 (00:57 +0000)]
Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
Chris Craik [Sat, 23 May 2015 00:18:54 +0000 (17:18 -0700)]
Unflip TextureView getBitmap readback
bug:
20165725
Change-Id: I09035f43be140145c54221d6865206ce486994c9
Dianne Hackborn [Sat, 23 May 2015 00:34:34 +0000 (00:34 +0000)]
Merge "Revert "resolved conflicts for merge of
47249f2a to mnc-dev"" into mnc-dev
Simranjit Singh Kohli [Sat, 23 May 2015 00:20:38 +0000 (00:20 +0000)]
Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev
Dirk Dougherty [Sat, 23 May 2015 00:19:53 +0000 (00:19 +0000)]
am
c56a8313: am
b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
* commit '
c56a8313760243740b684fef4ae71d791a885b4d':
Doc change: updates for preview.
Joe Fernandez [Sat, 23 May 2015 00:19:48 +0000 (00:19 +0000)]
am
93cc5190: am
b373f49a: docs: NDK table of contents fixes
* commit '
93cc51908c6d57d43f5a2ae98a850aaa67ac6b64':
docs: NDK table of contents fixes
Simranjit Singh Kohli [Fri, 22 May 2015 21:00:32 +0000 (14:00 -0700)]
[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
Fixing lots of bugs related to the ChooseAccount Activities.
1. Fix jank which is seen when no accounts are present on the device.
2. After addition of the account, return to the user.
3. Don't crash when the user provides null to allowableAccountTypes.
4. Updated documentation of AccountManager#newChooseAccountIntent.
5. Fix NPE.
Bug:
13104800
Bug:
17926560
Bug:
9626001
Change-Id: I0d1913e46560cfb458526a7c930a38049602d8f1
Rich Slogar [Wed, 6 May 2015 23:30:47 +0000 (16:30 -0700)]
docs: support library 22.2 updates
Change-Id: Ib37450986613be6cfe9d3d6d6b349367221c9416
Dirk Dougherty [Sat, 23 May 2015 00:08:42 +0000 (00:08 +0000)]
am
b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
* commit '
b1410bc306195dc807f223bc5955780275fc6468':
Doc change: updates for preview.
Joe Fernandez [Sat, 23 May 2015 00:08:36 +0000 (00:08 +0000)]
am
b373f49a: docs: NDK table of contents fixes
* commit '
b373f49a85fcbe82993940416ce04e0a1fb1e340':
docs: NDK table of contents fixes
Amith Yamasani [Sat, 23 May 2015 00:05:46 +0000 (00:05 +0000)]
Merge "Add getPermissionGrantState method in device policy" into mnc-dev
Dirk Dougherty [Fri, 22 May 2015 23:59:16 +0000 (23:59 +0000)]
Merge "Doc change: updates for preview." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 23:58:14 +0000 (16:58 -0700)]
Doc change: updates for preview.
Change-Id: Ie741785ae4b21373fa49dbd7f725cab1f812891a
Joe Fernandez [Fri, 22 May 2015 19:27:04 +0000 (12:27 -0700)]
docs: NDK table of contents fixes
- fixing the encoding of the left navigation files for
- Guides
- References
- Samples
- Downloads
Change-Id: Ic3a45ff661f1c8e5784e833047764fecc6445cae
Yin-Chia Yeh [Fri, 22 May 2015 23:40:31 +0000 (23:40 +0000)]
Merge "Camera: update available LSC map mode key type" into mnc-dev
Yin-Chia Yeh [Fri, 22 May 2015 23:37:27 +0000 (16:37 -0700)]
Camera: update available LSC map mode key type
Bug:
21403373
Change-Id: I37101e2d0ef5cb8d66676dcdb16938ac8fe85c64
Dianne Hackborn [Fri, 22 May 2015 23:34:44 +0000 (16:34 -0700)]
Revert "resolved conflicts for merge of
47249f2a to mnc-dev"
This reverts commit
c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing
changes made to
8562b08f04c1309cf40db1e749d612b6824f1d12.
Dirk Dougherty [Fri, 22 May 2015 23:29:29 +0000 (23:29 +0000)]
am
09ffc01d: am
61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
* commit '
09ffc01dd3bfd21410d4d620ca8f8c40d4688a86':
Doc change: updates for preview content.
James Cook [Fri, 22 May 2015 22:52:29 +0000 (15:52 -0700)]
Cancel voice assist session on user switch
Ensure any active voice interaction session is canceled when the
voice interaction service is shutdown. This ensures that the UI window
is closed when a user switches accounts.
Bug:
20501283
Change-Id: I9f3dae5afc4048482f6bedaed36dbae3c0823ebd
Dirk Dougherty [Fri, 22 May 2015 23:14:47 +0000 (23:14 +0000)]
am
61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
* commit '
61e6be640b1e5d6ae4cacf0a2e62a7f66f42202c':
Doc change: updates for preview content.
Johan Euphrosine [Fri, 22 May 2015 23:06:20 +0000 (23:06 +0000)]
am
46350fea: frameworks/base/docs/ndk: add missing doxygen css
* commit '
46350feac7398aecb661880827b1c8963f0e8cc5':
frameworks/base/docs/ndk: add missing doxygen css
Dirk Dougherty [Fri, 22 May 2015 23:05:13 +0000 (23:05 +0000)]
Merge "Doc change: updates for preview content." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 17:23:10 +0000 (10:23 -0700)]
Doc change: updates for preview content.
Change-Id: Ife06f0e5b3ef6950d5d6fe452940c8dd87ed89ea
dcashman [Fri, 22 May 2015 22:24:40 +0000 (15:24 -0700)]
Set error code on failed keyset manifest parsing.
Bug:
21403585
Change-Id: I6f8e0766d373b1b0451b2abef7af6cbb089e4e0c
David Friedman [Fri, 22 May 2015 22:45:35 +0000 (22:45 +0000)]
am
eed8e782: am
dd4dc4a0: resolved conflicts for merge of
7044ee16 to mnc-preview-docs
* commit '
eed8e782ec22a11957c563e79010794571d43be9':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
OSDN Git Service
