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
a639a1b837
am d8e477e5: am 9d5538b1: Merge "[ndk] Fixed sample SanAngeles to properly pause/resume"
...
* commit 'd8e477e5d48206839fa4fffa63095fa504275016':
[ndk] Fixed sample SanAngeles to properly pause/resume
2012-10-12 09:43:50 -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
19ab685647
am 02a69132: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '02a69132d59289db41ebc6d29068d43c10a3b801':
2012-10-12 07:33:32 -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
d8f359b17f
am 05b0dcec: am 1eb2e84c: am 9da08122: More on issue #7318666 : hide developer options from user build
...
* commit '05b0dcec94077b5b801baf960bb61c89aa7893f2':
More on issue #7318666 : hide developer options from user build
2012-10-11 17:53:55 -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
Siva Velusamy
e8e0e4b9e7
Add ActionBar support library to SDK build
...
Change-Id: I417657543452b5a9fa0e80664481a655b39a3874
2012-10-10 15:32:14 -07:00
The Android Open Source Project
f13d41cbaa
am 0cf0f743: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '0cf0f743d35ee09f76bf954a39c91c626b89a023':
2012-10-10 09:45:41 -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
a8e4a6d043
am 6de7bde4: am 0eb3e46a: am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev
...
* commit '6de7bde49b76542cadb9ad7d3b618df305cef9bc':
Follow RegisteredServicesCache API changes.
2012-10-10 08:37:49 -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
c200e94ff5
am ab8b25ff: am 03c58239: am c6fbad00: Merge "Make all monkeys do the same thing" into jb-mr1-dev
...
* commit 'ab8b25ff8ec856f490f5bbb95240c8fc0d24ba43':
Make all monkeys do the same thing
2012-10-09 19:18:57 -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
652538d6af
am b41080c0: am 806cac72: am c1a8e1ec: resolved conflicts for merge of d6308897 to jb-mr1-dev
...
* commit 'b41080c00b357c33cdf22e36bc8d3aa0f3510ca5':
SDK JB MR0: doc is 16 rev 3
2012-10-09 14:05:24 -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
bf2920e3ab
am 8cbb869a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '8cbb869a0724a2522cf25712950da70459acb673':
2012-10-09 07:29:52 -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
b8a4f1eaa8
am 13e9b646: am c764e04c: am 41ee0fdc: testrunner: Match test runner name for hardware tests.
...
* commit '13e9b646ccd77c327387d4baf8d77dbc6de788de':
testrunner: Match test runner name for hardware tests.
2012-10-07 23:40:20 -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
8a26ad1db6
am 85f798cd: am 84cf3431: am ee9d2a3b: Merge "[MIPS] Add support for waitpid."
...
* commit '85f798cd4cf93c5e99776f3b0b2a6d656f2c7765':
[MIPS] Add support for waitpid.
2012-10-05 02:26:56 -07:00
Andrew Hsieh
c4e66c9cf0
am 358854c2: am 5dbbbd4f: am 098df524: Merge "[MIPS] Add Support pthread library functions."
...
* commit '358854c2026cddfa959e1ec374c3dc58f1781110':
[MIPS] Add Support pthread library functions.
2012-10-05 02:26:54 -07:00
Andrew Hsieh
a6a32ffd56
am f701a16b: am b0bfe87c: am 5d629997: Merge "[MIPS] Add Support clone."
...
* commit 'f701a16b8dfc4b6d20eaa6167c42d573a3cd2ec4':
[MIPS] Add Support clone.
2012-10-05 02:26:53 -07:00
Andrew Hsieh
d715ea0af4
am 1788247a: am 58786fff: am 8b394bfd: Merge "[MIPS] Updated support for statfs and fstatfs."
...
* commit '1788247ab08959da41c4fa745b54ab5b605f6034':
[MIPS] Updated support for statfs and fstatfs.
2012-10-05 02:26:52 -07:00
Andrew Hsieh
c4615910b7
am 4effe363: am 352ef1b5: am f9bacbc6: Merge "[MIPS] Updated support for stat."
...
* commit '4effe36389f5047f3305bd03758ab380339288b3':
[MIPS] Updated support for stat.
2012-10-05 02:26:50 -07:00
Andrew Hsieh
6c8798509e
am e4774b45: am 09d940ca: am 58be4b98: Merge "[MIPS] Updated support for socket and added support for socket_pair."
...
* commit 'e4774b451d0d65be42776d1c21089b5185f350f7':
[MIPS] Updated support for socket and added support for socket_pair.
2012-10-05 02:26:49 -07:00
Andrew Hsieh
25e4de339b
am d8ca18f7: am cd67609d: am 9c32f373: Merge "[MIPS] Update Support for fcntl."
...
* commit 'd8ca18f7957d1bd5937301e1deb8296f07de93d7':
[MIPS] Update Support for fcntl.
2012-10-05 02:26:47 -07:00