3086 Commits

Author SHA1 Message Date
Dianne Hackborn
a2aaa9e38f resolved conflicts for merge of 6edb3487 to master 2009-06-15 17:17:49 -07:00
Android (Google) Code Review
21f0b1766c Merge change 4247
* changes:
  Fix AbstractTableMerger for new Account format.
2009-06-15 15:46:14 -07:00
Ken Shirriff
36800d4450 Fix AbstractTableMerger for new Account format.
eclair has a _SYNC_ACCOUNT_TYPE field that isn't in donut,
so SELECT_UNSYNC needs to be updated with that field.
The lack of it causes a SQLiteException.
bug=1906760
2009-06-15 15:41:04 -07:00
Android (Google) Code Review
6edb3487be 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
366786725a Merge change 4137
* changes:
  Move meta feed handling to CalendarSyncAdapter
2009-06-15 14:57:49 -07:00
Dianne Hackborn
cfaef699e1 Implement permission test for activity, window, service manager.
This also includes some changes to the window manager permission checks.  Almost all of these
are to make it most testable (through an exception on a permission failure), though there is
one permission check that needed to be added: updateOrientationFromAppTokens().
2009-06-15 14:35:07 -07:00
Android (Google) Code Review
d15b96ad8c 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
acec4d6741 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
Brett Chabot
2f0d86cf2e Add test for GServices write permission, and remove dummy placeholder framework permission test. 2009-06-15 14:15:19 -07:00
Android (Google) Code Review
da0fad3b5d 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
9908b3d820 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
Suchi Amalapurapu
ea196fc50e More tests to check permissions in PackageManager api's are enforced 2009-06-15 13:19:25 -07:00
Christopher Tate
dac6f5fc33 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
Christopher Tate
8e55eac96d Bring the test transport's restore code into line
It now reconstructs the backup data stream as it was originally structured, no
longer assuming that its backed-up records can simply be concatenated into the
destination stream.
2009-06-15 12:33:51 -07:00
Android (Google) Code Review
2aa636f198 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
2f914421da 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
Android (Google) Code Review
2c723ee0cc Merge change 4196 into donut
* changes:
  Add tests to check permissions in PackageManager api's
2009-06-15 12:24:11 -07:00
Suchi Amalapurapu
9f2f87d92b Add tests to check permissions in PackageManager api's 2009-06-15 12:23:15 -07:00
Android (Google) Code Review
764ce70faf Merge change 4198 into donut
* changes:
  protect starting of search dialog behind 'dev.disablesearchdialog' system property.
2009-06-15 12:23:12 -07:00
Karl Rosaen
3ed6a3342b protect starting of search dialog behind 'dev.disablesearchdialog' system property.
this will help the stress test runs find out the effect of search.
2009-06-15 12:22:47 -07:00
Android (Google) Code Review
e3a6cf3eaa am 3adf7678: Merge change 4184 into donut
Merge commit '3adf7678cdf8fa955627e096bb5c27b94adc3079'

* commit '3adf7678cdf8fa955627e096bb5c27b94adc3079':
  Add permission test structure for private framework permissions.
  Add <keygen> support for VPN.
2009-06-15 11:39:39 -07:00
Android (Google) Code Review
9fac42f8bf Merge change 4168
* changes:
  replace webview hashmap with static class
2009-06-15 11:09:30 -07:00
Android (Google) Code Review
3adf7678cd Merge change 4184 into donut
* changes:
  Add permission test structure for private framework permissions.
2009-06-15 10:48:28 -07:00
Brett Chabot
9faa04fd85 Add permission test structure for private framework permissions. 2009-06-15 10:43:40 -07:00
Android (Google) Code Review
e6881c6300 Merge change 4075 into donut
* changes:
  Add <keygen> support for VPN.
2009-06-15 10:42:20 -07:00
Android (Google) Code Review
42a28be209 am c2922687: Merge change 4182 into donut
Merge commit 'c2922687fa8f953cc1325a6416af5be43cb41fed'

* commit 'c2922687fa8f953cc1325a6416af5be43cb41fed':
  Add more data to reliability test report, includes min, max, std, run data.
2009-06-15 10:19:06 -07:00
Android (Google) Code Review
c2922687fa Merge change 4182 into donut
* changes:
  Add more data to reliability test report, includes min, max, std, run data.
2009-06-15 10:17:18 -07:00
Guang Zhu
0528cd03b2 Add more data to reliability test report, includes min, max, std, run data. 2009-06-15 10:13:58 -07:00
Android (Google) Code Review
54c1c1908a am 6c84343f: Merge change 4119 into donut
Merge commit '6c84343f0794c368e79c58b715ffad268b8e219c'

* commit '6c84343f0794c368e79c58b715ffad268b8e219c':
  Use locale-appropriate formatting to display application sizes like "252KB".
2009-06-15 10:11:48 -07:00
Android (Google) Code Review
6c84343f07 Merge change 4119 into donut
* changes:
  Use locale-appropriate formatting to display application sizes like "252KB".
2009-06-15 10:09:21 -07:00
Android (Google) Code Review
933a386e63 am d83d6606: Merge change 4106 into donut
Merge commit 'd83d6606d62e27effc27be48d6050914deefe9eb'

* commit 'd83d6606d62e27effc27be48d6050914deefe9eb':
  Adjust order of file/section list in output diff
2009-06-15 09:38:34 -07:00
Android (Google) Code Review
d83d6606d6 Merge change 4106 into donut
* changes:
  Adjust order of file/section list in output diff
