drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow the configuration string to have quotes.

Browse Source 
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
This commit is contained in:
Wink Saville
2010-03-05 13:23:06 -08:00
parent 6d141b0a9b
commit 01b6d24417
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/com/android/internal/telephony/RetryManager.java
View File

@ -153,13 +153,17 @@ public class RetryManager {
}
/**
* Configure for using string which allow arbitary
* Configure for using string which allow arbitrary
* sequences of times. See class comments for the
* string format.
*
* @return true if successfull
* @return true if successful
*/
public boolean configure(String configStr) {
// Strip quotes if present.
if ((configStr.startsWith("\"") && configStr.endsWith("\""))) {
configStr = configStr.substring(1, configStr.length()-1);
}
if (DBG) log("configure: '" + configStr + "'");
if (!TextUtils.isEmpty(configStr)) {

6
telephony/tests/telephonytests/src/com/android/internal/telephony/TelephonyUtilsTest.java
View File

@ -146,15 +146,15 @@ public class TelephonyUtilsTest extends TestCase {
}
/**
* Test string configuration using all options.
* Test string configuration using all options and with quotes.
*/
@SmallTest
public void testRetryManageString() throws Exception {
RetryManager rm = new RetryManager();
int time;
assertTrue(rm.configure("max_retries=4,"
+ "default_randomization=100,1000, 2000 :200 , 3000"));
assertTrue(rm.configure(
"\"max_retries=4, default_randomization=100,1000, 2000 :200 , 3000\""));
assertTrue(rm.isRetryNeeded());
time = rm.getRetryTimer();
assertTrue((time >= 1000) && (time < 1100));