Commit Graph

62 Commits

Author SHA1 Message Date
Doug Zongker
ab69e29c19 relocate android.util.base64.* -> android.util.*
b/2553469 - API REVIEW: android.util.base64

Change-Id: I6a514032152a8b1899db52d020aca8e8b19e74e9
2010-03-29 13:46:47 -07:00
Brett Chabot
a3de745551 Move PackageManagerTests and AsecTests.
Remove PackageManagerTests test's from continuous due to flakiness.

merged from abandoned master.

Change-Id: I0a542df9df572c37bd1aa987cdc9fb2f95001a7c
2010-03-26 14:16:59 -07:00
Fred Quintana
1f343ebed1 Merge "fix bug where sync settings set lost upon upgrade from donut and eclair to froyo" 2010-03-24 10:39:28 -07:00
Fred Quintana
fb084400d6 fix bug where sync settings set lost upon upgrade from donut and eclair
to froyo

- intepret a missing syncavble attribute from donut as "unsynced"
  rather than the traditional "true"
- copy the sync settings from the authorities "contacts" and "calendar"
  to "com.android.contacts" and "com.android.calendar" if the latter
  don't already have settings
- delay the database cleanup until after boot completed, which will give
  the GoogleLoginService accounts migration code a chance to run; this
  was causing all the settings to get removed upon a donut to froyo upgrade

Change-Id: I8795e97ba0c9b930d1a50784229ca9ab15dff9d2
http://b/issue?id=2531359
2010-03-24 10:37:40 -07:00
Kenny Root
b4882ca26f Merge "Advance encodedKeySearchIndex if encodedKey matches a suffix of a parameter." 2010-03-22 23:18:52 -07:00
Keith Ito
e41c317348 Advance encodedKeySearchIndex if encodedKey matches a suffix of a parameter.
Bug: 2524610
Change-Id: I51bbf8248133b61825d2ae14afe175cb4d0413b8
2010-03-21 14:41:20 -07:00
Wink Saville
e5bdecea28 Merge "Allow transitionTo in enter/exit." 2010-03-18 18:03:48 -07:00
Wink Saville
e7be6a85da Allow transitionTo in enter/exit.
bug: 2435366
Change-Id: Id15c5e2cca49ced5ebbda24887f8c490e717f101
2010-03-18 17:03:30 -07:00
Daniel Lehmann
7e25f5cbfb Make the VCardEntry more robust against badly behaving resolvers. Additionally make the ImportTestResolver return the right result
Bug:2521447

Change-Id: I39e3e686b1fd75f5e633a467f6ccb736751355ed
2010-03-18 12:56:48 -07:00
Wink Saville
91fbd56757 Add additional sendMessage methods.
To simplify sending messages add sendMessage methods that take
what and obj as parameters.

Change-Id: Ib22d752eb3cb32fe3dfa8dd2e65915acec3e5db6
2010-03-17 17:12:43 -07:00
Daisuke Miyakawa
beb0c1b3ec Merge "Make JNI function for setLocale() call register_localized_collators() with the current locale, not previous one, every time it is possible." 2010-03-16 15:04:13 -07:00
Brett Chabot
e1e37c632c Remove flaky test MemoryFileTest:testPurge from large suite.
Bug 2203775

Change-Id: I4709c0910384f1f2313dc67bfe6e163beaa990e6
2010-03-16 11:50:20 -07:00
Fred Quintana
c2e4691d78 - make the SyncManager add periodic syncs when it upgrades from a
version of the accounts.xml file that pre-dated periodic syncs,
  e.g. eclair or early froyo. http://b/2515823
- make the AccountManagerService dump() use a getAccounts call that
  doesn't check the GET_ACCOUNTS permission to make it useful
  in "adb bugreport"
- add some logging to SyncManager to help track down a problem

Change-Id: Icb646909074e2d327d71f6bb39cf06b6fac29e77
2010-03-16 10:01:54 -07:00
Daisuke Miyakawa
b945639d0c Make JNI function for setLocale() call register_localized_collators()
with the current locale, not previous one, every time it is possible.

