OSDN Git Service
quddusc [Thu, 26 Dec 2013 23:33:58 +0000 (15:33 -0800)]
am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
5d98ddf2f741c2a635b9df90cf896c9faceb1b33':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:33:52 +0000 (15:33 -0800)]
am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:33:47 +0000 (15:33 -0800)]
am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
34dbf7c32327dc61a106b9a2f50e22cdb6cf6242':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:33:43 +0000 (15:33 -0800)]
am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
5ad0e6289119dfaaa50a663e88dc0b978447302c':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:33:37 +0000 (15:33 -0800)]
am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
52604aadaafc0921c2f81df715f01bec546021a2':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
quddusc [Sat, 21 Dec 2013 00:15:49 +0000 (00:15 +0000)]
am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
fca563a2d600c2e2a4ca0af2446a72e8bb36206e':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Fri, 20 Dec 2013 23:21:38 +0000 (15:21 -0800)]
docs: Fixed code snippet for unbinding from IAB v3 service.
Bug:
11858905
Change-Id: Id1af4fc50a020ab520b2c836df8182db6c3a35bd
quddusc [Fri, 20 Dec 2013 23:10:33 +0000 (23:10 +0000)]
am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
70b96ec7303c1b34ff9d63a03359efadeec075c2':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Fri, 20 Dec 2013 23:10:28 +0000 (23:10 +0000)]
am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Fri, 20 Dec 2013 23:08:07 +0000 (23:08 +0000)]
Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
quddusc [Fri, 20 Dec 2013 23:07:34 +0000 (23:07 +0000)]
Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
quddusc [Fri, 20 Dec 2013 22:44:51 +0000 (14:44 -0800)]
docs: Added missing elements under "can contain:" list in manifest-element.html.
Bug:
5793521
Change-Id: I4340a8d043ebcf80634ad8cc1967b2a476a151d8
quddusc [Fri, 20 Dec 2013 23:01:28 +0000 (23:01 +0000)]
am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
12182bc236dd8e120a1f25d1a1862db744425558':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Fri, 20 Dec 2013 22:59:05 +0000 (22:59 +0000)]
Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
quddusc [Fri, 20 Dec 2013 22:55:09 +0000 (14:55 -0800)]
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description.
Bug:
6804017
Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0
quddusc [Fri, 20 Dec 2013 22:07:45 +0000 (14:07 -0800)]
docs: Fixed deprecated constructor.
Bug:
10581815
Change-Id: I057acf1ad3037418c7247f865b6cb0847a9eb7b6
quddusc [Fri, 20 Dec 2013 20:37:30 +0000 (20:37 +0000)]
am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
240aca333e340445f977d2a0e268a7c8d3a591e0':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
quddusc [Fri, 20 Dec 2013 00:59:17 +0000 (16:59 -0800)]
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Change-Id: Icc640ffffc553c5e8825178453515cedcdc8a63f
David Friedman [Thu, 19 Dec 2013 21:53:58 +0000 (13:53 -0800)]
am
c18061d5: am
7cd6cd31: NDK release notes for r9c for review
* commit '
c18061d5351fa4170b0b446fbea6300283789403':
NDK release notes for r9c for review
David Friedman [Thu, 19 Dec 2013 21:51:22 +0000 (21:51 +0000)]
am
7cd6cd31: NDK release notes for r9c for review
* commit '
7cd6cd3178b8fb3b25a2c2ddeaff2733bfab9f43':
NDK release notes for r9c for review
David Friedman [Tue, 26 Nov 2013 22:32:22 +0000 (14:32 -0800)]
NDK release notes for r9c for review
Staged at http://boku.mtv.corp.google.co:9196/tools/sdk/ndk/index.html
Change-Id: Id058d39e10ce64fff2def3dea746ac5e11eff2b4
(cherry picked from commit
51501634c7d530d691f4345990a2434a00603ba2)
Craig Mautner [Thu, 19 Dec 2013 17:55:33 +0000 (09:55 -0800)]
am
4dcf1af3: am
cccf2a33: Merge "Keydispatching timeout while finish Activity"
* commit '
4dcf1af3ed8dfa546e6cbf5ecfa66914a3fda883':
Keydispatching timeout while finish Activity
Craig Mautner [Thu, 19 Dec 2013 17:52:32 +0000 (09:52 -0800)]
am
cccf2a33: Merge "Keydispatching timeout while finish Activity"
* commit '
cccf2a333793badbcea9b04fe3f29447496a56d9':
Keydispatching timeout while finish Activity
Craig Mautner [Thu, 19 Dec 2013 17:48:58 +0000 (17:48 +0000)]
Merge "Keydispatching timeout while finish Activity"
Narayan Kamath [Thu, 19 Dec 2013 13:01:34 +0000 (05:01 -0800)]
am
2d2d5943: am
f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."
* commit '
2d2d594308693af79bf5c44f0dcc30f29d2dc31a':
MediaDrm#mNativeContext is a long, not int.
Narayan Kamath [Thu, 19 Dec 2013 12:37:52 +0000 (04:37 -0800)]
am
f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."
* commit '
f3172c623e4bb77a047262c6e7eedc4a2c2ea95a':
MediaDrm#mNativeContext is a long, not int.
Narayan Kamath [Thu, 19 Dec 2013 12:35:22 +0000 (12:35 +0000)]
Merge "MediaDrm#mNativeContext is a long, not int."
Martin Wallgren [Wed, 31 Aug 2011 10:39:31 +0000 (12:39 +0200)]
Keydispatching timeout while finish Activity
If there is input to be handled during finish activity we can get a
keydispatching timeout ANR. The reason is that finish activity is some
times not possible, and the activity is instead put on a finish queue.
The activity will then be finished sometime in the future. When we add
the activity to the finish queue, key dispatching is paused, and there
is an ANR timer waiting for it to be resumed again. Since it can take a
long time before the activity is actually finished, we need to resume
the key dispatching to avoid the ANR.
Change-Id: Icea4ab3b5ad05c8bfbadf8f5cece1a59ec621469
Brian Carlstrom [Thu, 19 Dec 2013 07:21:50 +0000 (23:21 -0800)]
am
f64a30f8: am
a11371f4: Merge "Track Looper decoupling from ALooper"
* commit '
f64a30f8a68fbd6ee4f7ae2f66267e23f04c5839':
Track Looper decoupling from ALooper
Brian Carlstrom [Thu, 19 Dec 2013 07:16:17 +0000 (23:16 -0800)]
am
a11371f4: Merge "Track Looper decoupling from ALooper"
* commit '
a11371f42b4dd793a48faa3323be34bca0f6d2e6':
Track Looper decoupling from ALooper
Brian Carlstrom [Thu, 19 Dec 2013 07:13:02 +0000 (07:13 +0000)]
Merge "Track Looper decoupling from ALooper"
Baligh Uddin [Thu, 19 Dec 2013 04:55:49 +0000 (20:55 -0800)]
am
2e371ee1: (-s ours) am
c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2e371ee14a59ecedeaa02d1b5f7fc518f9203520':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 04:52:34 +0000 (20:52 -0800)]
am
c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c5b19fd397f0c42fa64d79a50edec4e20394241f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 04:49:33 +0000 (04:49 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Brian Carlstrom [Fri, 13 Dec 2013 07:12:55 +0000 (23:12 -0800)]
Track Looper decoupling from ALooper
Change-Id: I54f4d36f105e60eaaa453ae60f591d634c681fd7
Tim Murray [Thu, 19 Dec 2013 01:48:22 +0000 (17:48 -0800)]
am
acf7b5d2: am
9dabdaec: Merge "Handle user-defined cache path for RS."
* commit '
acf7b5d24a98dc97b551e205bf7638f47d9304c0':
Handle user-defined cache path for RS.
Tim Murray [Thu, 19 Dec 2013 01:45:37 +0000 (17:45 -0800)]
am
9dabdaec: Merge "Handle user-defined cache path for RS."
* commit '
9dabdaec39836fc800bbdd5ea7b85c3d06889307':
Handle user-defined cache path for RS.
Tim Murray [Thu, 19 Dec 2013 01:42:41 +0000 (01:42 +0000)]
Merge "Handle user-defined cache path for RS."
Tim Murray [Fri, 13 Dec 2013 20:57:36 +0000 (12:57 -0800)]
Handle user-defined cache path for RS.
Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
Stephen Hines [Thu, 19 Dec 2013 00:36:39 +0000 (16:36 -0800)]
am
ad5ee2f4: (-s ours) am
7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit '
ad5ee2f40a1b248aea49657e9f7155daac4cf65e':
DO NOT MERGE - Fix improper declaration/use of pointer.
Baligh Uddin [Thu, 19 Dec 2013 00:36:21 +0000 (16:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3fa88a4097e6971c92bda10756ffd3699276bac3
Auto-generated-cl: translation import
Stephen Hines [Thu, 19 Dec 2013 00:32:59 +0000 (16:32 -0800)]
am
7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit '
7f8c70a1a48df91ee5541b03dc380c08ab6ebf42':
DO NOT MERGE - Fix improper declaration/use of pointer.
Stephen Hines [Thu, 19 Dec 2013 00:30:25 +0000 (00:30 +0000)]
Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
Stephen Hines [Thu, 19 Dec 2013 00:21:30 +0000 (16:21 -0800)]
DO NOT MERGE - Fix improper declaration/use of pointer.
https://code.google.com/p/android/issues/detail?id=61547
This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.
Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
Baligh Uddin [Thu, 19 Dec 2013 00:20:16 +0000 (16:20 -0800)]
am
17b489f3: (-s ours) am
50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
17b489f374fc878e2118a095511e209dd69ce3d4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 00:20:12 +0000 (16:20 -0800)]
am
142be9ce: (-s ours) am
db41eaef: (-s ours) Import translations. DO NOT MERGE
* commit '
142be9ce6beaca5e0949176a0a8775ba4cd9dc99':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 00:16:30 +0000 (16:16 -0800)]
am
50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
50391871e61e491cf766fc83e261a8345d1cb5b6':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 00:16:25 +0000 (16:16 -0800)]
am
db41eaef: (-s ours) Import translations. DO NOT MERGE
* commit '
db41eaef9036d069edd46d101cfa927e3a4cb694':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 00:14:26 +0000 (00:14 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 18 Dec 2013 23:37:22 +0000 (15:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I30e27dc30d542e9f2d3a23b3b1831cbd99e4b920
Auto-generated-cl: translation import
Baligh Uddin [Wed, 18 Dec 2013 23:11:27 +0000 (15:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id35b27dea34c2fbad7dcfe2b30a34b26beb4e989
Auto-generated-cl: translation import
Scott Main [Wed, 18 Dec 2013 18:17:33 +0000 (10:17 -0800)]
am
fb214e6b: am
3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify sectio
* commit '
fb214e6b108e84f7f55bee378c5c539a723b0569':
Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
Narayan Kamath [Wed, 18 Dec 2013 18:14:45 +0000 (10:14 -0800)]
am
be8fbb8f: Merge "Remove unused field from MediaMuxer"
* commit '
be8fbb8fb63fddac2310dfbafa2594ed165b16b1':
Remove unused field from MediaMuxer
Scott Main [Wed, 18 Dec 2013 18:14:12 +0000 (18:14 +0000)]
am
3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, p
* commit '
3032999bf35cd6a0f1643faacf08370ab69d979c':
Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
Scott Main [Wed, 18 Dec 2013 18:11:50 +0000 (18:11 +0000)]
Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification" into klp-docs
Narayan Kamath [Wed, 18 Dec 2013 18:08:58 +0000 (18:08 +0000)]
Merge "Remove unused field from MediaMuxer"
Scott Main [Thu, 5 Dec 2013 01:54:03 +0000 (17:54 -0800)]
Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite)
clarifications about different external directories,
information about required permissions,
intent resolution technique to match other docs,
clarify section headings, plus other code clarification
Change-Id: I62e3692a53bcd724676c74dc2c98eb72bcf58e1e
Narayan Kamath [Wed, 18 Dec 2013 17:51:06 +0000 (17:51 +0000)]
Remove unused field from MediaMuxer
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
Narayan Kamath [Wed, 18 Dec 2013 16:53:54 +0000 (16:53 +0000)]
MediaDrm#mNativeContext is a long, not int.
Therefore, we must use SetLongField and not SetIntField.
Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
Narayan Kamath [Wed, 18 Dec 2013 13:00:02 +0000 (05:00 -0800)]
am
3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."
* commit '
3da645f307695949623d78f280ce12e932eb057c':
Don't pseudolocalize untranslatable strings.
Narayan Kamath [Wed, 18 Dec 2013 12:46:40 +0000 (12:46 +0000)]
Merge "Don't pseudolocalize untranslatable strings."
Scott Main [Wed, 18 Dec 2013 00:44:31 +0000 (16:44 -0800)]
am
efe10233: am
5dcb75e6: Merge "fix typos bug:
11693951 bug:
12118617" into klp-docs
* commit '
efe102332861bd05f0cba60e729661607546de34':
fix typos bug:
11693951 bug:
12118617
Scott Main [Wed, 18 Dec 2013 00:41:23 +0000 (00:41 +0000)]
am
5dcb75e6: Merge "fix typos bug:
11693951 bug:
12118617" into klp-docs
* commit '
5dcb75e67b7a3401aa501126bc8401f78c181a68':
fix typos bug:
11693951 bug:
12118617
Scott Main [Wed, 18 Dec 2013 00:38:30 +0000 (00:38 +0000)]
Merge "fix typos bug:
11693951 bug:
12118617" into klp-docs
Scott Main [Tue, 17 Dec 2013 23:06:31 +0000 (15:06 -0800)]
am
8c95a149: am
5b50239c: fix sidenav links to use toroot variable
* commit '
8c95a149b516595e22fa7b6479d7bc02750531c2':
fix sidenav links to use toroot variable
Scott Main [Tue, 17 Dec 2013 23:03:49 +0000 (23:03 +0000)]
am
5b50239c: fix sidenav links to use toroot variable
* commit '
5b50239c33176e0b321d2ee32a589e0583767e02':
fix sidenav links to use toroot variable
Scott Main [Tue, 17 Dec 2013 22:59:05 +0000 (14:59 -0800)]
fix sidenav links to use toroot variable
Change-Id: I5f63979adbe13ea0d02bb8fedc1a7d29d79f307f
Scott Main [Tue, 17 Dec 2013 22:00:45 +0000 (14:00 -0800)]
am
7df86ef4: am
9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502" into klp-docs
* commit '
7df86ef441835aedf24477f61e12cf78c5a86244':
update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502
Scott Main [Tue, 17 Dec 2013 21:57:46 +0000 (21:57 +0000)]
am
9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502" into klp-docs
* commit '
9e36f588993e02210f02d9b7c0600a842d67bbdb':
update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502
Scott Main [Tue, 17 Dec 2013 21:47:55 +0000 (13:47 -0800)]
fix typos
bug:
11693951
bug:
12118617
Change-Id: I7a3ab4c6d7bc124ff9ed8779700e77c87409569d
Scott Main [Tue, 17 Dec 2013 21:54:48 +0000 (21:54 +0000)]
Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502" into klp-docs
Dirk Dougherty [Tue, 17 Dec 2013 21:45:32 +0000 (13:45 -0800)]
am
d994602f: am
731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit '
d994602f99827adc589946453ab58551e31f878e':
Doc change: update list of tablets supported in Google Play for Education.
Dirk Dougherty [Tue, 17 Dec 2013 21:37:19 +0000 (21:37 +0000)]
am
731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit '
731ba04536a07582904b4bf64a9eed896cb93bc5':
Doc change: update list of tablets supported in Google Play for Education.
Dirk Dougherty [Tue, 17 Dec 2013 21:34:57 +0000 (21:34 +0000)]
Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
Scott Main [Tue, 17 Dec 2013 21:21:36 +0000 (13:21 -0800)]
am
4e73847a: am
5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above
* commit '
4e73847ab0d2278c314f67496b896d4de8c7abdb':
initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
Scott Main [Tue, 17 Dec 2013 21:19:42 +0000 (21:19 +0000)]
am
5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perf
* commit '
5cdadb48d0e696352c21794861ba533214b06318':
initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
Scott Main [Wed, 6 Nov 2013 02:29:52 +0000 (18:29 -0800)]
initial shuffle of the API guide nav to add introduction
* revise to the Compatibility doc, put it in Intro
* put Permissions in Intro
* put App Fundamentals in Intro
* move Manifest docs to the top of side nav tree
* move App Resources above UI
Will perform another fix to the Best Practices section
later to deprecate some docs there and point to Training instead
Change-Id: I88a8f94167ba15e97eb3bbbc08fd82dd82498e4b
Dirk Dougherty [Tue, 17 Dec 2013 20:46:40 +0000 (12:46 -0800)]
Doc change: update list of tablets supported in Google Play for Education.
Change-Id: Ic042a7b7d422f843c8274d94b46f4a874014d7ff
Greg Hackmann [Tue, 17 Dec 2013 18:15:37 +0000 (10:15 -0800)]
am
c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '
c978799c4a7cc8339d560bb47a029861230fa2a6':
Add /dev/rtc backend to SystemClock
Greg Hackmann [Tue, 17 Dec 2013 18:15:33 +0000 (10:15 -0800)]
am
eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"
* commit '
eb0ca2b7bfd70fbbf2bd730b1c431faac21d0416':
Add timerfd backend to AlarmManagerService
Greg Hackmann [Tue, 17 Dec 2013 18:15:29 +0000 (10:15 -0800)]
am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
9f4e67c50b5c311adeaaf6135ef79214a46d0e26':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Greg Hackmann [Tue, 17 Dec 2013 18:11:06 +0000 (18:11 +0000)]
Merge "Add /dev/rtc backend to SystemClock"
Greg Hackmann [Tue, 17 Dec 2013 18:10:49 +0000 (18:10 +0000)]
Merge "Add timerfd backend to AlarmManagerService"
Greg Hackmann [Tue, 17 Dec 2013 18:10:32 +0000 (18:10 +0000)]
Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
Craig Mautner [Tue, 17 Dec 2013 16:42:31 +0000 (08:42 -0800)]
am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
f431daa22811fdce9c4ec975d5d33121898b4f9b':
Fix to NullPointerException on move back in ActivityStack.
Craig Mautner [Tue, 17 Dec 2013 16:36:44 +0000 (16:36 +0000)]
Merge "Fix to NullPointerException on move back in ActivityStack."
Daniel 2 Olofsson [Mon, 16 Dec 2013 12:24:25 +0000 (13:24 +0100)]
Fix to NullPointerException on move back in ActivityStack.
In ActivityTask.moveTaskToBackLocked NullPointerException may occur
when moving back with only current Activity in stack. This due to a
condition that may trigger despite a TaskRecord being null and then
attempt accessing the TaskRecord.mOnTopOfHome variable.
TaskRecord task may be set to null when no resumed activity remain.
Resolved by assuring that flag mOnTopOfHome is instead set to false
for current TaskRecord in case where there are no remaining activities
above home.
The above bug has already been corrected in the following commit,
ada62fca51d314cefe2c5da4e007df5b9abf320d, but it does not set the
cottect value to mTopOfHome for the current taks, see below.
Variable mOnTopOfHome will not be set to false in situations where
stack is of size 1 or less and task is null, perhaps from already
having finished current activity.
To avoid current TaskRecord maintaining value mOnTopOfHome to true
after launching Home this variable is set to false.
Impact should not be major due to correction earlier that makes sure
that there is always a TaskRecord.mOnTopOfHome set to true above Home
activity but if not correctly set for current task still gives a
possibility of bad behavior.
Change-Id: Ie86ad99c188aaa05b0de9d58eaa16c42b6fc4341
Scott Main [Tue, 17 Dec 2013 02:45:00 +0000 (18:45 -0800)]
am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
75b8b3e008589c0a02c27d5baa6b3314a020f505':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:06:05 +0000 (02:06 +0000)]
am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
ed4b7faa4c17d086233d0b3f86fe315ceee5778e':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:03:40 +0000 (02:03 +0000)]
Merge "add new training course for Interaction and Engagement" into klp-docs
Greg Hackmann [Thu, 12 Dec 2013 02:00:34 +0000 (18:00 -0800)]
Add /dev/rtc backend to SystemClock
On devices without /dev/alarm, use the settimeofday() syscall and the
standard RTC_SET_TIME ioctl (which are collectively equivalent to the
ANDROID_ALARM_SET_RTC ioctl).
Change-Id: I3c1d741099e253186e43c9369b62603b214b9c9a
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Tue, 10 Dec 2013 00:56:53 +0000 (16:56 -0800)]
Add timerfd backend to AlarmManagerService
On devices without /dev/alarm, use a new backend based on timerfd.
timerfd has near-equivalent syscalls for the /dev/alarm ioctls we care
about, with two key differences:
1) /dev/alarm uses one fd for all clocks, while timerfd needs one fd per
clock type.
AlarmManagerService addresses this by replacing the fd (int) with an
opaque pointer (long) to the backend-specific state.
2) When the RTC changes, the /dev/alarm WAIT ioctl always returns, while
timerfd cancels (and signals events) only on specially-flagged RTC
timerfds.
The timerfd backend masks this by creating an extraneous RTC timerfd,
specifically so there's always something to signal on RTC changes.
Change-Id: I5aef867748298610347f6e1479dd8bf569495832
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Trevor Johns [Mon, 16 Dec 2013 22:59:19 +0000 (14:59 -0800)]
am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
eec66178668d22910d3889e62087b3797ebf6dd2':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 22:56:38 +0000 (22:56 +0000)]
am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
73c1681b2f557dfba09a2e1a071dec190dd05e36':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 22:43:47 +0000 (22:43 +0000)]
Merge "Docs: Clean up HCE dev guide" into klp-docs
Trevor Johns [Fri, 13 Dec 2013 04:09:14 +0000 (20:09 -0800)]
Docs: Clean up HCE dev guide
Fixed various typos and minor errors in the HCE dev guide. Also added a
note to clarify when CATEGORY_PAYMENT should be used vs CATEGORY_OTHER.
Issue:
11991294
Change-Id: Ifa3f30fe5f35715a4cea3f3565b6f3771f44814a
Signed-off-by: Trevor Johns <trevorjohns@google.com>
Scott Main [Mon, 16 Dec 2013 21:31:45 +0000 (13:31 -0800)]
Scott Main [Mon, 16 Dec 2013 21:29:18 +0000 (21:29 +0000)]
Scott Main [Mon, 16 Dec 2013 21:22:08 +0000 (13:22 -0800)]
fix typo
bug:
12174614
Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f
Scott Main [Tue, 10 Dec 2013 02:02:48 +0000 (18:02 -0800)]
add new training course for Interaction and Engagement
Change-Id: If0880399c495aa9233cd30aa119b2d48fccd3dd8