drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,113 Commits 1 Branch 0 Tags
Commit Graph

1109 Commits

Author SHA1 Message Date
The Android Open Source Project
108817f3d8 am 8b270a7a: am 579e08e6: am f7896449: merge from open-source master 2010-05-05 18:16:31 -07:00
Jean-Baptiste Queru
7751667c68 Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones" 2010-05-05 16:30:53 -07:00
Jean-Baptiste Queru
12849c8021 Merge "Type Zero Sms should not be displayed/stored/notified." 2010-05-05 16:18:30 -07:00
The Android Open Source Project
579e08e657 am f7896449: merge from open-source master 
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken

* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
  Add new keycodes for the convenience of Japanese IMEs
  Call register_localized_collators() with the current locale.
  Fixed deserialization problem in DatePicker.
  Fix for bug 2467152 files with spaces fail to open.
  Set alpha value for newly created dim surface.
  telephony: Fix CID when CID is unknown
 2010-05-05 16:00:01 -07:00
The Android Open Source Project
f78964490d merge from open-source master 
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
 2010-05-05 15:57:42 -07:00
Jean-Baptiste Queru
0938ef4215 Merge "telephony: Fix CID when CID is unknown" 2010-05-05 13:15:24 -07:00
Jake Hamby
9e397775e1 Fix Javadoc param tags and typo in private constant definition. 
- Two Javadoc comments in telephony/cdma/SmsMessage.java had the wrong parameter name in @param.
- Typo in private constant defined in telephony/cdma/sms/BearerData.java.

Change-Id: I3c210383f74a5fef022e0958ab56ef9b7be8e97c
 2010-05-04 13:35:55 -07:00
Jake Hamby
bcd573229e Fix some more typos, remove unused imports, and remove unnecessary cast. 
More minor code cleanups in the telephony framework.

Change-Id: I27abe11e02fc6fea12885eea4fe275240a546332
 2010-05-04 13:31:04 -07:00
Jake Hamby
43a869f3ad Fix some typos and move two .java files to the correct package directory. 
- Fix typos in comments in TelephonyProperties.java
- Move two .java files in telephonytests to the correct package directory.

Change-Id: Ie69da31c128899d149d4f5d5aababe8d017d8f18
 2010-05-04 12:59:46 -07:00
Jake Hamby
4103214f8d Merge "Fix a few more Javadoc typos." 2010-05-04 12:52:33 -07:00
Xia Wang
62dd689cae am 011056c2: am 7eb700e0: Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:51:41 -07:00
Xia Wang
fda56b600e Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java 
Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory

bug: 2644009

Change-Id: I1ecc09312f404e00bbf30befffb1811efe578cc3
 2010-04-30 10:59:37 -07:00
Jake Hamby
cbcd9be410 Fix a few more Javadoc typos. 
Change-Id: Id43fe2551ef53c1a0a779c6101ea0bc7c23e1f93
 2010-04-29 12:35:07 -07:00
Naveen Kalla
6308e48d40 Notify user regarding invalid number during MO call. 
When user dials an invalid number, network returns an error indicating
"unobtainable number" (See the Table 10.5.123/3GPP TS 24.008 for
the possible failure causes). Changes done to display message to
indicate user that an invalid number has been dialed.

Change-Id: I477d64bc3b59cc205396f911ff9630c640f619f3
 2010-04-23 09:43:15 -07:00
Wei Huang
1b7f0d4e38 am d54c48b2: am 9666bbdf: am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo 2010-04-22 16:47:17 -07:00
Wei Huang
9666bbdf1b am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo 
Merge commit '7b88af679a9a3b5737343bb996ef392b76d19e73' into froyo-plus-aosp

* commit '7b88af679a9a3b5737343bb996ef392b76d19e73':
  bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
 2010-04-22 16:35:56 -07:00
Wei Huang
fdf3b26ba7 bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug. 
Change-Id: Ica1df6582533edf8d9a5825dbe510eeab4828309
 2010-04-22 15:13:48 -07:00
John Wang
701897451b am 81b7ea00: am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 2010-04-21 15:00:21 -07:00
John Wang
f77fff4b4e am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 
Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp

* commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb':
  Add ILLEGAL_SIM_OR_ME error code.
 2010-04-21 14:46:06 -07:00
John Wang
7fb4b8455c Add ILLEGAL_SIM_OR_ME error code. 
It is for bug 2571583 to provide better failure information of network operator selection.

Network selection returns ILLEGAL_SIM_OR_ME when the failure is
permanent and no retries needed, such as illegal SIM, ME, HRL config, etc.

Change-Id: Iaf70bef64d3cbf35e4d9915418cbb5b78607f73e
 2010-04-21 11:34:15 -07:00
The Android Open Source Project
3c0f1aed7c am d29eafdb: am f021d12f: merge from open-source master 2010-04-21 09:24:17 -07:00
The Android Open Source Project
f021d12f6f merge from open-source master 
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
 2010-04-21 09:10:43 -07:00
Fredrik Jagenheim
d26924d8d7 Corrected SPN and PLMN name handling 
SPDI-file on SIM and BCD encoded PLMN-entries wasn't parsed correctly
causing us to display wrong networknames.

Change-Id: I09d80deec45b4b3ad525a9359b4866de7549e39e
 2010-04-21 10:15:19 +02:00
Alex Yakavenka
2aba0ec873 Fix printing order of phone objects creation 2010-04-19 20:28:22 -07:00
Jey
eccd93c7eb SetLocaleByCarrier, only if its not an unknown carrier. 
Change-Id: Ia218b3622a23cc0fc1bb2c1606c832ecc561d5bf
 2010-04-16 13:57:42 -07:00
Jake Hamby
145ff609de Spelling corrections and other minor cosmetic cleanups. 
- Fixed a bunch of typos in comments (plus a few variable names)
- Removed unused import lines from telephony classes
- Added @Override attribute to overriding methods
- Made SmsMessage.PduParser inner class private & deleted unused constructor
- Added type specifiers to declarations of ArrayList and HashMap
- SimulatedCommands.getRegistrationState() had an ArrayIndexOutOfBoundsException
  trying to write to index 14 of a 14-element array. I removed the
  out-of-bounds assignment.

Change-Id: I054b5156aa64ab6639028d5b45a7e688b2deee08
 2010-04-15 15:23:12 -07:00
Naveen Kalla
e9c0a6d737 Telephony: Add PUK MMI code support for CDMA RUIM phones 
Add support to unlock RUIM using PUK. PUK is entered using MMI codes.
 2010-04-13 14:58:41 -07:00
Naveen Kalla
c6dd77d04a telephony: Fix CID when CID is unknown 
Unknown CID is indicated as 0xFFFFFFFF by ril. When telephony receives that
value, set CID to UNKNOWN.
 2010-04-12 11:16:22 -07:00
Wink Saville
662262ac04 Fix a FATAL ClassCastException in DataConnection.java 
bug: 2583290
Change-Id: I93e0307664427b29942b1ed1e5acbf21e78a605f
 2010-04-09 08:57:31 -07:00
Dan Egnor
5945579e4e Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:45:07 -07:00
Dan Egnor
2b4abcd0c7 Change TrafficStats to a new JNI implementation. 
Also change phone's ConnectionStateTrackers to use it directly,
rather than through the INetStat binder interface.

Bug: 2578938
Change-Id: I8858e2609cbec3be845a0ce5178cb03f67e01b41
 2010-04-07 19:06:29 -07:00
John Wang
56c2d2ff27 Add emergencyOnly indicator in ServiceState. 
For bug 2536842 to show signal strength in Emergency mode.

The STATE_EMERGENCY_ONLY of ServiceState is not in-use.

So add a hide interface to indicate Emergency mode.

Change-Id: I19398ac5e73a722dcaaf744347f961d1fa7513ac
 2010-04-07 16:06:13 -07:00
Naveen Kalla
c16889dc00 Type Zero Sms should not be displayed/stored/notified. 
Type Zero messages indicated by TP_PID field set to value 0x40,
should not be displayed/stored/notified. They should only be
acknowledged.
 2010-03-26 05:42:04 -07:00
The Android Open Source Project
02034d3568 merge from open-source master 
Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e
 2010-03-22 15:55:38 -07:00
