summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Collapse)AuthorAgeFilesLines
* am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into ↵Mike Lockwood2010-07-261-1/+5
|\ | | | | | | | | | | | | | | | | gingerbread Merge commit '70736a6d92767258543bb03ac22a705535d86341' into gingerbread-plus-aosp * commit '70736a6d92767258543bb03ac22a705535d86341': Avoid starting multiple threads in ShutdownThread
| * Avoid starting multiple threads in ShutdownThreadMike Lockwood2010-07-261-1/+5
| | | | | | | | | | | | | | | | | | | | The previous code allowed this to happen if a second call to shutdown happened while the dialog was being displayed. BUG: 2563243 Change-Id: I93adc4ef316917a79002d580b17eda0dc354704c Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am 14bfa398: Infrastructure to report running services to developer.Dianne Hackborn2010-07-261-0/+68
|\ \ | |/ | | | | | | | | | | Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp * commit '14bfa398a4e8697ce5822861a684b7d1245e4a85': Infrastructure to report running services to developer.
| * Infrastructure to report running services to developer.Dianne Hackborn2010-07-241-0/+68
| | | | | | | | Change-Id: Id1aae61323e7b8357c5fcc4bc641aaa57f3b6fde
* | am 46730fc7: Fix handling of application disabled state.Dianne Hackborn2010-07-261-0/+10
|\ \ | |/ | | | | | | | | | | Merge commit '46730fc78388607fd562044cbaaa26ffc9f65337' into gingerbread-plus-aosp * commit '46730fc78388607fd562044cbaaa26ffc9f65337': Fix handling of application disabled state.
| * Fix handling of application disabled state.Dianne Hackborn2010-07-241-0/+10
| | | | | | | | Change-Id: I617b76e89eeb75437b384b92f1205bb00b15bb70
* | am 3bee5af8: Battery stats: start removing last stats, keep total discharge.Dianne Hackborn2010-07-262-101/+135
|\ \ | |/ | | | | | | | | | | Merge commit '3bee5af8162c177f8c8f4199489a401058ab26a9' into gingerbread-plus-aosp * commit '3bee5af8162c177f8c8f4199489a401058ab26a9': Battery stats: start removing last stats, keep total discharge.
| * Battery stats: start removing last stats, keep total discharge.Dianne Hackborn2010-07-242-101/+135
| | | | | | | | Change-Id: I59c4bcbb9893adb237017add76b83c22153f94ef
* | am eab07e5c: Merge "Report sensor events to BatteryStats service" into ↵Mathias Agopian2010-07-261-0/+7
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d' into gingerbread-plus-aosp * commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d': Report sensor events to BatteryStats service
| * Merge "Report sensor events to BatteryStats service" into gingerbreadMathias Agopian2010-07-231-0/+7
| |\
| | * Report sensor events to BatteryStats serviceMathias Agopian2010-07-231-0/+7
| | | | | | | | | | | | Change-Id: I9b83aa709887aa658bc474391573f2d45b6c4eb2
* | | am a13a02cd: New permission for non-purgeable cache downloads.Steve Howard2010-07-261-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964' into gingerbread-plus-aosp * commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964': New permission for non-purgeable cache downloads.
| * | New permission for non-purgeable cache downloads.Steve Howard2010-07-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This permission allows an app to use the public download manager API to download files to the cache partition that won't be automatically deleted when the download manager needs space. Change-Id: Id9a5cd61c940df22765b358290b8ad8ceeff493e
* | | am c7ab09ed: Merge "Fix build."Jean-Baptiste Queru2010-07-261-6/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b' into gingerbread-plus-aosp * commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b': Fix build.
| * \ \ Merge "Fix build."Jean-Baptiste Queru2010-07-261-6/+1
| |\ \ \
| | * | | Fix build.Jean-Baptiste Queru2010-07-161-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using public APIs instead of private ones. Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
| * | | | Remove compilation warnings by removing illegal charactersMac Wang2010-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8522be88b628a12fbde7825354730de4b4d4635a
* | | | | am 13d08515: Remove SEE_ALL_EXTERNAL permission from Download Manager.Steve Howard2010-07-221-8/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '13d08515f038db45de6028085993ae6076566867' into gingerbread-plus-aosp * commit '13d08515f038db45de6028085993ae6076566867': Remove SEE_ALL_EXTERNAL permission from Download Manager.
| * | | | Remove SEE_ALL_EXTERNAL permission from Download Manager.Steve Howard2010-07-211-8/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | I'm removing this currently unused functionality from the Download Manager implementation, so the constant might as well go. Change-Id: I4f0970211201881a8426b83b5275408cd14c3377
* | | | am b8e07a51: DL manager support for broadcasts + connectivity controlSteve Howard2010-07-213-25/+97
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'b8e07a51c1849d6894c5773a3daacedd01294218' into gingerbread-plus-aosp * commit 'b8e07a51c1849d6894c5773a3daacedd01294218': DL manager support for broadcasts + connectivity control
| * | | DL manager support for broadcasts + connectivity controlSteve Howard2010-07-213-25/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Additions to DownloadManager to support control of broadcast intents, allowed network types, and roaming control. This includes new constants and added implementation. * New DB columns to hold connectivity flags and one to indicate whether the download was initiated through the public API; this is used to change behavior related to broadcast intents and connectivity controls. Change-Id: I2e8e4ce92cde7889a0f24dc43b86c596c73c0eaa
* | | | am e4764521: Merge "new SensorService" into gingerbreadMathias Agopian2010-07-212-161/+71
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp * commit 'e4764521353e898554931a557460fc49209fb0a9': new SensorService
| * | | Merge "new SensorService" into gingerbreadMathias Agopian2010-07-212-161/+71
| |\ \ \
| | * | | new SensorServiceMathias Agopian2010-07-192-161/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove old sensor service and implement SensorManager on top of the new (native) SensorManger API. Change-Id: Iddb77d498755da3e11646473a44d651f12f40281
* | | | | am 3685db7f: am e8605af5: Merge "Avoid leaking file descriptors when ↵Dan Egnor2010-07-211-32/+57
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returning drop box events." into froyo Merge commit '3685db7f5dd8a830a4e096404d4924e12697fb78' into gingerbread-plus-aosp * commit '3685db7f5dd8a830a4e096404d4924e12697fb78': Avoid leaking file descriptors when returning drop box events.
| * | | | am e8605af5: Merge "Avoid leaking file descriptors when returning drop box ↵Dan Egnor2010-07-211-32/+57
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events." into froyo Merge commit 'e8605af513e846f6cd223c9e92461189727d8c9b' into gingerbread * commit 'e8605af513e846f6cd223c9e92461189727d8c9b': Avoid leaking file descriptors when returning drop box events.
| | * \ \ \ Merge "Avoid leaking file descriptors when returning drop box events." into ↵Dan Egnor2010-07-211-32/+57
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | froyo
| | | * | | | Avoid leaking file descriptors when returning drop box events.Dan Egnor2010-07-211-32/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't use Parcel.writeValue() to write the ParcelFileDescriptor, otherwise it leaks when returning the value to the caller (the flag gets lost). Change the way DropBoxManager.Entry gets serialized so that it uses a bit of its own flags value to track whether the data is a byte[] or a ParcelFileDescriptor. Modify the dropbox unit test to add extensive checking of Entry serialization and deserialization under various circumstances, and to include a regression test to ensure that FD leaking doesn't happen. Bug: 2847738 Change-Id: I4ccd17dd03ffab234340cd359e6f3510fdf81193
* | | | | | | am 92010ff5: am dbac180d: Fix a merge problem with html mmsTom Taylor2010-07-212-3/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9' into gingerbread-plus-aosp * commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9': Fix a merge problem with html mms
| * | | | | | am dbac180d: Fix a merge problem with html mmsTom Taylor2010-07-212-3/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread * commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff': Fix a merge problem with html mms
| | * | | | | Fix a merge problem with html mmsTom Taylor2010-07-213-3/+9
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Html mms message support was added back in Jan '10. At that time, we had moved the mms code out of the framework into the mms app. We decided to back out that change and leave the mms code in its original place. As a result, the changes to support html messages were lost. This handmerged CL restores those changes. I'll cherry-pick this into master as well. Bug 2858888 Change-Id: Icf8835edc8ac396698c167be5433a6fe1cfe6103
* | | | | | merge from open-source masterThe Android Open Source Project2010-07-211-4/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Change-Id: Ide1539b6777faf232d5360d6dc89a5d255982747
| * | | | | Shoud specify the Resource class instance as an argument of the methodMasanori Ogino2010-07-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | newDrawable and change the name from 'DrawableCacheClear' to 'clearDrawableCache' (additional changes for ID:15815) https://review.source.android.com/#change,15815 Change-Id: I6bf19b8e6e187df8c8e3cb57d9e04278ddfe5055
* | | | | | am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was ↵Jason Parks2010-07-201-7/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | held." into gingerbread Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp * commit '29e25bd3418b04e395119bf99abe92898830a796': Only print out wake locks in the if the wakelock was held.
| * | | | | Merge "Only print out wake locks in the if the wakelock was held." into ↵Jason Parks2010-07-201-7/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gingerbread
| | * | | | | Only print out wake locks in the if the wakelock was held.Jason Parks2010-07-201-7/+5
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Change-Id: I742121b70bd0e56ca2efe05fffa9fe3e4ad7b619
* | | | | | am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings ↵Dan Egnor2010-07-202-3/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp * commit '3c1363beec9c142c062d8704b8bef4230b42eae5': COMMENT ONLY change to add some warnings about ParcelFileDescriptor
| * | | | | am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ↵Dan Egnor2010-07-202-3/+21
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread * commit '2f0dc6d9f50ceece294e9db393583e655d3bf781': COMMENT ONLY change to add some warnings about ParcelFileDescriptor
| | * | | | Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor ↵Dan Egnor2010-07-202-3/+21
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | behavior with Parcel.writeValue()." into froyo
| | | * | | | COMMENT ONLY change to add some warnings about ParcelFileDescriptorDan Egnor2010-07-202-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | behavior with Parcel.writeValue(). Change-Id: If55fcce29559379855735ff5297cf4f46d5d6be6 Bug: 2847738
* | | | | | | am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" ↵Dan Egnor2010-07-201-147/+315
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp * commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a': COMMENT-ONLY change to clarify Camera documentation.
| * | | | | | resolved conflicts for merge of 9bc4039a to gingerbreadDan Egnor2010-07-201-147/+315
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
| | * | | | Merge "COMMENT-ONLY change to clarify Camera documentation." into froyoDan Egnor2010-07-191-140/+307
| | |\ \ \ \ | | | |/ / /
| | | * | | COMMENT-ONLY change to clarify Camera documentation.Dan Egnor2010-07-131-140/+307
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b75cfdfc34d1c16d93c02a32649022ce5505b11
* | | | | | merge from open-source masterThe Android Open Source Project2010-07-203-10/+14
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
| * | | | | Replaced /sdcard with Environment.getExternalStorageDirectory()Christian Mehlmauer2010-07-193-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id789f44a8569e307b1b7ab15eb266c9ce7ef2029
* | | | | | merge from open-source masterThe Android Open Source Project2010-07-201-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
| * | | | | typo fixedMadan Ankapura2010-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7cff39929ae53ce03409afadcae58548ec22cc8
* | | | | | am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" ↵Vasu Nori2010-07-191-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp * commit 'a5fe776a7933b2241858ef83f01b812c7badc231': fix javadoc error which breaks SDK build in gingerbread
| * | | | | Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbreadVasu Nori2010-07-191-1/+1
| |\ \ \ \ \
generated by cgit v1.1 at 2025-03-29 19:09:36 +0000