Commit Graph

11181 Commits

Author SHA1 Message Date
Andrew Hsieh
ed7dac09d8 Remove obsolete LOCAL_NDK_VERSION
Other than it's obsolete, it's outdated to use r4 (rather than the
most recently one)

Change-Id: I0a0dca663056a071a714d49a5d5bb77bd379c18a
2012-10-15 13:06:26 +08:00
The Android Automerger
617f824298 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 16:34:28 -07:00
Scott Main
ec54ca1518 add redirect from nofification summary page to Notifications doc
because this navigation is now flat so each doc is visible in side nav at top

Change-Id: I64e8788a8d7bb7992c410cec0c494b8157d4d651
2012-10-12 12:15:09 -07:00
The Android Automerger
018dba6896 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 11:49:50 -07:00
Laurent Tu
f7e5b78d88 am 72452858: am 91d9d51f: Return accuracy in GPS emulation
* commit '72452858484192b07e550ae42f9068e3767cf68d':
  Return accuracy in GPS emulation
2012-10-12 11:10:10 -07:00
The Android Automerger
41359ffcda merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 10:26:27 -07:00
Laurent Tu
7245285848 am 91d9d51f: Return accuracy in GPS emulation
* commit '91d9d51f5d3371d64b089c63e06409f8e2c92ea0':
  Return accuracy in GPS emulation
2012-10-12 09:49:29 -07:00
Andrew Hsieh
d8e477e5d4 am 9d5538b1: Merge "[ndk] Fixed sample SanAngeles to properly pause/resume"
* commit '9d5538b1b56f0586f57cfb80b2421bf651d526b6':
  [ndk] Fixed sample SanAngeles to properly pause/resume
2012-10-12 09:41:57 -07:00
Andrew Hsieh
9d5538b1b5 Merge "[ndk] Fixed sample SanAngeles to properly pause/resume" 2012-10-12 09:26:28 -07:00
The Android Open Source Project
02a69132d5 Reconcile with jb-mr1-release - do not merge
Change-Id: Ib40f58fc6838a4be9231e221e4ba337b59bd1d3f
2012-10-12 07:30:39 -07:00
Andrew Hsieh
d16812351b [ndk] Fixed sample SanAngeles to properly pause/resume
Previously re-launch of background SanAngeles app shows black or
freeze frame

Two fixes:
1. Not to reinitialize timer each time when DemoRenderer is created
2. Stop advancing internal clock when onPause(), and start when
   onResume()

Change-Id: I6bef9d7c462cd4d504e76099a4d28c8618043f46
2012-10-12 19:28:56 +08:00
Laurent Tu
91d9d51f5d Return accuracy in GPS emulation
Accuracy is now a required field for location. To comply, set an
accuracy in returned fix. The accuracy is constant for now since
computing it from the NMEA sentence seems to be very complicated.

Bug: 6864500

Change-Id: Iff4c36b440b095539c717d35a812ee2ed7c1725f
2012-10-11 20:43:53 -07:00
Dianne Hackborn
05b0dcec94 am 1eb2e84c: am 9da08122: More on issue #7318666: hide developer options from user build
* commit '1eb2e84c0ebd06529d4a91003d35aed3056e106e':
  More on issue #7318666: hide developer options from user build
2012-10-11 17:10:56 -07:00
The Android Automerger
9cf43ae934 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 16:26:22 -07:00
Dianne Hackborn
1eb2e84c0e am 9da08122: More on issue #7318666: hide developer options from user build
* commit '9da081228438a35c181c0f3d138698b007532c69':
  More on issue #7318666: hide developer options from user build
2012-10-11 10:48:13 -07:00
Dianne Hackborn
9da0812284 More on issue #7318666: hide developer options from user build
The Dev Tools app now tries to add a link to Development Settings
at the top of its list.

Also add a new "Development Settings" app that directly takes you
to the development settings activity, as a stand-alone app that
could be distributed as a regular third party app.

Change-Id: I8fe2b6a32cf4e37d69f4ce7b8d646a147b492d99
2012-10-10 19:01:09 -07:00
The Android Open Source Project
0cf0f743d3 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I46fd654e5e5a4088c616ed35b901eb1e8ed4d963
2012-10-10 09:44:04 -07:00
The Android Automerger
2facb7b969 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 08:43:30 -07:00
Jeff Sharkey
6de7bde49b am 0eb3e46a: am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev
* commit '0eb3e46a49af423f5d17b81d487224dab214786f':
  Follow RegisteredServicesCache API changes.
