Mathias Agopian
b6822d7a3e
Merge commit 'goog/master' into merge_master
2009-06-16 12:38:55 -07:00
Android (Google) Code Review
ecbcd559f0
am a6061e04: Merge change 2563 into donut
...
Merge commit 'a6061e043cb6056c303206c2c9870ae3758861f1'
* commit 'a6061e043cb6056c303206c2c9870ae3758861f1':
Add PDP Reject causes.
2009-06-16 10:30:13 -07:00
Android (Google) Code Review
34b5dfedba
Merge change 2563 into donut
...
* changes:
Add PDP Reject causes.
2009-06-16 10:28:11 -07:00
Android (Google) Code Review
a14827375e
am 653349fe: Merge change 4329 into donut
...
Merge commit '653349fe48f2995d9e17b5e0a4110925cffdaeab'
* commit '653349fe48f2995d9e17b5e0a4110925cffdaeab':
Change the first parameter of Keystore.generateKeyPair() to int.
2009-06-16 09:07:56 -07:00
Android (Google) Code Review
b6d1e5b8ec
Merge change 4329 into donut
...
* changes:
Change the first parameter of Keystore.generateKeyPair() to int.
2009-06-16 09:05:50 -07:00
Android (Google) Code Review
891e3aace9
am 0e3d77af: Merge change 4324 into donut
...
Merge commit '0e3d77af4ec6cd4961cfb144045ee9dfe479ccf6'
* commit '0e3d77af4ec6cd4961cfb144045ee9dfe479ccf6':
AudioService: Fix routing problem recently introduced in setRouting().
2009-06-16 08:37:50 -07:00
Android (Google) Code Review
c1c759ac12
am 7f148d65: Merge change 4316 into donut
...
Merge commit '7f148d65051e577cc4a002183ec55d625b51de85'
* commit '7f148d65051e577cc4a002183ec55d625b51de85':
Revert "dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash."
Enable more debug message to debug the Camera startPreview bug.
2009-06-16 08:37:35 -07:00
Android (Google) Code Review
0cc76d2ab9
am 8742e120: Merge change 4311 into donut
...
Merge commit '8742e120608328e2505f15903a33e538e68bd519'
* commit '8742e120608328e2505f15903a33e538e68bd519':
Add keygen API to Keystore.
2009-06-16 08:37:33 -07:00
Android (Google) Code Review
168f3c5201
am b4f7592b: Merge change 4299 into donut
...
Merge commit 'b4f7592b03c8424302c10e61474b0e2d0a71a630'
* commit 'b4f7592b03c8424302c10e61474b0e2d0a71a630':
Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.
Fix IntentFilter constructor to properly process the action parameter.
2009-06-16 08:37:21 -07:00
Android (Google) Code Review
cebf1551fc
am 6297cb2e: Merge change 4287 into donut
...
Merge commit '6297cb2eb57c183e202744516a96b2dbbf204a09'
* commit '6297cb2eb57c183e202744516a96b2dbbf204a09':
Sketch out a 'bmgr' command line tool
2009-06-16 08:37:18 -07:00
Dianne Hackborn
3d4fb92a7f
am 4ebd855b: Fix build.
...
Merge commit '4ebd855bb7362d45833dc811f2622fcc788dec17'
* commit '4ebd855bb7362d45833dc811f2622fcc788dec17':
Fix build.
2009-06-16 08:37:05 -07:00
Android (Google) Code Review
538c168b30
am e65fdfb8: Merge change 4262 into donut
...
Merge commit 'e65fdfb8affd92b3bb2d41f0bd149f704ec48f26'
* commit 'e65fdfb8affd92b3bb2d41f0bd149f704ec48f26':
Add utility methods to AndroidTestCase for asserting permission requirements for launching activities and accessing ContentProviders.
2009-06-16 08:36:56 -07:00
Android (Google) Code Review
56f03a51e9
am 727f36c6: Merge change 4265 into donut
...
Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'
* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
process: Fix bug where if a thread exited while we were changing its control
Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
2009-06-16 08:36:48 -07:00
Android (Google) Code Review
913e8717e9
am 3dcea047: Merge change 4237 into donut
...
Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'
* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
Remove obsolete FOTA_UPDATE permission (which should never have been
2009-06-16 08:36:35 -07:00
Grace Kloba
cc4e622a62
am a03f0465: hide the new constant as it is pending api approval
...
Merge commit 'a03f046522f568a79b75556aa54c0407b1151511'
* commit 'a03f046522f568a79b75556aa54c0407b1151511':
hide the new constant as it is pending api approval
2009-06-16 08:36:26 -07:00
Android (Google) Code Review
76aa76b265
am 5570f2f2: Merge change 4252 into donut
...
Merge commit '5570f2f24a74a1f16c781722731ba39f2907cbb3'
* commit '5570f2f24a74a1f16c781722731ba39f2907cbb3':
Add more comment for EXTRA_APPEND_LOCATION
2009-06-16 08:36:22 -07:00
Android (Google) Code Review
05774b3364
am aa67df9f: Merge change 4248 into donut
...
Merge commit 'aa67df9f2f8e4c0993c5954e598031bbf4aaf7a3'
* commit 'aa67df9f2f8e4c0993c5954e598031bbf4aaf7a3':
Remove ADD_SYSTEM_SERVICE and SET_PROCESS_FOREGROUND permissions.
2009-06-16 08:36:12 -07:00
Android (Google) Code Review
2f2fce40ff
am 7d143b89: Merge change 4245 into donut
...
Merge commit '7d143b89b714e077f8fd7dbac80945c76bfd9814'
* commit '7d143b89b714e077f8fd7dbac80945c76bfd9814':
Add the extra data definition for append location in the VIEW request to the Browser.
2009-06-16 08:36:04 -07:00
Android (Google) Code Review
4b821c6cbf
Merge change 4324 into donut
...
* changes:
AudioService: Fix routing problem recently introduced in setRouting().
2009-06-16 05:46:09 -07:00
Android (Google) Code Review
df1f9c518d
Merge change 4316 into donut
...
* changes:
Revert "dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash."
2009-06-16 03:02:02 -07:00
Chih-Chung Chang
6a5297d204
Enable more debug message to debug the Camera startPreview bug.
2009-06-16 17:19:02 +08:00
Android (Google) Code Review
65cc82b127
Merge change 4311 into donut
...
* changes:
Add keygen API to Keystore.
2009-06-16 02:16:53 -07:00
Mathias Agopian
375f56363a
new Permission class used to improve permission checks speed (by caching results)
2009-06-15 21:56:51 -07:00
Android (Google) Code Review
8c8cdf2c27
Merge change 4299 into donut
...
* changes:
Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.
2009-06-15 21:55:01 -07:00
Jack Palevich
c96812cb27
Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.
...
Apps targeting Donut and newer will throw an exception.
We use a heuristic to determine whether an app is pre-Donut or not:
We take the address space's __progname, and use that as the application's
package name. For simple applications this is correct.
2009-06-15 21:03:24 -07:00
Android (Google) Code Review
40087e4471
Merge change 4023 into donut
...
* changes:
Fix IntentFilter constructor to properly process the action parameter.
2009-06-15 20:21:30 -07:00
Android (Google) Code Review
26173a459a
Merge change 4289
...
* changes:
Bug fixes. TriangleMesh now ref-counts, implement missing element formats, add missing modes for program vertex. Add matrix support classes. Add test app rollo
2009-06-15 19:06:01 -07:00
Android (Google) Code Review
59bc8e775b
Merge change 4287 into donut
...
* changes:
Sketch out a 'bmgr' command line tool
2009-06-15 19:03:48 -07:00
Android (Google) Code Review
c63c9f48bf
Merge change 4181
...
* changes:
Add new URIs to the Phone and Postal classes.
2009-06-15 18:49:19 -07:00
Android (Google) Code Review
00c136a76a
am 77b7d785: Merge change 4117 into donut
...
Merge commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07'
* commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07':
Add a Gservices setting to have a "use location for better search".
2009-06-15 17:57:03 -07:00
Android (Google) Code Review
6108414d45
Merge change 4273
...
* changes:
resolved conflicts for merge of 6edb3487 to master
2009-06-15 17:52:44 -07:00
Dianne Hackborn
a7178f8106
resolved conflicts for merge of 6edb3487 to master
2009-06-15 17:17:49 -07:00
Android (Google) Code Review
55a72ba8eb
Merge change 4262 into donut
...
* changes:
Add utility methods to AndroidTestCase for asserting permission requirements for launching activities and accessing ContentProviders.
2009-06-15 17:10:16 -07:00
Android (Google) Code Review
52fffbc5e0
Merge change 4265 into donut
...
* changes:
process: Fix bug where if a thread exited while we were changing its control group, we'd bail out and report an exception. This situation is *not* an error.
2009-06-15 17:06:24 -07:00
Android (Google) Code Review
f6073c8600
Merge change 4264 into donut
...
* changes:
Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally reintroduced in an errant and clumsy git merge operation.
2009-06-15 17:06:04 -07:00
Android (Google) Code Review
150edb24be
Merge change 4237 into donut
...
* changes:
Remove obsolete FOTA_UPDATE permission (which should never have been made public, and wouldn't be used by any third party applications, and no longer does anything regardless).
2009-06-15 16:33:54 -07:00
Android (Google) Code Review
e0d4b78bcc
Merge change 4252 into donut
...
* changes:
Add more comment for EXTRA_APPEND_LOCATION
2009-06-15 16:06:11 -07:00
Android (Google) Code Review
2fbc3f5ea8
Merge change 4248 into donut
...
* changes:
Remove ADD_SYSTEM_SERVICE and SET_PROCESS_FOREGROUND permissions.
2009-06-15 15:50:18 -07:00
Android (Google) Code Review
d3ef100207
Merge change 4247
...
* changes:
Fix AbstractTableMerger for new Account format.
2009-06-15 15:46:14 -07:00
Android (Google) Code Review
c2fb706a85
Merge change 4245 into donut
...
* changes:
Add the extra data definition for append location in the VIEW request to the Browser.
2009-06-15 15:34:30 -07:00
Android (Google) Code Review
cdc6843dde
Merge change 4117 into donut
...
* changes:
Add a Gservices setting to have a "use location for better search".
2009-06-15 15:23:20 -07:00
Android (Google) Code Review
f512b132b4
Merge change 4234 into donut
...
* changes:
Implement permission test for activity, window, service manager.
2009-06-15 15:07:50 -07:00
Android (Google) Code Review
7b5a903a6e
Merge change 4137
...
* changes:
Move meta feed handling to CalendarSyncAdapter
2009-06-15 14:57:49 -07:00
Android (Google) Code Review
cd6f2054f3
am acec4d67: Merge change 4224 into donut
...
Merge commit 'acec4d6741643a5f0bda0b6a4eeb033a963818dc'
* commit 'acec4d6741643a5f0bda0b6a4eeb033a963818dc':
Add test for GServices write permission, and remove dummy placeholder framework permission test.
2009-06-15 14:23:02 -07:00
Android (Google) Code Review
e91f04c81b
Merge change 4224 into donut
...
* changes:
Add test for GServices write permission, and remove dummy placeholder framework permission test.
2009-06-15 14:20:53 -07:00
Android (Google) Code Review
41892576d0
am 9908b3d8: Merge change 4209 into donut
...
Merge commit '9908b3d820f7574ef432f22d280c7f1f5065f67f'
* commit '9908b3d820f7574ef432f22d280c7f1f5065f67f':
More tests to check permissions in PackageManager api's are enforced
2009-06-15 13:18:35 -07:00
Android (Google) Code Review
379f38277e
Merge change 4209 into donut
...
* changes:
More tests to check permissions in PackageManager api's are enforced
2009-06-15 13:16:35 -07:00
Christopher Tate
447103f4ac
am 8e55eac9: Bring the test transport\'s restore code into line
...
Merge commit '8e55eac96d768a4de68a091f57487deadf6d0a87'
* commit '8e55eac96d768a4de68a091f57487deadf6d0a87':
Bring the test transport's restore code into line
2009-06-15 12:55:03 -07:00
Android (Google) Code Review
2a9c539b28
am 2c723ee0: Merge change 4196 into donut
...
Merge commit '2c723ee0cc9db37b61f55e53ff739ca3fe9cbe8a'
* commit '2c723ee0cc9db37b61f55e53ff739ca3fe9cbe8a':
Add tests to check permissions in PackageManager api's
2009-06-15 12:26:16 -07:00
Android (Google) Code Review
8c784c7a30
am 764ce70f: Merge change 4198 into donut
...
Merge commit '764ce70faf500dbfde39619409682e9bbf6fb393'
* commit '764ce70faf500dbfde39619409682e9bbf6fb393':
protect starting of search dialog behind 'dev.disablesearchdialog' system property.
2009-06-15 12:24:58 -07:00