Add a unit test verifying this fix.

BUG: 2514026
Change-Id: I4dd1b047e1ab4bf399e2c3ebc0304c0cfa3a0928
2010-03-16 09:54:10 +09:00
Kenny Root
1a5a321759 Add missing licensing headers for test classes
Commit and file info:
33817-p9 frameworks/base/core/tests/coretests/src/android/util/LogTest.java
39945-p9 frameworks/base/core/tests/coretests/src/android/text/SpannableTest.java
39945-p9 frameworks/base/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java
39945-p9 frameworks/base/core/tests/coretests/src/android/text/SpannableStringTest.java

Change-Id: I1aac616069b7c26a00153d00118ced289d802e44
2010-03-12 10:59:55 -08:00
Kenny Root
15a4d2ffd0 Add correct copyright headers to multiple files
Format for the list of changes shows the origin commit reference followed
by the file name.

33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java
33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java
133776-p9 core/java/android/app/IntentService.java
127013-p9 core/java/android/appwidget/AppWidgetHost.java
27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java
60765-p9 core/java/android/content/SyncResult.java
43920-p9 core/java/android/content/pm/ActivityInfo.java
43920-p9 core/java/android/content/pm/ApplicationInfo.java
43920-p9 core/java/android/content/pm/InstrumentationInfo.java
43920-p9 core/java/android/content/pm/PackageInfo.java
44103-p9 core/java/android/content/pm/PackageItemInfo.java
68960-p9 core/java/android/content/pm/PackageStats.java
43920-p9 core/java/android/content/pm/ResolveInfo.java
43920-p9 core/java/android/content/pm/ServiceInfo.java
60641-p9 core/java/android/content/res/Configuration.java
60734-p9 core/java/android/content/res/TypedArray.java
137672-p9 core/java/android/inputmethodservice/ExtractButton.java
123112-p9 core/java/android/inputmethodservice/ExtractEditText.java
119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java
115078-p9 core/java/android/os/BatteryStats.java
124790-p9 core/java/android/text/style/UpdateAppearance.java
45083-p9 core/java/android/view/RawInputEvent.java
101491-p9 core/java/android/view/inputmethod/EditorInfo.java
114701-p9 core/java/android/view/inputmethod/ExtractedText.java
123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java
119291-p9 core/java/com/android/internal/os/HandlerCaller.java
129279-p9 core/java/com/android/internal/os/PkgUsageStats.java
114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java
114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java
84364-p9 opengl/java/android/opengl/EGLLogWrapper.java
11355-p9 opengl/tools/glgen/src/CFunc.java
11355-p9 opengl/tools/glgen/src/CType.java
11355-p9 opengl/tools/glgen/src/CodeEmitter.java
11355-p9 opengl/tools/glgen/src/GenerateGL.java
11355-p9 opengl/tools/glgen/src/JFunc.java
11355-p9 opengl/tools/glgen/src/JType.java
11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java
11355-p9 opengl/tools/glgen/src/ParameterChecker.java
57236-p9 services/java/com/android/server/status/AnimatedImageView.java
66754-p9 services/java/com/android/server/status/CloseDragHandle.java
57188-p9 services/java/com/android/server/status/DateView.java
46928-p9 services/java/com/android/server/status/ExpandedView.java
70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java
45968-p9 services/java/com/android/server/status/IconData.java
57470-p9 services/java/com/android/server/status/IconMerger.java
82719-p9 services/java/com/android/server/status/LatestItemView.java
45968-p9 services/java/com/android/server/status/NotificationData.java
66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java
57458-p9 services/java/com/android/server/status/NotificationViewList.java
45968-p9 services/java/com/android/server/status/StatusBarException.java
45968-p9 services/java/com/android/server/status/StatusBarIcon.java
46130-p9 services/java/com/android/server/status/StatusBarNotification.java
45968-p9 services/java/com/android/server/status/StatusBarView.java
46199-p9 services/java/com/android/server/status/Ticker.java
62286-p9 services/java/com/android/server/status/TickerView.java
57188-p9 services/java/com/android/server/status/TrackingView.java
86041-p9 telephony/java/android/telephony/PhoneStateListener.java
87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java
136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java
34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java
55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java
127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java
129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java
25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java
46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java
77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java
9788976b14 core/java/android/accounts/AuthenticatorDescription.java
5333288354 core/java/android/app/UiModeManager.java
93e7e22ec9 core/java/android/app/FullBackupAgent.java
328c0e7986 core/java/android/content/CursorEntityIterator.java
307da1a46b core/java/android/content/SyncQueue.java
307da1a46b core/java/android/content/SyncOperation.java
eb034652c2 core/java/android/content/pm/LabeledIntent.java
49237345d8 core/java/android/content/pm/FeatureInfo.java
a2b6c3775e core/java/android/content/pm/PackageInfoLite.java
3ecd5f4375 core/java/android/content/pm/RegisteredServicesCacheListener.java
5ebbb4a6b3 core/java/android/content/pm/XmlSerializerAndParser.java
c4516a7b62 core/java/android/database/sqlite/SQLiteTransactionListener.java
9bbc21a773 core/java/com/android/internal/backup/LocalTransport.java
21f1bd17b2 core/java/com/android/internal/content/PackageMonitor.java
4c62fc0e1e core/java/com/android/internal/view/BaseSurfaceHolder.java
4c62fc0e1e core/java/com/android/internal/view/BaseIWindow.java
e540833fdf core/java/com/android/internal/os/SamplingProfilerIntegration.java
192ab90388 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java
1619367ab8 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
27f8002e59 opengl/tools/glgen/stubs/gles11/glGetString.java
560814f6b1 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java
560814f6b1 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java
560814f6b1 opengl/tools/glgen/stubs/gles11/glShaderSource.java
1c4907ee77 opengl/tools/glgen/src/GenerateGLES.java
1c4907ee77 opengl/tools/glgen/src/Jsr239CodeEmitter.java
1c4907ee77 opengl/tools/glgen/src/GLESCodeEmitter.java
69e21f5f6e opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java
c028be4f3b packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
7c6efa13f1 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
7c6efa13f1 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java
7c6efa13f1 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java
df8a3f31d8 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java
cfaef699e1 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
cfaef699e1 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java
cfaef699e1 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java