2012-10-10 08:33:33 -07:00
Jeff Sharkey
0eb3e46a49 am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev
* commit 'c9ff3bce8b398252ee2978cca43b5ec88937f1ab':
  Follow RegisteredServicesCache API changes.
2012-10-10 08:30:28 -07:00
The Android Automerger
c4351cf30e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:14 -07:00
Jeff Sharkey
c9ff3bce8b Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev 2012-10-09 23:47:12 -07:00
Brian Muramatsu
ab8b25ff8e am 03c58239: am c6fbad00: Merge "Make all monkeys do the same thing" into jb-mr1-dev
* commit '03c582390784406fa227e3804cf679eacf37aa00':
  Make all monkeys do the same thing
2012-10-09 19:17:05 -07:00
Brian Muramatsu
03c5823907 am c6fbad00: Merge "Make all monkeys do the same thing" into jb-mr1-dev
* commit 'c6fbad006a4c9385670ec7c26e71a802bf1f608b':
  Make all monkeys do the same thing
2012-10-09 19:14:50 -07:00
Brian Muramatsu
c6fbad006a Merge "Make all monkeys do the same thing" into jb-mr1-dev 2012-10-09 19:12:39 -07:00
Raphael Moll
b41080c00b am 806cac72: am c1a8e1ec: resolved conflicts for merge of d6308897 to jb-mr1-dev
* commit '806cac729996161f216460f67081857737d585ea':
  SDK JB MR0: doc is 16 rev 3
2012-10-09 14:02:58 -07:00
Raphael Moll
806cac7299 am c1a8e1ec: resolved conflicts for merge of d6308897 to jb-mr1-dev
* commit 'c1a8e1ec87d74dbb167ff575e8507183045584cd':
  SDK JB MR0: doc is 16 rev 3
2012-10-09 14:01:15 -07:00
Kenny Root
3cbf850ab6 Make all monkeys do the same thing
Monkeys were using SecureRandom, but what it really wanted was an LCRNG
that allowed it to reproduce the same output with seeds. This change
allows the monkeys to shine.

Bug: 6950454
Change-Id: Iabf0fc5e7d50b786fa32b946e85de797220ff569
2012-10-09 13:57:13 -07:00
Raphael Moll
c1a8e1ec87 resolved conflicts for merge of d6308897 to jb-mr1-dev
Change-Id: Iffbbb75a504e5f8b0caa5690835e17a4b6ab63bb
2012-10-09 13:44:41 -07:00
Jeff Sharkey
1d7f24de42 Follow RegisteredServicesCache API changes.
Bug: 7276595
Change-Id: I6064684380b7bbbec87c2345f782931d731ad5cb
2012-10-09 13:05:04 -07:00
Raphael Moll
d6308897c0 am 37191b53: SDK JB MR0: doc is 16 rev 3
* commit '37191b53de90cde879c167d1db74d5a73740f4c0':
  SDK JB MR0: doc is 16 rev 3
2012-10-09 12:53:20 -07:00
Raphael Moll
37191b53de SDK JB MR0: doc is 16 rev 3
Change-Id: I7e28e4dc1981c7d9502a45f3509245075da98a00
2012-10-09 12:48:10 -07:00
The Android Open Source Project
8cbb869a07 Reconcile with jb-mr1-release - do not merge
Change-Id: If93b4dbbf4cb52b6640d20e1213b6619492b0545
2012-10-09 07:28:23 -07:00
The Android Automerger
b414234ed9 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-08 06:59:08 -07:00
Eino-Ville Talvala
13e9b646cc am c764e04c: am 41ee0fdc: testrunner: Match test runner name for hardware tests.
* commit 'c764e04c54aea6aa6cc6890a35d8f97463a50b32':
  testrunner: Match test runner name for hardware tests.
2012-10-07 23:38:25 -07:00
Eino-Ville Talvala
c764e04c54 am 41ee0fdc: testrunner: Match test runner name for hardware tests.
* commit '41ee0fdc33391aa19d26f6f068fca44c48151987':
  testrunner: Match test runner name for hardware tests.
