summaryrefslogtreecommitdiff
path: root/core/java/android/util/TimeUtils.java
Commit message (Collapse)AuthorAgeFilesLines
* Switch "UTC time" to "Unix epoch time" (core)Neil Fuller2022-02-111-2/+2
| | | | | | | | | | | | | This is more correct. Android devices, even under ideal conditions, don't track UTC (which contains leap seconds and uses the SI definition of a second) but use a clock based on Unix epoch time (no leap seconds, but clocks may skip/stop or smear around leap seconds to ensure a fixed number of second increments per calendar day when leap seconds are applied to UTC). Bug: 218802673 Test: Compile only Change-Id: I0c557e2231f87ea1b99e3935f79af15bccf91da4
* Use isShownInPickerAt instead of isShownInPicker.Almaz Mingaleev2021-03-311-2/+31
| | | | | | | | | | | | | | | The latter is being removed. The date(1 Jan 2019 00:00) was a cut-off date used in SettingsUI. This change moves it to reuse that date without duplication. Affected method is used in setup wizard to answer "What time zone IDs should we show for a country?". The question is vague, but the change keeps user experience consistent across device w/o breaking method contract. Bug: 155738410 Test: presubmit Change-Id: Ib139b316e5909cab18d015b7c163bb9c79bcef5b
* Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-11-041-1/+1
| | | | | | | | | | | These are APIs that have @UnsupportedAppUsage but for which we don't have any evidence of them currently being used, so should be safe to remove from the unsupported list. Bug: 170729553 Test: Treehugger Merged-In: I626caf7c1fe46c5ab1f39c2895b42a34319f771a Change-Id: I54e5ecd11e76ca1de3c5893e3a98b0108e735413
* Merge "Move libcore.timezone to the i18n module - Final part" am: 35d6ab6a89 ↵vichang2020-07-021-4/+3
|\ | | | | | | | | | | | | | | am: 1c44c3b771 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348602 Change-Id: I89413242c6497114e8e533cff43d17b44fd758eb
| * Move libcore.timezone to the i18n module - Final partVictor Chang2020-06-301-4/+3
| | | | | | | | | | | | Bug: 141747409 Test: atest CtsLibcoreTestCases CtsLibcoreTestCases Change-Id: Id3c9a56dcf86b6f5ec81d09d12e432fc97f178c0
* | Merge "Use new package name for ZoneInfo and libcore.timezone" am: ↵vichang2020-06-301-1/+2
|\| | | | | | | | | | | | | | | af6f8e2301 am: 64937407f2 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1346485 Change-Id: I5ded5092e4c7706f58417a5c97f3207524b44a95
| * Use new package name for ZoneInfo and libcore.timezoneVictor Chang2020-06-301-1/+2
| | | | | | | | | | | | | | Bug: 141747409 Test: None Merged-In: Id99a345ec024179295063c3644f72c062cb50554 Change-Id: Id99a345ec024179295063c3644f72c062cb50554
* | Fix up LocationRequest and ProviderRequestSoonil Nagarkar2020-04-011-1/+11
| | | | | | | | | | | | | | | | | | -Use more idiomatic and efficient parceling -Cleanup LocationRequest a bit Bug: 151026407 Test: presubmits Change-Id: I3865421a128417a5096e39ee110139a13ab9ab3b
* | Merge "Avoid a @Nullable Boolean" am: 81a42af40d am: fd9c242128 am: 0db1f949daAutomerger Merge Worker2020-02-061-1/+1
|\| | | | | | | Change-Id: Iae09c0c6e0d0b8cc9018b811c658d7d73e8a729b
| * Avoid a @Nullable BooleanNeil Fuller2020-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | To avoid a @Nullable Boolean one method has been split into two. After some changes in the last release this also removes an optional parameter from the two new methods as it is now always null. Bug: 148450671 Test: treehugger Change-Id: I83be9647943c16ae30af4f8d032db428af1ad5fc
* | Merge "Tidy up libcore.timezone APIs" am: 8e0e0e8535 am: 0769745f70 am: ↵Automerger Merge Worker2020-01-311-3/+3
|\| | | | | | | | | | | 5075b7014b Change-Id: I3a8f7fba7c7c84b6f248a5d500b157c3412eaafc
| * Merge "Tidy up libcore.timezone APIs"Neil Fuller2020-01-301-3/+3
| |\
| | * Tidy up libcore.timezone APIsNeil Fuller2020-01-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tidy up the libcore.timezone APIs to make them as close as possible to android.timezone. In future, these classes should be repackages to be the actual android.timezone classes, so the APIs need to be in sync. Bug: 148086409 Test: treehugger Change-Id: Ia520abcf00e691f4a1b5549dafec44b76075e31a
* | | Merge "Rename ZoneInfoDB -> ZoneInfoDb" am: 402674f2a0 am: c3e31d6ac5 am: ↵Automerger Merge Worker2020-01-291-2/+2
|\| | | | | | | | | | | | | | | | | f8a4287915 Change-Id: I72978765010e3da52bcdf00299f7ba999bc9201b
| * | Rename ZoneInfoDB -> ZoneInfoDbNeil Fuller2020-01-281-2/+2
| |/ | | | | | | | | | | | | | | Rename ZoneInfoDB -> ZoneInfoDb to conform with coding standards. Bug: 148086409 Test: treehugger Change-Id: I2a5eca6bd013d3ca2ba93aabf36745f8873fc6fb
* | Merge "Add new module-lib APIs for MTS testing" am: b9e3e9e34c am: ↵Automerger Merge Worker2020-01-221-1/+1
|\| | | | | | | | | | | 876c59823e am: 8c4c7d0039 Change-Id: I37488a81d4066d240bdc0a22dbd3c72cafd55749
| * Add new module-lib APIs for MTS testingNeil Fuller2020-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several android.timezone classes have already been exposed for the telephony module work, so these tests provide coverage for those. Additional APIs have been exposed for MTS testing, i.e. to provide greater confidence that the tzdata module data is correct / is being read correctly. Also, small changes to existing code to make them consistent with new classes. Small docs improvements. Bug: 147884233 Test: see system/timezone change Change-Id: I047b29f17a41993f859947a6d6c3685896fe4cb6
| * Use new UnsupportedAppUsage annotation.Artur Satayev2020-01-091-1/+1
| | | | | | | | | | | | | | | | | | Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: I288969b0c22fa3a63bc2e71bb5009fe4a927e154 Merged-In: I288969b0c22fa3a63bc2e71bb5009fe4a927e154
* | Custom dark theme schedulingJay Aliomer2020-01-211-0/+23
| | | | | | | | | | | | | | | | allows the use to set the start and end automatic dark theme activation within a day. Fixes: 147649309 Test: atest UiModeManagerServiceTest UiModeManagerTest Change-Id: Iaa3593d4e8863412e3703ce9f089b88dd4df1225
* | Use new UnsupportedAppUsage annotation.Artur Satayev2020-01-071-1/+1
|/ | | | | | | | Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: I288969b0c22fa3a63bc2e71bb5009fe4a927e154
* Track changes to CountryTimeZones APINeil Fuller2019-09-101-6/+5
| | | | | | | | | | | | Track changes to CountryTimeZones.lookupByOffsetWithBias() API: the method now takes an extra argument: dstOffsetMillis, which is unused in this case. This commit also improves the parameter names to be more descriptive. Bug: 139091367 Test: treehugger Change-Id: I2090965640bb389ea41bde460f380f9ea8a6b176
* Simplify APIs exposed for time zone lookupsNeil Fuller2019-09-101-5/+12
| | | | | | | | | | | | | The libcore.timezone APIs may form the basis for some new SystemApis. Before starting that process the API surface is being rationalized to establish the core use cases. Test: Treehugger Bug: 139091367 Change-Id: I6c8b791524d16223c414612913b22f4d70c27d61 Merged-In: I6c8b791524d16223c414612913b22f4d70c27d61 (cherry picked from commit 400efa36ef8666ad8341c36679a4f2cb9fd00f9f)
* Added some TestApi that are already used by CTSWale Ogunwale2019-02-211-0/+2
| | | | | | | | Allows us to remove the use of private platform API from CTS. Bug: 124134247 Test: builds Change-Id: Iceb81ff7c9385e877d2612fbb7b506245d116928
* Fix job concurrency calculationMakoto Onuki2019-01-171-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Originally, we had two parameters "total active jobs=6" and "max FG jobs=4", but because of how we counted jobs against those, sometimes we ran at most 6 jobs and sometimes 10, depending on how pending jobs are queued. Now we made it consistent. - The new parameters that control it are: 1. Max total jobs 2. Max BG jobs 3. Min BG jobs * This is used to ensure a certain number of BG jobs should run even when the TOP app keeps scheduling new jobs and consume the max total jobs. (4. Screen off rampup delay.) We have these 3 values for each "memory trim level" and "screen on/off". The intention is that when the screen is off, we should run more jobs. However, when the screen is off, we don't increase the concurrency right away, but we'll do so after the rampup delay. - The current max values are based on the lenient side of the previous values, but with a slightly lowered the max job count when the screen is on. Under NOTMAL memory trim level, when the screen is ON: * 8 total jobs, 6 max BG jbos. Under NOTMAL memory trim level, when the screen is OFF: * 10 total jobs, 6 max BG jbos. Bug: 111360323 Test: Manual test using "adb shell requestsync" Test: atest JobCountTrackerTest MaxJobCountsTest Test: atest CtsJobSchedulerTestCases (following failed; all known issues) android.jobscheduler.cts.BatteryConstraintTest#testBatteryNotLowConstraintFails_withoutPower android.jobscheduler.cts.BatteryConstraintTest#testChargingConstraintExecutes android.jobscheduler.cts.ConnectivityConstraintTest#testConnectivityConstraintExecutes_metered android.jobscheduler.cts.ConnectivityConstraintTest#testConnectivityConstraintExecutes_withMobile android.jobscheduler.cts.ConnectivityConstraintTest#testUnmeteredConstraintFails_withMobile android.jobscheduler.cts.JobThrottlingTest#testBackgroundConnectivityJobsThrottled Change-Id: I0a9de5832b946cb1cac8a69aedbb0cb59251ea47
* Limit access to suspected false positives.Mathew Inwood2018-12-281-2/+3
| | | | | | | | | | | | | | | | | | | | | Members modified herein are suspected to be false positives: i.e. things that were added to the greylist in P, but subsequent data analysis suggests that they are not, in fact, used after all. Add a maxTargetSdk=P to these APIs. This is lower-risk that simply removing these things from the greylist, as none of out data sources are perfect nor complete. For APIs that are not supported yet by annotations, move them to hiddenapi-greylist-max-p.txt instead which has the same effect. Exempted-From-Owner-Approval: Automatic changes to the codebase affecting only @UnsupportedAppUsage annotations, themselves added without requiring owners approval earlier. Bug: 115609023 Test: m Change-Id: I020a9c09672ebcae64c5357abc4993e07e744687
* Track move of timezone classes to libcore.timezoneNeil Fuller2018-11-271-1/+1
| | | | | | | | | Some time zone related libcore classes are moving from libcore.util to libcore.timezone. Bug: 119026403 Test: build only Change-Id: Ic807977a85276b888362295d1d305effe33076fc
* Track move of timezone classes to libcore.timezoneNeil Fuller2018-11-221-3/+3
| | | | | | | | | | | | Some time zone related libcore classes are moving from libcore.util to libcore.timezone. Bug: 119026403 Test: build only Exempt-From-Owner-Approval: Trivial import change Merged-In: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43 Change-Id: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43 (cherry picked from commit 164394db8e7d3671ee035c19d23263cbcab623a0)
* API for retrieving time zone IDs by countryNeil Fuller2018-11-201-0/+40
| | | | | | | | | | New method has been requested by Setup Wizard. Test: CTS: run cts-dev -m CtsUtilTestCases -t android.util.cts.TimeUtilsTest Bug: 116544863 Merged-In: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9 Change-Id: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9 (cherry picked from commit f9bb2d8f020c2c7815359cae8dc8255fd8e9d1de)
* Add @UnsupportedAppUsage annotationsMathew Inwood2018-08-141-0/+4
| | | | | | | | | | | | | | | | | | | | For packages: android.util.proto android.util.jar android.util.apk android.util This is an automatically generated CL. See go/UnsupportedAppUsage for more details. Exempted-From-Owner-Approval: Mechanical changes to the codebase which have been approved by Android API council and announced on android-eng@ Bug: 110868826 Test: m Change-Id: I18848448a81132399f6878812acf5031ed8cec9f Merged-In: Ia0f48c244b0fbe33d40d797702a82303648196ed
* Adding batterystats history to proto dump.Kweku Adams2018-05-071-0/+8
| | | | | | | | | | | It will only print out a dump for userdebug or eng builds. Bug: 77727638 Test: flash device and check output of incident proto and 'dumpsys batterystats -c --history' Merged-In: Ib74d4c664f23a61e6fc33f700ba6a3c6fad32c74 Change-Id: Ia0c993d1281cc350d93f9c13f5540b349a4bfb84
* Remove code no longer used by telephonyNeil Fuller2018-01-151-95/+3
| | | | | | | | | | This code was previously used by telephony but was removed by frameworks/opt/telephony commit a0f09cee0f6328ea104b9ef965a387b4a4652e8a Bug: 63743683 Test: make droid Change-Id: I83deffc2aadc098e1c976bf164a752e19b96c77a
* Extend JobInfo to support NetworkRequest.Jeff Sharkey2017-11-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current JobInfo.NETWORK_TYPE values offer basic network selection ability, but more precise requirements continue to come up. Instead of creating more NETWORK_TYPE constants, add support for the existing NetworkRequest object, which is the idiomatic way for an app to express the type of network they'd like to use. Move the implementation details of NETWORK_TYPE constants to use this new NetworkRequest functionality. Deprecate NETWORK_TYPE_METERED, since the lack of the NOT_METERED capability doesn't imply that the connection is metered. (Apps using this API to get to a cellular network should use TRANSPORT_CELLULAR instead.) Add new SystemClock APIs that return java.time.Clock instances for various Android-specific clocks. This gives us a clean interface (with negligible overhead) for swapping in artificial clocks for testing purposes. Improve JobStoreTest to validate new NetworkRequest features, and add one last sanity check to assertTasksEqual() to compare raw bits-on-wire, to catch people who forget to check new fields. Watch for IoThread to go idle to run tests faster. Test: bit FrameworksServicesTests:com.android.server.job. Bug: 67040695 Change-Id: I189e7602132a0ec26d2f0cc6dadc188664961a47
* Remove time_zones_by_country.xml fileNeil Fuller2017-05-241-116/+54
| | | | | | | | | | | | | | | | | | | | | time_zones_by_country.xml has been replaced by a file that can be updated outside of an OTA and can be accessed via libcore.util.TimeZoneFinder. This means parsing code has been removed from this class and replaced by calls to libcore code. libcore code uses ICU so this class adapts to java.util.TimeZone for published public APIs as well as other knock-ons to reduce impact of this change in telephony code. All use of classes called TimeZone are fully-qualified to reduce confusion. Several public-but-hidden methods have been removed. These can be returned if there are any important apps relying on them. Bug: 25338903 Test: Ran CtsUtilTestCases Change-Id: I699b4e7420e8d7e61ee68ec96552ab3144c9bab2
* Fix TimeUtils.formatDuration for exactly one of a unitMitchell Wills2015-09-221-3/+3
| | | | | | | | | | | | Previously printing a duration where a unit (except ms) was one and the next smallest unit was zero would result in the duration being being expressed in the next smallest unit. For example 1m0s0ms would be formatted as 60s0ms. Update testFormatHugeDuration to supporting times > 999 days The implementation was fixed in 3d1933c45fe9ba2389ebd166d96abeceab1971d1 Change-Id: I9d609f7a0f82755ea653a205293a6e3785a10d1e
* Better handling of trim/benchmark results.Jeff Sharkey2015-07-011-0/+12
| | | | | | | | | | | | | | Request benchmarking of devices once per week during normal fstrim maintenance window. Tunable parameter gives us the ability to change frequency through global setting. Track individual benchmark and trim results for each volume, and use scrubbed volume identifier (based on adoptiong age) when logging stats to drop box. Track last benchmark and trim time for each volume separately. Bug: 21831325 Change-Id: I53b3ed788f7820c2e5bceb2840339f5b4aada3f0
* Implement some control over ALLOW_WHILE_IDLE alarms.Dianne Hackborn2015-06-121-33/+53
| | | | | | | | | | | | | | | | | | | | | | | Since these alarms allow you to bypass the idle restrictions, we don't want them to be so open-ended like other alarms. This implements a policy where the alarm manager will only deliver these types of alarms every X minutes to each application. For this initial implementation, X is 1 minute under normal operation and 15 minutes when in idle mode. To do this, I needed to introduce a new internal allow-while-idle flag for system alarms, which applications can't get, and doesn't have these new restrictions. Also tweaked how the alarm manager handles the alarm window, so it doesn't change if the alarm gets rescheduld; the window is now always what as computed based on the time when the alarm was first given to it. Finally, fix TimeUtils to be able to correctly print times that are > 999 days. Change-Id: Ibad8c6a7c14b0624b54e82267be23224b4c31e84
* am 5a44bdc8: am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code."Narayan Kamath2014-06-161-4/+1
|\ | | | | | | | | * commit '5a44bdc828cba61aa055e2d71b3af62f39100179': Remove some pointless code.
| * Remove some pointless code.Narayan Kamath2014-06-131-4/+1
| | | | | | | | | | | | | | | | Unnecessary disk reads for values that are never used (and cached elsewhere, so that optimization is rendered pointless). Change-Id: Ic14a8b53a96908bb03eae28759d7be2c217e8125
* | Add TimeInterpolator support to RNAJohn Reck2014-05-121-0/+3
|/ | | | | | Bug: 14678626 Change-Id: I6554e7fcd42c49fac3618ca792083bb68e358f55
* Use the newer ZoneInfoDB API.Elliott Hughes2013-04-261-1/+1
| | | | Change-Id: I846c720ae6c262afb4fd7f8a749008c837e76cc4
* Power manager rewrite.Jeff Brown2012-08-151-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The major goal of this rewrite is to make it easier to implement power management policies correctly. According, the new implementation primarily uses state-based rather than event-based triggers for applying changes to the current power state. For example, when an application requests that the proximity sensor be used to manage the screen state (by way of a wake lock), the power manager makes note of the fact that the set of wake locks changed. Then it executes a common update function that recalculates the entire state, first looking at wake locks, then considering user activity, and eventually determining whether the screen should be turned on or off. At this point it may make a request to a component called the DisplayPowerController to asynchronously update the display's powe state. Likewise, DisplayPowerController makes note of the updated power request and schedules its own update function to figure out what needs to be changed. The big benefit of this approach is that it's easy to mutate multiple properties of the power state simultaneously then apply their joint effects together all at once. Transitions between states are detected and resolved by the update in a consistent manner. The new power manager service has is implemented as a set of loosely coupled components. For the most part, information only flows one way through these components (by issuing a request to that component) although some components support sending a message back to indicate when the work has been completed. For example, the DisplayPowerController posts a callback runnable asynchronously to tell the PowerManagerService when the display is ready. An important feature of this approach is that each component neatly encapsulates its state and maintains its own invariants. Moreover, we do not need to worry about deadlocks or awkward mutual exclusion semantics because most of the requests are asynchronous. The benefits of this design are especially apparent in the implementation of the screen on / off and brightness control animations which are able to take advantage of framework features like properties, ObjectAnimator and Choreographer. The screen on / off animation is now the responsibility of the power manager (instead of surface flinger). This change makes it much easier to ensure that the animation is properly coordinated with other power state changes and eliminates the cause of race conditions in the older implementation. The because of the userActivity() function has been changed so that it never wakes the device from sleep. This change removes ambiguity around forcing or disabling user activity for various purposes. To wake the device, use wakeUp(). To put it to sleep, use goToSleep(). Simple. The power manager service interface and API has been significantly simplified and consolidated. Also fixed some inconsistencies related to how the minimum and maximum screen brightness setting was presented in brightness control widgets and enforced behind the scenes. At present the following features are implemented: - Wake locks. - User activity. - Wake up / go to sleep. - Power state broadcasts. - Battery stats and event log notifications. - Dreams. - Proximity screen off. - Animated screen on / off transitions. - Auto-dimming. - Auto-brightness control for the screen backlight with different timeouts for ramping up versus ramping down. - Auto-on when plugged or unplugged. - Stay on when plugged. - Device administration maximum user activity timeout. - Application controlled brightness via window manager. The following features are not yet implemented: - Reduced user activity timeout for the key guard. - Reduced user activity timeout for the phone application. - Coordinating screen on barriers with the window manager. - Preventing auto-rotation during power state changes. - Auto-brightness adjustment setting (feature was disabled in previous version of the power manager service pending an improved UI design so leaving it out for now). - Interpolated brightness control (a proposed new scheme for more compactly specifying auto-brightness levels in config.xml). - Button / keyboard backlight control. - Change window manager to associated WorkSource with KEEP_SCREEN_ON_FLAG wake lock instead of talking directly to the battery stats service. - Optionally support animating screen brightness when turning on/off instead of playing electron beam animation (config_animateScreenLights). Change-Id: I1d7a52e98f0449f76d70bf421f6a7f245957d1d7
* Avoid emitting broken ASCII.Jeff Sharkey2012-07-211-3/+11
| | | | | Bug: 6131887 Change-Id: Iff13573aad8128cc7ae3613ab718c81e6d0862a1
* Add additional debug for time zone handling.Wink Saville2012-05-101-0/+19
| | | | Change-Id: Ie46bba7e0ef7737a865f7efadbf963c2d14e488f
* If no NITZ information use Country Code to set TimeZone.Wink Saville2012-03-011-30/+131
| | | | | | | | | | | | This is not perfect and only works if the CC is known via the GSM radio and is only accurate if there is one time zone per country. This does nothing to resolve time zone problems for wifi only devices. So this is a partial fix for bug 2896745 Bug: 2896745 Change-Id: I78f013836c4e4870b8b1016a8312f5adbe0d31c9
* Tracking merge of dalvik-dev to masterBrian Carlstrom2011-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git cherry-pick --no-commit a80febd83c8bf0b6717da2a7136179bdc906a5b7 git cherry-pick --no-commit 5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd git cherry-pick --no-commit 4886db14c9eee4b6fee69bd54c57c5af04709c4c git cherry-pick --no-commit 560c685e448769904047507b9484ce8111967d7e git cherry-pick --no-commit 63dde7a2fcfa53dc531558635b64cea613d3cdb4 git cherry-pick --no-commit 74e5cb91060a379d98dd3a333b5f231bfb4f502e git cherry-pick --no-commit 1cc8c9708b555e2e338b7798d38887a2fefcfea6 git cherry-pick --no-commit 09625a21f5abe0c0db15757f58585d552d62c3d7 git cherry-pick --no-commit fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458 git cherry-pick --no-commit a68cb7fa3ab42854768b8145ff85231663770292 git cherry-pick --no-commit 716beb1c131dd2c6b805d4f681debaa20075010c git cherry-pick --no-commit 8c29b1097a7afe3a77e27546a56e396f3620a4ec git cherry-pick --no-commit 9c6a1a55d1c8086c1cc57464eea43725694ff70c git cherry-pick --no-commit b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8 Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
* am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add ↵Xavier Ducrohet2011-02-281-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | --non-constant-id to aapt." * commit 'b732b7b5e8192501360edc15fb8c6399d11fb97d': GpsLocationProvider: Clean up HAL initialization/cleanup sequence Fixed GSM encoded network initiated position request Ensuring thread-safe usage of DateFormat. Fixing infinite loop for zero duration. Fix for an infinite loop while scrolling lists. WAPPushManager, WAP Push over SMS message handler Add --non-constant-id to aapt.
| * am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505': GpsLocationProvider: Clean up HAL initialization/cleanup sequence Fixed GSM encoded network initiated position request Ensuring thread-safe usage of DateFormat. Fixing infinite loop for zero duration. Fix for an infinite loop while scrolling lists. WAPPushManager, WAP Push over SMS message handler Add --non-constant-id to aapt.
| | * Fixing infinite loop for zero duration.Jozef BABJAK2011-02-221-1/+1
| | | | | | | | | | | | Change-Id: I837478c1598f1d2f99bf773597f0d66d0fc3cf1a
| * | Fix issue #3224616: TimeUtils.formatDuration() can drop 0s.Bjorn Bringert2010-12-201-3/+2
| |/ | | | | | | | | | | Integrated from master. Change-Id: Ie12dd25cce03c06fafb7df1335266322df43b038
* | Remove default constructors from static utility classes.Jesse Wilson2011-02-241-14/+15
| | | | | | | | | | Change-Id: Id8dc55a30a03e1da87500b66c429de9268033b9e http://b/3344646