am aa7b1450: am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev

* commit 'aa7b14501a5ac7ac5a0ec1425589d8c2bfa6fc17':
  Bump mms whitelist time up to 1 minute.
This commit is contained in:
Dianne Hackborn
2015-07-15 02:08:59 +00:00
committed by Android Git Automerger

View File

@@ -409,7 +409,7 @@ public class DeviceIdleController extends SystemService
MAX_TEMP_APP_WHITELIST_DURATION = mParser.getLong(
KEY_MAX_TEMP_APP_WHITELIST_DURATION, 5 * 60 * 1000L);
MMS_TEMP_APP_WHITELIST_DURATION = mParser.getLong(
KEY_MMS_TEMP_APP_WHITELIST_DURATION, 30 * 1000L);
KEY_MMS_TEMP_APP_WHITELIST_DURATION, 60 * 1000L);
}
}