2012-10-07 23:35:30 -07:00
Eino-Ville Talvala
41ee0fdc33 testrunner: Match test runner name for hardware tests.
Change-Id: I9db719e3dde258c026e0e721e0dd58f80378f199
2012-10-05 17:12:42 -07:00
Andrew Hsieh
85f798cd4c am 84cf3431: am ee9d2a3b: Merge "[MIPS] Add support for waitpid."
* commit '84cf343170c5fc8682af4dbfc07c4fe5eba12cb2':
  [MIPS] Add support for waitpid.
2012-10-05 02:24:51 -07:00
Andrew Hsieh
358854c202 am 5dbbbd4f: am 098df524: Merge "[MIPS] Add Support pthread library functions."
* commit '5dbbbd4f0ebf91376ce31c601b00c8ac1f576bd5':
  [MIPS] Add Support pthread library functions.
2012-10-05 02:24:50 -07:00
Andrew Hsieh
f701a16b8d am b0bfe87c: am 5d629997: Merge "[MIPS] Add Support clone."
* commit 'b0bfe87cdef9e55b6df44ffe3d2e9095e475886c':
  [MIPS] Add Support clone.
2012-10-05 02:24:49 -07:00
Andrew Hsieh
1788247ab0 am 58786fff: am 8b394bfd: Merge "[MIPS] Updated support for statfs and fstatfs."
* commit '58786fff75d00bda20f6b3ed38a66fe9b691e150':
  [MIPS] Updated support for statfs and fstatfs.
2012-10-05 02:24:47 -07:00
Andrew Hsieh
4effe36389 am 352ef1b5: am f9bacbc6: Merge "[MIPS] Updated support for stat."
* commit '352ef1b5f1a36d7ca9e2f5a32b06a1f2307845a0':
  [MIPS] Updated support for stat.
2012-10-05 02:24:46 -07:00
Andrew Hsieh
e4774b451d am 09d940ca: am 58be4b98: Merge "[MIPS] Updated support for socket and added support for socket_pair."
* commit '09d940cae0b4a70ee9f8e92be178f3408e20c8c4':
  [MIPS] Updated support for socket and added support for socket_pair.
2012-10-05 02:24:45 -07:00
Andrew Hsieh
d8ca18f795 am cd67609d: am 9c32f373: Merge "[MIPS] Update Support for fcntl."
* commit 'cd67609dc8e08dea2641f694ee09880c03309d3b':
  [MIPS] Update Support for fcntl.
2012-10-05 02:24:43 -07:00
Andrew Hsieh
18489d83f8 am 460326fa: am bc2958b9: Merge "[MIPS] Add Support for syscall."
* commit '460326fa60259b702b63fbcf6fb7ff745897f8ec':
  [MIPS] Add Support for syscall.
2012-10-05 02:24:42 -07:00
Andrew Hsieh
a4970ddb5e am 1d4173dd: am 39850f9e: Merge "[MIPS] Add Support timer_create."
* commit '1d4173dde1fecec9d64a35f1f4b51a5c7fea3039':
  [MIPS] Add Support timer_create.
2012-10-05 02:24:41 -07:00
Andrew Hsieh
92008fec42 am cef0b881: am 22ae5a37: Merge "[MIPS] Add Support signal."
* commit 'cef0b881b165018ed18c3a101c10e2aea97f3da8':
  [MIPS] Add Support signal.
2012-10-05 02:24:39 -07:00
Andrew Hsieh
f832e4f995 am 76f93a10: am c1d3bef5: Merge "[MIPS] Add Support errno, Added Logging, sorted Android.mk files."
* commit '76f93a10db56448db4ce6019cd8707f54f59f404':
  [MIPS] Add Support errno, Added Logging, sorted Android.mk files.
2012-10-05 02:24:37 -07:00
Andrew Hsieh
84cf343170 am ee9d2a3b: Merge "[MIPS] Add support for waitpid."
* commit 'ee9d2a3b0ad6258271062145087a0a9f929bb9cc':
  [MIPS] Add support for waitpid.
2012-10-05 02:23:38 -07:00
Andrew Hsieh
5dbbbd4f0e am 098df524: Merge "[MIPS] Add Support pthread library functions."
* commit '098df524a6d6a83470d086b19cb0cab52dbc9cd0':
  [MIPS] Add Support pthread library functions.
2012-10-05 02:23:36 -07:00