Jake Hamby
633dfb6da6 Fix some typos and logging of calls to CDMA methods. 
Fixed some comment typos and cleaned up logging of unexpected calls to
CDMA-specific methods on a non-CDMA device.

Change-Id: Ia6e5fba765122cbf3186fd9fecca7a3931a76dcc
 2010-03-22 14:41:43 -07:00
Brad Fitzpatrick
2e805b19cd Grammar fixes. 
Change-Id: I77672d2260c26aee146bb6a853137c14e3db1f28
 2010-03-22 10:10:51 -07:00
The Android Open Source Project
1da49e45a8 merge from open-source master 
Change-Id: I23af6296f0867bea2a2da72d4eb3dda93025b1ac
 2010-03-19 16:36:32 -07:00
Robert Greenwalt
78b6e89914 Add support for DUN over a cdma connection. 
It uses the data profile paramater when setting up the connection to indicate
it's a tethered connection.  We get different behavior from vzw afterwards, so
it is getting picked up.

bug:2422545
Change-Id: Ic022845088726d723813b82e166d15d7b2945da1
 2010-03-18 17:43:42 -07:00
jsh
8214deb542 Add definitions for WiMAX and iDen network types. 
b/2509185

Change-Id: Icf07ce857874e200712218713edbdbb47e646297
 2010-03-15 15:31:08 -07:00
Wink Saville
e04c0275d7 Merge "Fix data error handling." 2010-03-12 16:51:21 -08:00
Wink Saville
abeff9479f Fix data error handling. 
In change I5776324a I made DataConnection.reset asynchronous.
That was a mistake as callers to cleanUpConnection assumed
it was synchronous. Added DataConnection.resetSynchronously
as a fix, someday the trackers will become asynchronous and
this won't be necessary.

Change-Id: I4669901e5c47a712212bb388c35fbb9f9ff603a7
 2010-03-12 15:31:56 -08:00
Wink Saville
7261128801 Merge "Make sure that pause dialing works even when screen is off." 2010-03-12 09:35:43 -08:00
Wink Saville
82c0845978 Make sure that pause dialing works even when screen is off. 
bug: 2200086
Change-Id: Ib8c73ce4bca293811ba681c558c37322125c511f
 2010-03-12 09:32:58 -08:00
Wink Saville
cea764088d Add Copyright assignement. 
bug: 2510419
Change-Id: I78355d89e7a9362f918a03c6fc5457209ea4490a
 2010-03-12 09:04:48 -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
9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java
53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java
93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java
328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java
eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java
49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java
a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java
3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java
5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java
c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java
9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java
21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java
e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java
192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java
1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java
69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java
c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java
df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 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
John Wang
eb3035cbca Merge "Make getCellLocation return null if not available." 2010-03-11 13:56:59 -08:00
John Wang
41a46718b3 Make getCellLocation return null if not available. 
For bug 2422284.

Check the cell location and return null if the location is not available.

Change-Id: Ie9a331b906a8253c9a9596365af8705dc03823ce
 2010-03-11 13:53:46 -08:00
Robert Greenwalt
a9729deb9c Merge "Update the Mcc Table for Canada." 2010-03-08 16:35:13 -08:00
Robert Greenwalt
e640a5aee4 Update the Mcc Table for Canada. 
Changing the mnc length from 2 to 3.  We don't have any canandian APNs with 2 digit mncs
and wikipedia doesn't list any canadian carriers with 2 digit mncs.

Rogers was reporting some sims with 72 and others with the correct 720 - a sample "72" sim
didn't have the mnc-length field set so we went with 2.  With this fix all rogers sims will
be picked up correctly.
 2010-03-08 16:26:34 -08:00
Wink Saville
01b6d24417 Allow the configuration string to have quotes. 
This makes properties easier to read so from:
   ro.cdma.data_retry_config=default_randomization=2000,0,0,120000,180000

to this:
   ro.cdma.data_retry_config="default_randomization=2000,0,0,120000,180000"

Change-Id: Ied2a7be0102512cd2ce528d566c19ed3a8e2f480
 2010-03-05 13:23:06 -08:00