Copyright header moved to top in following file:

core/tests/coretests/src/android/widget/ListViewTest.java

Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
2010-03-11 18:22:10 -08:00
Wink Saville
f0f566ec46 Ignore instead of throw errors in QuittingState and reorder some parameters.
Since there could be an arbitrary number of messages in
the queue but Handler/Looper/MessageQueue do not provide
any mechanism for removing "all" messages the best we can
do is ignore. Throwing an error is probably too heavy.

Change-Id: I13c81ac5786484f5b3218885b010de596d943975
2010-03-11 14:03:50 -08:00
Wink Saville
1b8b98b3db Add quit and fix HSM EBNF.
Add support for quiting the looper and stopping a thread.

Allow enter/exit at top or bottom of a STATE EBNF.

Fix missing brace in MSG_LIST.

Change-Id: Iddf5ce908008933bf8f0646e844254183da3d1f3
2010-03-11 11:49:54 -08:00
Svetoslav Ganov
49274c7239 Fixing bug 2411394 - Monkey crash due to incorrect test service manifest
Change-Id: I81f7b29f98d22f9d587cd056bc3ce4a86a41a18a
2010-03-10 15:51:01 -08:00
Amith Yamasani
d0ca3379c2 Fix a SettingsProvider test : 2377540 2010-03-07 21:25:21 -08:00
Doug Felt
8cb068a122 Remove test annotations from tests requiring package-private access. 2010-03-04 11:31:53 -08:00
Doug Felt
08209a767b Disable tests that require package-private access to code under test. 2010-03-02 17:42:30 -08:00
Fred Quintana
db204c2383 Merge "change ObserverNode.binderDied() to lock the root node before manipulating the observers tree by calling removeObserverLocked()" 2010-03-02 13:23:17 -08:00
Fred Quintana
002ffad599 change ObserverNode.binderDied() to lock the root node before manipulating
the observers tree by calling removeObserverLocked()

