OSDN Git Service
Alan Viverette [Wed, 18 Dec 2013 02:44:31 +0000 (02:44 +0000)]
Merge "Peek the fast scroll thumb when it transitions to enabled state"
Alan Viverette [Wed, 18 Dec 2013 02:31:39 +0000 (02:31 +0000)]
Merge "Ensure transient state views are consistently temporarily detached"
Scott Main [Wed, 18 Dec 2013 00:53:57 +0000 (00:53 +0000)]
Scott Main [Wed, 18 Dec 2013 00:50:59 +0000 (00:50 +0000)]
Scott Main [Wed, 18 Dec 2013 00:48:03 +0000 (00:48 +0000)]
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
Chris Craik [Tue, 17 Dec 2013 23:24:14 +0000 (23:24 +0000)]
Merge "Check mDisplayListData before deref"
Scott Main [Tue, 17 Dec 2013 23:15:06 +0000 (23:15 +0000)]
am
84b8cbda: am
22591164: am
007ae376: am
8c95a149: am
5b50239c: fix sidenav links to use toroot variable
* commit '
84b8cbdafe1ed6b3d16291c6a0b7ec95ffcd076e':
fix sidenav links to use toroot variable
Scott Main [Tue, 17 Dec 2013 23:12:13 +0000 (23:12 +0000)]
am
22591164: am
007ae376: am
8c95a149: am
5b50239c: fix sidenav links to use toroot variable
* commit '
2259116450f25ae75d8d142a2bf15f3d5db35bd6':
fix sidenav links to use toroot variable
Scott Main [Tue, 17 Dec 2013 23:08:37 +0000 (23:08 +0000)]
am
007ae376: am
8c95a149: am
5b50239c: fix sidenav links to use toroot variable
* commit '
007ae376d7672a456213e7f5475de4a910594cb2':
fix sidenav links to use toroot variable
Chris Craik [Tue, 17 Dec 2013 23:07:47 +0000 (15:07 -0800)]
Check mDisplayListData before deref
bug:
12191897
Change-Id: I72ed3801e72c657b9d7736b0efb33c5e7cfd5b57
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
Tim Murray [Tue, 17 Dec 2013 22:14:29 +0000 (22:14 +0000)]
Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
Scott Main [Tue, 17 Dec 2013 22:10:05 +0000 (22:10 +0000)]
am
6652ef46: am
dd55de3d: am
9767f9e2: 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:
1190750
* commit '
6652ef463dd7976f522dac7fca5be06e11188cd4':
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 22:06:38 +0000 (22:06 +0000)]
am
dd55de3d: am
9767f9e2: 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-d
* commit '
dd55de3ddc7d9e7d2782a409560cb3eda30ba05b':
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 22:03:16 +0000 (22:03 +0000)]
am
9767f9e2: 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 '
9767f9e2120609ada992e558ba16608aafa96811':
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 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
Dirk Dougherty [Tue, 17 Dec 2013 21:55:36 +0000 (21:55 +0000)]
am
fe4a997b: am
bfc22ba2: am
4ffa6a4a: am
d994602f: am
731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit '
fe4a997be76e70952566f301577393e7339c7199':
Doc change: update list of tablets supported in Google Play for Education.
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:53:09 +0000 (21:53 +0000)]
am
bfc22ba2: am
4ffa6a4a: am
d994602f: am
731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit '
bfc22ba251ae5eba7ce68d5a8281042519c187a0':
Doc change: update list of tablets supported in Google Play for Education.
Dirk Dougherty [Tue, 17 Dec 2013 21:50:46 +0000 (21:50 +0000)]
am
4ffa6a4a: am
d994602f: am
731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit '
4ffa6a4ae930f724d2e16e85110892db9bb6280e':
Doc change: update list of tablets supported in Google Play for Education.
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
Alan Viverette [Tue, 17 Dec 2013 21:29:02 +0000 (13:29 -0800)]
Add reveal drawable, APIs for forwarding Drawable focus and touch
Hotspot APIs are hidden pending finalization of how we handle IDs.
BUG:
11416827
Change-Id: Iecacb4b8e3690930d2d805ae65a50cf33482a218
Scott Main [Tue, 17 Dec 2013 21:32:12 +0000 (21:32 +0000)]
am
c797221f: am
64d14b5c: am
37826fa9: 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 s
* commit '
c797221f4400c19e9080a1037744094e1bc15801':
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:29:00 +0000 (21:29 +0000)]
am
64d14b5c: am
37826fa9: 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
* commit '
64d14b5cd9c548b313da1a9b211c3ea02deb753d':
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
Tim Murray [Tue, 17 Dec 2013 21:28:17 +0000 (13:28 -0800)]
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
Scott Main [Tue, 17 Dec 2013 21:25:57 +0000 (21:25 +0000)]
am
37826fa9: 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 Re
* commit '
37826fa9a973463d5698cbdaa4c844c981804459':
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: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 20:13:00 +0000 (20:13 +0000)]
am
69ad42a3: am
1877f7dc: am
0b64fa7e: am
c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '
69ad42a3cf12bf39fe2c47c4298f23567b3306ef':
Add /dev/rtc backend to SystemClock
Greg Hackmann [Tue, 17 Dec 2013 20:09:09 +0000 (20:09 +0000)]
am
f1bdbdd1: resolved conflicts for merge of
08579921 to klp-modular-dev
* commit '
f1bdbdd1bea9662f6731b7a366de1f602f43e5a9':
Add timerfd backend to AlarmManagerService
Greg Hackmann [Tue, 17 Dec 2013 20:08:26 +0000 (20:08 +0000)]
am
1877f7dc: am
0b64fa7e: am
c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '
1877f7dc58d28146bd1907352cb46dbc95302cbb':
Add /dev/rtc backend to SystemClock
Greg Hackmann [Tue, 17 Dec 2013 19:56:22 +0000 (11:56 -0800)]
resolved conflicts for merge of
08579921 to klp-modular-dev
Change-Id: I08e9f9a2d2185ccf0c41a87c8527ea7e02ac3117
Zhijun He [Tue, 17 Dec 2013 18:38:54 +0000 (18:38 +0000)]
Merge "Camera2: Update metadata java docs"
Zhijun He [Tue, 17 Dec 2013 18:35:40 +0000 (10:35 -0800)]
Camera2: Update metadata java docs
Java docs for below keys are updated:
- android.edge.mode
- android.noiseReduction.mode
Bug:
12135317
Change-Id: I950d46b90ece2f519e33719427801fc78b36b39c
Greg Hackmann [Tue, 17 Dec 2013 18:24:40 +0000 (18:24 +0000)]
am
552eba80: am
153ec6ca: am
3545433d: am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
552eba80ef8f48204e77129dd99581d8f0ac3831':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Greg Hackmann [Tue, 17 Dec 2013 18:22:24 +0000 (18:22 +0000)]
am
153ec6ca: am
3545433d: am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
153ec6cae7db2053c71541af8973244f0dbf6d4a':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Greg Hackmann [Tue, 17 Dec 2013 18:19:09 +0000 (18:19 +0000)]
am
0b64fa7e: am
c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '
0b64fa7e4b51f1ec96abf49abdc84e2a4c1b4294':
Add /dev/rtc backend to SystemClock
Greg Hackmann [Tue, 17 Dec 2013 18:19:04 +0000 (18:19 +0000)]
am
060ae1db: am
eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"
* commit '
060ae1db7bba39cb8171f4267b5de9538f1ab440':
Add timerfd backend to AlarmManagerService
Greg Hackmann [Tue, 17 Dec 2013 18:18:58 +0000 (18:18 +0000)]
am
3545433d: am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
3545433d052769417dcdd70bc59fbf31f9925ba4':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
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"
Baligh Uddin [Tue, 17 Dec 2013 17:23:42 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 17 Dec 2013 17:23:38 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 17 Dec 2013 17:23:33 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Craig Mautner [Tue, 17 Dec 2013 16:51:58 +0000 (16:51 +0000)]
am
4e09cb9b: am
38bcf6dc: am
422d7003: am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
4e09cb9bf6165f68b42549772b74596ceb6198fe':
Fix to NullPointerException on move back in ActivityStack.
Craig Mautner [Tue, 17 Dec 2013 16:48:46 +0000 (16:48 +0000)]
am
38bcf6dc: am
422d7003: am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
38bcf6dc8784625eb4b68634450c578719346669':
Fix to NullPointerException on move back in ActivityStack.
Craig Mautner [Tue, 17 Dec 2013 16:45:06 +0000 (16:45 +0000)]
am
422d7003: am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
422d7003db8d26b5fa503aa294348d7b53621db1':
Fix to NullPointerException on move back in ActivityStack.
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:53:54 +0000 (02:53 +0000)]
am
1ba5915d: am
a759b3d2: am
3fca61f0: am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
1ba5915dd09675485d55536301fdd7d80a305504':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:50:20 +0000 (02:50 +0000)]
am
a759b3d2: am
3fca61f0: am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
a759b3d2b4c822a735a3a023be9b484cc05e0b19':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:47:50 +0000 (02:47 +0000)]
am
3fca61f0: am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
3fca61f073b89136396022d78f444d0a50c1a0d3':
add new training course for Interaction and Engagement
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
Alan Viverette [Tue, 17 Dec 2013 02:13:09 +0000 (02:13 +0000)]
Merge "Fix stroke color in GradientState.initializeWithState()"
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
Alan Viverette [Tue, 17 Dec 2013 01:55:08 +0000 (17:55 -0800)]
Fix stroke color in GradientState.initializeWithState()
BUG:
12175674
Change-Id: I084339fd3c31a9b49f5875c9d3bac8f50cd027ca
Shishir Agrawal [Tue, 17 Dec 2013 01:47:14 +0000 (01:47 +0000)]
Chris Craik [Tue, 17 Dec 2013 01:37:57 +0000 (01:37 +0000)]
Merge "Use vertex assignment instead of manual copy"
Craig Mautner [Tue, 17 Dec 2013 01:35:09 +0000 (01:35 +0000)]
am
3b475fef: Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
* commit '
3b475fefa3b83ce49454936a0be3081753e3e8ad':
Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
Shishir Agrawal [Tue, 17 Dec 2013 01:32:56 +0000 (17:32 -0800)]
Fixing build breakage due to:
c4d41755d73ffe85d179d42a4f0c993b49303145
Mismatched @param in javadoc.
Change-Id: I9034fac389e89e59c0245203543f52504bfc58d7
Alan Viverette [Tue, 17 Dec 2013 01:20:22 +0000 (01:20 +0000)]
Merge "Replace auto-create in findViewById() with explicit create() API"
Chris Craik [Tue, 17 Dec 2013 01:08:15 +0000 (17:08 -0800)]
Use vertex assignment instead of manual copy
Change-Id: I36c806e3370abca61e5bf5064f0f1a776a9ce487
Zhijun He [Tue, 17 Dec 2013 00:56:35 +0000 (16:56 -0800)]
camera2: update java docs for metadata tag spec update
Below tag spec java docs are updated:
- android.control.mode
- android.control.aeMode
- android.control.afMode
- android.control.awbMode
Bug:
12135317
Change-Id: I83f24c1816dfba1cc042e120fba43c5beb1bd2ae
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.
Fixes bug
12171535.
Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
Craig Mautner [Tue, 17 Dec 2013 00:50:19 +0000 (00:50 +0000)]
Merge "Fix incorrect setting of TaskRecord.frontOfTask"
Shishir Agrawal [Tue, 17 Dec 2013 00:44:40 +0000 (00:44 +0000)]
Merge "Adding support for SIM communication from Android over logical channels."
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>
Chris Craik [Tue, 17 Dec 2013 00:11:28 +0000 (00:11 +0000)]
Merge "Create private properties on GLCanvas for experimentation with 3d"
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.
Fixes bug
12171535.
Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
Alan Viverette [Mon, 16 Dec 2013 23:49:35 +0000 (23:49 +0000)]
Merge "Refactor display adjustments into their own utils class"
Alan Viverette [Mon, 16 Dec 2013 23:36:49 +0000 (23:36 +0000)]
Merge "Don't cast FastScroller adapter to BaseAdapter"
Trevor Johns [Mon, 16 Dec 2013 23:27:57 +0000 (23:27 +0000)]
am
b8928b05: am
987ac90d: am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
b8928b05932f9592cfeeb9c3cdc96c4066de2d55':
Docs: Clean up HCE dev guide
Scott Main [Mon, 16 Dec 2013 23:27:51 +0000 (23:27 +0000)]
Elliott Hughes [Mon, 16 Dec 2013 23:27:39 +0000 (23:27 +0000)]
am
3bfc6e76: am
c0d6028f: am
a012fee3: am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
3bfc6e76e627d4122a774488f36fb843bb3694fb':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Christopher Tate [Mon, 16 Dec 2013 23:27:30 +0000 (23:27 +0000)]
am
409b7c98: (-s ours) am
4275cae4: am
e998b607: am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
409b7c98b47cb7ece2760aa53730233f54946e46':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Trevor Johns [Mon, 16 Dec 2013 23:05:48 +0000 (23:05 +0000)]
am
987ac90d: am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
987ac90d60b8a0b5ae909ce80b5234c1e5c41068':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 23:02:44 +0000 (23:02 +0000)]
am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
ed8d921a2e8feae859bb1899356a936eb84fe50f':
Docs: Clean up HCE dev guide
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
Chris Craik [Mon, 16 Dec 2013 01:10:19 +0000 (17:10 -0800)]
Create private properties on GLCanvas for experimentation with 3d
Change-Id: I17772f61efce727cb4c1111f4d97f58c741786b8
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>