summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge "When in the Choose Account flow if the accounts list display was ↵Fred Quintana2011-11-161-1/+15
|\ | | | | | | initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display."
| * When in the Choose Account flow if the accounts list display was initiallyFred Quintana2011-11-151-1/+15
| | | | | | | | | | | | | | | | skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display. Bug: 5599693 Change-Id: I5075e86656e237dddcb5e1d76e432e1cf525ab79
* | am 4c0e0dd2: am 3e7497b4: Merge "Eliminate hw.keyboards system properties." ↵Jeff Brown2011-11-152-4/+21
|\ \ | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '4c0e0dd29dcce33e7521b11d01d21d9431f3b264': Eliminate hw.keyboards system properties.
| * \ Merge "Eliminate hw.keyboards system properties." into ics-mr1Jeff Brown2011-11-152-4/+21
| |\ \
| | * | Eliminate hw.keyboards system properties.Jeff Brown2011-11-152-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop using system properties to publish information about the key character map path. Instead, we can retrieve it on demand by asking the window manager. It was possible to exhaust the supply of system properties when repeatedly adding and removing input devices. Bug: 5532806 Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
* | | | am 7bc6600e: am 8a440477: Merge "Clean-up in TextView" into ics-mr1Gilles Debunne2011-11-151-28/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '7bc6600e60688ea37ee7f18b82cb16677c0f5e74': Clean-up in TextView
| * | | Merge "Clean-up in TextView" into ics-mr1Gilles Debunne2011-11-151-28/+3
| |\ \ \
| | * | | Clean-up in TextViewGilles Debunne2011-11-101-28/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some variables that are no longer needed after the removal of context menu in TextView. Change-Id: I6d98bb356bd7b409a5230756849aef0f2896d4c5
* | | | | am 6a622c56: am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" ↵John Reck2011-11-151-13/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '6a622c5608e3f67efb7ba6a346ea4d8cfa5267ec': Call onScrollChanged when scrolling layers
| * | | | Merge "Call onScrollChanged when scrolling layers" into ics-mr1John Reck2011-11-151-13/+15
| |\ \ \ \
| | * | | | Call onScrollChanged when scrolling layersJohn Reck2011-11-141-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5533389 Treat layer scrolling as a no-op scroll by calling onScrollChanged with old scroll == new scroll Change-Id: I1dc2b94b37c65bf088806b8d28be32883e3b8bee
* | | | | | am 4e1fed76: am b90a70d1: Merge "Improve camera face detection javadoc." ↵Wu-cheng Li2011-11-151-7/+36
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '4e1fed76c19cc9656af55e57dc57979324322593': Improve camera face detection javadoc.
| * | | | | Merge "Improve camera face detection javadoc." into ics-mr1Wu-cheng Li2011-11-151-7/+36
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Improve camera face detection javadoc.Wu-cheng Li2011-11-151-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:4460717 Change-Id: I6e040911ce802e597e77dfdde1c92b75d51975c8
* | | | | | am 642de92b: am 9058435d: Merge "Fix races when content providers are ↵Jeff Brown2011-11-151-134/+190
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acquired and released." into ics-mr1 * commit '642de92b3500446ab2d2a84fbe4ff9c083e8c1af': Fix races when content providers are acquired and released.
| * | | | | Fix races when content providers are acquired and released.Jeff Brown2011-11-141-134/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes race conditions that occur very regularly when content providers are accessed from multiple threads at the same time. When a content provider is not already in the application's cache, the application needs to ask the ActivityManager to obtain it. Meanwhile, another thread can come along and do the same thing. This can cause problems because the application attempts to install two copies of the provider and the reference counts and other bookkeeping can get muddled. Similarly, there are races between releasing the last reference to a content provider and acquiring the content provider. It's possible for one thread to snatch the content provider from the jaws of death. We need to handle this explicitly to ensure that the content provider does not accidentally get released right after it was acquired by the other thread. This change ensures that the reference count bookkeeping and provider map are maintained in parallel while holding the same lock. Previously because the lock was dropped and reacquired in the middle of acquisition and removal, it was possible for a content provider with a zero reference count to be returned to the application. Likewise, it was possible for a content provider with a non-zero reference count to be disposed! This change also performs compensatory actions when races are detected to ensure that the necessary invariants are maintained throughout. In particular, it ensures that the application drops a duplicate reference to a content provider when no longer needed. Another way to solve this problem would be to explicitly prevent the races from happening in the first place by maintaining a table of content providers that are in the process of being acquired. The first thread to attempt to acquire the provider would store a record. The next thread would find the record and block until the first thread was finished. I chose not to implement the code in that manner because we would still have needed to perform compensatory actions in the case where the same provider binder has multiple logical names. Also, it could cause deadlocks if the attempt to acquire a content provider were re-entrant for some bizarre reason. Bug: 5547357 Change-Id: I2ad39a8acc30aaf7ae5354decd0a0a41e9b9c3da
* | | | | | am f2213aca: am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" ↵Daisuke Miyakawa2011-11-151-0/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'f2213acaae5073ea3b4f3f566f0e8c7dc976765b': Allow ContactsProvider to remove dulicates
| * | | | | Merge "Allow ContactsProvider to remove dulicates" into ics-mr1Daisuke Miyakawa2011-11-141-0/+10
| |\ \ \ \ \
| | * | | | | Allow ContactsProvider to remove dulicatesDaisuke Miyakawa2011-11-141-0/+10
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 5484956 Change-Id: Ie88af0c3d21919ca201f4fcdd46ca09e9f8d94c0
* | | | | | am 621f9716: am 6066a2b4: Merge "Fix uncaught exception in ↵Adam Cohen2011-11-141-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1 * commit '621f971691e3e819ddcd95898f4f93498e00c2ad': Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
| * | | | | Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue ↵Adam Cohen2011-11-141-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 5613241)" into ics-mr1
| | * | | | | Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)Adam Cohen2011-11-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4646095f4cde9514425be8ab2dbf805d9788aa5c
* | | | | | | am 2cfb873c: am 9d66da8a: Merge "Revert "Discard framebuffer rendering ↵Dave Burke2011-11-145-41/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | queues when discarding layers"" into ics-mr1 * commit '2cfb873c9f0b56f2c7d694a21c968511223933af': Revert "Discard framebuffer rendering queues when discarding layers"
| * | | | | Revert "Discard framebuffer rendering queues when discarding layers"Dave Burke2011-11-145-41/+2
| | |/ / / | |/| | | | | | | | | | | | | This reverts commit da96f8ac2c1c35a54f3f36e6d776cb386a251d03.
* | | | | am a16ee939: am 28587497: Merge "Discard framebuffer rendering queues when ↵Mathias Agopian2011-11-145-2/+41
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | discarding layers Bug #5581817" into ics-mr1 * commit 'a16ee9390e1fcea8ff7cbefd253659c37f2999a3': Discard framebuffer rendering queues when discarding layers Bug #5581817
| * | | | Merge "Discard framebuffer rendering queues when discarding layers Bug ↵Mathias Agopian2011-11-145-2/+41
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | #5581817" into ics-mr1
| | * | | Discard framebuffer rendering queues when discarding layersRomain Guy2011-11-105-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #5581817 Change-Id: If612846ec5f7793710fc4df152791fb32c506551
* | | | | Fix buildKristian Monsen2011-11-142-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I8198f7a8470e7c9500ab2f6512162bbb55ea6ee7
* | | | | Merge "Removing the ability to get native instrumentation as part of nav dump"Kristian Monsen2011-11-142-22/+0
|\ \ \ \ \
| * | | | | Removing the ability to get native instrumentation as part of nav dumpKristian Monsen2011-11-112-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to be able to remove ANDROID_INSTRUMENTATION code. Note that it would only print useful information if webcore was compiled with ANDROID_INSTRUMENTATION on. There is an open bug for problems with ANDROID_INSTRUMENTATION: http://b/issue?id=2816327 Needs Browser CL: https://android-git.corp.google.com/g/#/c/149442 Change-Id: Ie8c3c3a08a8bb15936831e25faac3155906bae70
* | | | | | Merge "Added missing comments in Instrumentation#sendStringSync"Svetoslav Ganov2011-11-111-0/+5
|\ \ \ \ \ \
| * | | | | | Added missing comments in Instrumentation#sendStringSyncSvetoslav Ganov2011-11-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib20c5f9763c4ff97dec02fbb79721da93e964bc7
* | | | | | | Merge "Instrumentation sendStringSync(String) may try to inject obsolete ↵Svetoslav Ganov2011-11-111-9/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | events."
| * | | | | | Instrumentation sendStringSync(String) may try to inject obsolete events.Svetoslav Ganov2011-11-111-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyEvents returned by KeyCharacterMap.getEvents() have the same time stamp and the system rejects too old events. Hence, it is possible for an event to become stale before it is injected if it takes too long to inject the preceding ones. Now the time of the event is set just before injecting it. Change-Id: I72b60d261f8bda857b331d0f1b1bd97f9f15def3
* | | | | | | am 0fbd9eba: am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1Christopher Tate2011-11-111-3/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit '0fbd9ebab891530290b4d52fd5e81f6b4d7278d8': XML parsing optimizations
| * | | | | | XML parsing optimizationsChristopher Tate2011-11-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Traceview showed approximately 10% of total parse time inside the synthetic 'trampoline' methods generated to provide inner classes with access to their outer class's private fields. The bottleneck in this particular case is in XmlBlock and its inner class Parser. Making the bottlneck outer-class members and methods package-scope instead of private removes that 10% overhead being spent within these access trampolines. Traceview tends to overemphasize the significance of very small methods such as these trampolines. That said, the measured speed gain on the ParseLargeXmlResFg op due to this patch is between 5% and 6%. Change-Id: Ia0e3ae5408d1f9992b46e6e30dd2407090379b07
* | | | | | | Merge "Seems to break text views all over. Particularly noticeable is that ↵Jeff Brown2011-11-111-7/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | the labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character."
| * | | | | | | Seems to break text views all over. Particularly noticeable is that the ↵Jeff Brown2011-11-111-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character. Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" This reverts commit caa8c06de5f94db69faca35d666c04b82d3f420b
* | | | | | | | am 0b554bab: am d400d03f: Merge "Fix issue #5595933: GREF leak due to race ↵Dianne Hackborn2011-11-111-0/+7
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition in..." into ics-mr1 * commit '0b554bab585fe2d7eaaca8692106e0cbbc3aabe4': Fix issue #5595933: GREF leak due to race condition in...
| * | | | | | | Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1Dianne Hackborn2011-11-111-0/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Fix issue #5595933: GREF leak due to race condition in...Dianne Hackborn2011-11-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...LoadedApk.ServiceDispatcher.connected , LoadedApk.forgetServiceDispatcher Don't be stupid if we receive a new binding to a ServiceConnection after it has already been unbound. Change-Id: I85a49de97372bf9af55542a89031f0b7a2ac8fbb
* | | | | | | | | am 9acae658: am 847fbbea: Merge "Localized optimizations in views and ↵Christopher Tate2011-11-112-6/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmaps" into ics-mr1 * commit '9acae658e179796beee91d673f9f70af49ae3c9b': Localized optimizations in views and bitmaps
| * | | | | | | | Merge "Localized optimizations in views and bitmaps" into ics-mr1Christopher Tate2011-11-112-6/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Localized optimizations in views and bitmapsChristopher Tate2011-11-112-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't call context.getResources() redundantly when unnecessary; similarly for Resources.getCompatibilityInfo() * During bitmap creation, don't bother clearing to 0: it's unnecessary because now that the raw bits are stored in a VM-side byte array, it was cleared at initialization time. Also, don't use the sanity- checking public entry point to erase to a color, because we know that we're by definition in a "legal" path to erase to the initial contents and don't need to incur the overhead of the (inappropriate) sanity checking. Change-Id: Idaca4d64fdecefd5d51337646ead32e1db510e02
* | | | | | | | | | am 4780228f: am 48b651cb: Merge "Changes for access control." into ics-mr1Nick Pelly2011-11-114-32/+63
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4780228fb2476304e29ddf9a118c460ac4eb96ee': Changes for access control.
| * | | | | | | | | Merge "Changes for access control." into ics-mr1Nick Pelly2011-11-114-32/+63
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Changes for access control.Jeff Hamilton2011-11-114-32/+63
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The package name is now required when using the NFC extras APIs so the context is stored away and used to derive the package name to be sent to the NfcService. Bug: 4515759 Change-Id: I1a3aba3fc026e0090a914b0686fc4b8dec25b927
* | | | | | | | | | am 5a8ad071: am a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device ↵Matthew Xie2011-11-114-25/+47
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | profile for hfp and a2dp incoming connect" into ics-mr1 * commit '5a8ad0717dad332cab4b2d9f7a6030b76cb8d6bb': Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
| * | | | | | | | | Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp ↵Matthew Xie2011-11-114-25/+47
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incoming connect" into ics-mr1
| | * | | | | | | | | Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connectMatthew Xie2011-11-114-25/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send CONNECT_OTHER_PROFILE to Device profile for low priority hfp and a2dp incoming connect. In the case when HFP autoconnect is off but a2dp autoconnect is on, if HF autoconnect to HFP, phone will reject HFP but connect a2dp. Before this fix, phone reject HFP. A2dp will not get connected unless the HF do media auto-connect, which most carkits do not do. Also do similar change for incoming a2dp connection bug 5091838 Change-Id: Ife1815f527bcd94e0d9ffc645028484fa9c49a43
generated by cgit v1.1 at 2025-03-29 16:39:02 +0000