http://b/issue?id=2457485
2010-03-02 11:18:16 -08:00
Gilles Debunne
3c5d27ab1b Cleaning in ListWithEditTextHeaderTest.
Switched to ActivityInstrumentationTestCase2.

As far as http://b/issue?id=2446911 is concerned, I was unable
to reproduce a test fail. This was not the case a week ago.
A fix has probably been submitted in the meantime.

Change-Id: Id6e95218a2c9d29b0b4eb051a7a1288f9a9809fd
2010-03-01 16:01:52 -08:00
Gilles Debunne
7628fbe031 Merge "Fixes for ExpandableListView with headers/footers" 2010-02-27 13:13:11 -08:00
Gilles Debunne
47ccdf3760 Fixes for ExpandableListView with headers/footers
Patches in ExpandableListView to correctly handle header/footer shifter flat positions.
Make tests added in https://android-git.corp.google.com/g/#change,42312 pass.

Change-Id: I0d7823f5ae290e855bfdfb8d33c18bd34661077c
2010-02-26 14:59:44 -08:00
Vasu Nori
d20958551c Merge "in finalize() methods, log warnings if db lock is going to be held." 2010-02-26 11:45:54 -08:00
Vasu Nori
d606b4bf2c in finalize() methods, log warnings if db lock is going to be held.
this is to track bug:2463988 and bug:2457342
2010-02-26 11:02:32 -08:00
Gilles Debunne
e26bad0aec New tests for ExpandableListView to exercice packed position with headers/footers.
New tests for
- the different conversions between flat and packed positions.
- selectedPosition
- contextMenuInfo.

All these tests currently fail when list contains headers and/or footers.

Change-Id: Ifb8fcc5de4980221e2ff4ebd2b24bc4fa03c6aae
2010-02-25 18:32:16 -08:00
Gilles Debunne
aa635db5c6 Merge "New test on ContextMenuInfo packed positions." 2010-02-25 13:49:53 -08:00
Gilles Debunne
192ab90388 New test on ContextMenuInfo packed positions.
With and without headers.
Non regression test for bug
http://b/issue?id=1778239

Change-Id: I0235528ac6f8394292bac35f2350f3d5be1e4df7
2010-02-25 13:46:50 -08:00
Eric Fischer
277903f8d8 Merge "Add support for accessing native bidi implementation via jni." 2010-02-25 12:18:55 -08:00
Dianne Hackborn
2269d1572e Re-arrange android-common so framework no longer links with it.
This is the framework part, moving classes around so the framework
no longer needs to link to android-common.  Makes some APIs public,
others that didn't need to be public are private in the framework,
some small things are copied.
2010-02-25 11:39:33 -08:00
Doug Felt
dae8e94cce Add support for accessing native bidi implementation via jni.
Include a simple test to verify that the bidi code works.
2010-02-24 18:20:54 -08:00
Doug Felt
20178d62cf Factor bidi algorithm into separate method.
Add rudimentary support for overriding default base line direction heuristic.
Add some simple tests of the bidi implementation.
2010-02-24 11:21:46 -08:00
Eric Fischer
8ca1228168 Merge "Fix rounding of extra spacing when it is negative." 2010-02-23 16:45:41 -08:00
Bjorn Bringert
6cf7a325e6 Clean up global search and web search activity finding
This removes the '*' value for android.app.searchable and
android.app.default_searchable that was previously used by apps to say
that they want global search as their search. I think the only
activity that this will affect is the wallpaper chooser in the
launcher, which doesn't seem like it matters.  It could mean that some
third party code will stop invoking global search, but all they would
need to do is call startSearch() with globalSearch=true instead.

Fixes http://b/issue?id=2377433 and http://b/issue?id=2377429