2009-06-15 09:37:01 -07:00
Cary Clark
ded054c9d3 replace webview hashmap with static class
Hashmaps used to pass parameters between WebView.java and
WebViewCore.java are fragile and sometimes require boxing.
Replace them with static classes that are typesafe and use
less code.
2009-06-15 10:26:08 -04:00
Android (Google) Code Review
1810fda06f Merge change 2930
* changes:
  Add support for toggling DOM Storage support on and off.
2009-06-15 05:40:51 -07:00
Ben Murdoch
274680d9b8 Add support for toggling DOM Storage support on and off. 2009-06-15 13:05:39 +01:00
Android (Google) Code Review
89dfa08f44 Merge change 4100
* changes:
  send click in webview before sending key
2009-06-15 05:04:45 -07:00
Hung-ying Tyan
755437023e am 0304325d: Remove SingleServerProfile.
Merge commit '0304325dd72ff8713c8444e909d387af1447f86f'

* commit '0304325dd72ff8713c8444e909d387af1447f86f':
  Remove SingleServerProfile.
2009-06-15 04:56:31 -07:00
Hung-ying Tyan
0304325dd7 Remove SingleServerProfile.
End of refactoring out SingleServerProfile.java.
2009-06-15 19:29:26 +08:00
Android (Google) Code Review
a28547d03f am 0fb46683: Merge change 3880 into donut
Merge commit '0fb466836bb654524683152371ecc32142cdf5de'

* commit '0fb466836bb654524683152371ecc32142cdf5de':
  Run search dialog in the system process.
2009-06-15 02:09:25 -07:00
Android (Google) Code Review
0fb466836b Merge change 3880 into donut
* changes:
  Run search dialog in the system process.
2009-06-15 02:06:39 -07:00
Bjorn Bringert
8d17f3f24b Run search dialog in the system process.
Fixes http://b/issue?id=1905863

This is needed to address two security issues with global search:
http://b/issue?id=1871088 (Apps can read content providers through GlobalSearch)
http://b/issue?id=1819627 (Apps can use GlobalSearch to launch arbirtrary intents)

This also fixes http://b/issue?id=1693153 (SearchManager.OnDismissListener
never gets called)

To fix the security issues, GlobalSearch also needs to require
a non-app permission to access its content provider and launch intents.
2009-06-15 09:05:26 +01:00
Android (Google) Code Review
4522c7dc40 am 6d78dd8e: Merge change 4147 into donut
Merge commit '6d78dd8ef833e22d73fc65df205346e657cf9850'

* commit '6d78dd8ef833e22d73fc65df205346e657cf9850':
  On the way of refactoring out SingleServerProfile.java.
2009-06-15 00:17:34 -07:00
Android (Google) Code Review
6d78dd8ef8 Merge change 4147 into donut
* changes:
  On the way of refactoring out SingleServerProfile.java.
2009-06-14 23:41:33 -07:00
Hung-ying Tyan
4c424d61c7 On the way of refactoring out SingleServerProfile.java.
+ Move mServerName from SingleServerProfile and VpnProfile.
+ Add mSavedUsername to VpnProfile.
+ Keep empty SingleServerProfile to not break the classes that use it.
+ Remove use of SingleServerProfile from VpnService.java.
2009-06-15 13:06:03 +08:00
Scott Main
27311a6253 am 3d59ee7a: am 110b50ca: AI 149839: make the home page\'s announcement block expandable... primarily, this is to handle various lengths of text due to translations, but also allows us to be more flexible WRT the content for the top section.
Merge commit '3d59ee7aa66a5b1e80f5042f8d872dd9819b5f40'

* commit '3d59ee7aa66a5b1e80f5042f8d872dd9819b5f40':
  AI 149839: make the home page's announcement block expandable...
2009-06-14 21:13:23 -07:00
Christopher Tate
daf701fa62 am 2fdd428e: Fix some backup reader/writer issues; make local transport do backup
Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'

* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
  Fix some backup reader/writer issues; make local transport do backup
  Fix the jni initializer.
  Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
  Fix bug #1812041: activity manager crash with bad args.
  Journal backup requests so that they won't be lost in a crash
  Fix data connection issues.
2009-06-14 21:13:03 -07:00
Android (Google) Code Review
aa73f17201 am 6599426f: Merge change 4017 into donut
Merge commit '6599426f74371c823fcfe570f61577262eb0df44'

* commit '6599426f74371c823fcfe570f61577262eb0df44':
  Make the date format preference work again.
2009-06-14 21:12:17 -07:00
The Android Open Source Project
9d2b0f4de0 merge cafdea61a85c8f5d0646cc9413a09346c637f43f w/ one minor conflict in core/java/android/view/MotionEvent.java 2009-06-14 21:09:07 -07:00
Romain Guy
3c69d554e7 am 763a5723: Hide gestures API.
Merge commit '763a5723882ec7924114ba585b49e69b3e828b4a'

* commit '763a5723882ec7924114ba585b49e69b3e828b4a':
  Hide gestures API.
2009-06-14 20:49:54 -07:00
Ramanan Rajeswaran
859f1b0b6f am e8939bb8: resolved conflicts for merge of a798dd86 to donut
Merge commit 'e8939bb8f1453b44788d4475a8263082d858e533'

* commit 'e8939bb8f1453b44788d4475a8263082d858e533':
  AI 149797: Have SetupWizard pull the Terms of Service from the web using a new URL
2009-06-14 20:49:44 -07:00