118149 Commits

Author SHA1 Message Date
Scott Main
84b8cbdafe am 22591164: am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable
* commit '2259116450f25ae75d8d142a2bf15f3d5db35bd6':
  fix sidenav links to use toroot variable
2013-12-17 23:12:13 +00:00
Scott Main
2259116450 am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable
* commit '007ae376d7672a456213e7f5475de4a910594cb2':
  fix sidenav links to use toroot variable
2013-12-17 23:08:37 +00:00
Scott Main
007ae376d7 am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable
* commit '8c95a149b516595e22fa7b6479d7bc02750531c2':
  fix sidenav links to use toroot variable
2013-12-17 15:06:31 -08:00
Scott Main
8c95a149b5 am 5b50239c: fix sidenav links to use toroot variable
* commit '5b50239c33176e0b321d2ee32a589e0583767e02':
  fix sidenav links to use toroot variable
2013-12-17 23:03:49 +00:00
Scott Main
5b50239c33 fix sidenav links to use toroot variable
Change-Id: I5f63979adbe13ea0d02bb8fedc1a7d29d79f307f
2013-12-17 14:59:05 -08:00
Scott Main
6652ef463d 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
2013-12-17 22:06:38 +00:00
Scott Main
dd55de3ddc 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
2013-12-17 22:03:16 +00:00
Scott Main
9767f9e212 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
2013-12-17 14:00:45 -08:00
Scott Main
7df86ef441 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
2013-12-17 21:57:46 +00:00
Scott Main
9e36f58899 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 2013-12-17 21:54:48 +00:00
Dirk Dougherty
fe4a997be7 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.
2013-12-17 21:53:09 +00:00
Dirk Dougherty
bfc22ba251 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.
2013-12-17 21:50:46 +00:00
Dirk Dougherty
4ffa6a4ae9 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.
2013-12-17 13:45:32 -08:00
Dirk Dougherty
d994602f99 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.
2013-12-17 21:37:19 +00:00
Dirk Dougherty
731ba04536 Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 2013-12-17 21:34:58 +00:00
Scott Main
c797221f44 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
2013-12-17 21:29:00 +00:00
Scott Main
64d14b5cd9 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
2013-12-17 21:25:57 +00:00
Scott Main
37826fa9a9 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
2013-12-17 13:21:36 -08:00
Scott Main
4e73847ab0 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
2013-12-17 21:19:42 +00:00
Scott Main
5cdadb48d0 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
2013-12-17 13:14:17 -08:00
Dirk Dougherty
d6fb69933d Doc change: update list of tablets supported in Google Play for Education.
Change-Id: Ic042a7b7d422f843c8274d94b46f4a874014d7ff
2013-12-17 12:46:40 -08:00
Greg Hackmann
69ad42a3cf am 1877f7dc: am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '1877f7dc58d28146bd1907352cb46dbc95302cbb':
  Add /dev/rtc backend to SystemClock
2013-12-17 20:08:26 +00:00
Greg Hackmann
f1bdbdd1be resolved conflicts for merge of 08579921 to klp-modular-dev
Change-Id: I08e9f9a2d2185ccf0c41a87c8527ea7e02ac3117
2013-12-17 11:56:22 -08:00
Greg Hackmann
552eba80ef 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
2013-12-17 18:22:24 +00:00
Greg Hackmann
1877f7dc58 am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '0b64fa7e4b51f1ec96abf49abdc84e2a4c1b4294':
  Add /dev/rtc backend to SystemClock
2013-12-17 18:19:09 +00:00
Greg Hackmann
0857992140 am 060ae1db: am eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"
* commit '060ae1db7bba39cb8171f4267b5de9538f1ab440':
  Add timerfd backend to AlarmManagerService
2013-12-17 18:19:04 +00:00
Greg Hackmann
153ec6cae7 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
2013-12-17 18:18:58 +00:00
Greg Hackmann
0b64fa7e4b am c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit 'c978799c4a7cc8339d560bb47a029861230fa2a6':
  Add /dev/rtc backend to SystemClock
2013-12-17 10:15:37 -08:00
Greg Hackmann
060ae1db7b am eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"
* commit 'eb0ca2b7bfd70fbbf2bd730b1c431faac21d0416':
  Add timerfd backend to AlarmManagerService
2013-12-17 10:15:33 -08:00
Greg Hackmann
3545433d05 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
2013-12-17 10:15:29 -08:00
Greg Hackmann
c978799c4a Merge "Add /dev/rtc backend to SystemClock" 2013-12-17 18:11:06 +00:00
Greg Hackmann
eb0ca2b7bf Merge "Add timerfd backend to AlarmManagerService" 2013-12-17 18:10:49 +00:00
Greg Hackmann
9f4e67c50b Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 2013-12-17 18:10:33 +00:00
Craig Mautner
4e09cb9bf6 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.
2013-12-17 16:48:46 +00:00
Craig Mautner
38bcf6dc87 am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '422d7003db8d26b5fa503aa294348d7b53621db1':
  Fix to NullPointerException on move back in ActivityStack.
2013-12-17 16:45:06 +00:00
Craig Mautner
422d7003db am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit 'f431daa22811fdce9c4ec975d5d33121898b4f9b':
  Fix to NullPointerException on move back in ActivityStack.
2013-12-17 08:42:31 -08:00
Craig Mautner
f431daa228 Merge "Fix to NullPointerException on move back in ActivityStack." 2013-12-17 16:36:45 +00:00
Daniel 2 Olofsson
9cdf9e52d9 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
2013-12-17 11:35:23 +01:00
Scott Main
1ba5915dd0 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
2013-12-17 02:50:20 +00:00
Scott Main
a759b3d2b4 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
2013-12-17 02:47:50 +00:00
Scott Main
3fca61f073 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
2013-12-16 18:45:00 -08:00
Scott Main
75b8b3e008 am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit 'ed4b7faa4c17d086233d0b3f86fe315ceee5778e':
  add new training course for Interaction and Engagement
2013-12-17 02:06:05 +00:00
Scott Main
ed4b7faa4c Merge "add new training course for Interaction and Engagement" into klp-docs 2013-12-17 02:03:40 +00:00
Craig Mautner
3b475fefa3 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
2013-12-16 16:56:19 -08:00
Greg Hackmann
b7bbca2d6a 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>
2013-12-16 16:23:52 -08:00
Greg Hackmann
a1d6f92f34 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>
2013-12-16 16:23:51 -08:00
Trevor Johns
b8928b0593 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
2013-12-16 23:05:48 +00:00
Trevor Johns
987ac90d60 am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit 'ed8d921a2e8feae859bb1899356a936eb84fe50f':
  Docs: Clean up HCE dev guide
2013-12-16 23:02:44 +00:00
Trevor Johns
ed8d921a2e am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit 'eec66178668d22910d3889e62087b3797ebf6dd2':
  Docs: Clean up HCE dev guide
2013-12-16 14:59:19 -08:00
Trevor Johns
eec6617866 am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '73c1681b2f557dfba09a2e1a071dec190dd05e36':
  Docs: Clean up HCE dev guide
2013-12-16 22:56:38 +00:00