Change-Id: I0252952b44ae85dab31221b598ed79cc24e2b580
2010-02-23 14:27:43 +00:00
Doug Felt
1065758a0f Fix rounding of extra spacing when it is negative. 2010-02-22 14:14:57 -08:00
Doug Felt
6ad5a7a7c7 Add a few simple tests of StaticLayout. 2010-02-19 16:23:02 -08:00
Vasu Nori
e8de28415b bug fix for 2419869. also included 2 unittests.
bug fix for 2419869 is the following
   1. only one object can use the prepared statement object
        (SQLiteCompiledSql in SQLIteProgram)
   2. if two objects are requesting to use it, then create a new prepared
      statement object for exclusive use by the newcomer and let it be
      be finalized by the newcomer.
   3. add mInUse flag to SQLiteCompiledSql - to be set when SQLiteProgram
      requests it and to be released when that SQLiteProgram is done with it
a couple more changes included are
  1. unitests to simulate bug # 2419869 (and the fix's repair to it)
  2. better logging in SQLiteCloseable when it prints log messages
2010-02-18 14:49:45 -08:00
Gilles Debunne
d651629478 Merge "List.GetCheckItemIds no longer includes unchecked items." 2010-02-18 10:26:34 -08:00
Gilles Debunne
fd3ddfa6f0 List.GetCheckItemIds no longer includes unchecked items.
Unchecked items remain in the mCheckStates with an associated false value.
Now filtered out.

Added a unit test to ensure non regression.

Change-Id: If0b1a38aa06881055c87a97b3afb2c7fb48656f1
http://b/issue?id=2440815
2010-02-18 10:24:09 -08:00
Amith Yamasani
479ae0a280 Cleanup of global search references in SearchDialog and SearchManager. 2010-02-17 13:19:27 -08:00
Bjorn Bringert
1017a134c1 Clean up after failed MemoryFileTest.testPurge()
MemoryFileTest.testPurge() can fail if the process runs
out of file descriptors before the kernel starts purging ashmem areas.
Before, there was no finally block to close the open ashmem
file descriptions, which caused random other tests to fail.

I also changed the size of the memory areas to 10MB, which
should cause it to run out of memory before it runs out of file
descriptors. It now fails with this instead:

java.io.IOException
	at android.os.MemoryFile.native_pin(Native Method)
	at android.os.MemoryFile.allowPurging(MemoryFile.java:189)
	at android.os.MemoryFileTest.testPurge(MemoryFileTest.java:53)
	at java.lang.reflect.Method.invokeNative(Native Method)
	at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:169)
	at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:154)
	at android.test.InstrumentationTestRunner.onStart(InstrumentationTestRunner.java:430)
	at android.app.Instrumentation$InstrumentationThread.run(Instrumentation.java:1447)

I'm not sure why, but it could be that the kernel is purging the just
allocated area instead of an old one. That seems like bug.

See http://b/issue?id=2203775

Change-Id: Ia7930a714378474dd4c2c6709da40c08e715ab6f
2010-02-16 23:31:46 +00:00
Bjorn Bringert
bb50863c07 Merge "Remove flaky and broken search tests from continous" 2010-02-16 11:43:23 -08:00
Bjorn Bringert
052e88bb60 Remove flaky and broken search tests from continous
See: http://b/issue?id=2403672

Change-Id: Ie901a746b28a08f0cd6306c515c5fb5cddae4c41
2010-02-16 19:40:11 +00:00
Doug Zongker
c694aa7597 Merge "tweak the Base64 implementation" 2010-02-16 08:49:38 -08:00
Doug Zongker
9df2ffd420 tweak the Base64 implementation
- move the encodeInternal/decodeInternal methods into the inner
  "state" classes

- tighten up the inner loop of the encoder and decoder a bit, saving
  about 5% of time in both cases

- improve javadoc

- other little fixes

Change-Id: I72e0ce8502c664a32418cea04636ccdbf4fec17c
2010-02-16 08:48:52 -08:00
Dan Egnor
1c9131c91f Remove all traces of the old checkin service (and its associated parental
control interfaces) from the framework.
2010-02-13 12:40:12 -08:00