summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am d592714d: am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1Fred Chung2011-11-172-0/+10
|\ | | | | | | | | * commit 'd592714d9a48afce69d6904fc539f150b7c02898': Bluetooth HDP sample.
| * am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1Fred Chung2011-11-162-0/+10
| |\ | | | | | | | | | | | | * commit '15fe377c7cb57c4d758edcfc1d1e53bcf5a0a8bc': Bluetooth HDP sample.
| | * Merge "Bluetooth HDP sample." into ics-mr1Fred Chung2011-11-162-0/+10
| | |\
| | | * Bluetooth HDP sample.Fred Chung2011-11-142-0/+10
| | | | | | | | | | | | | | | | Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
* | | | am 4dce941e: am 816e68e2: No-op merge from ics-mr0The Android Open Source Project2011-11-170-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '4dce941ecec71aa999cf777a43f05821793b6749':
| * | | am 816e68e2: No-op merge from ics-mr0The Android Open Source Project2011-11-160-0/+0
| |\ \ \ | | |/ / | | | | | | | | * commit '816e68e2fddd56c34f864dc5647801117a51720b':
| | * | No-op merge from ics-mr0The Android Open Source Project2011-11-160-0/+0
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
| | | * \ Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
* | | | \ \ Merge "Not showing facelock when plugging/unplugging fixes 5438524"Steven Ross2011-11-161-3/+15
|\ \ \ \ \ \
| * | | | | | Not showing facelock when plugging/unplugging fixes 5438524Steven Ross2011-11-161-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will close down or prevent the start of FaceUnlock if the device is plugged in or unplugged, unless FaceUnlock is currently active. Change-Id: I216831964472da47fb24644070d1717dffe1b7f7
* | | | | | | Merge "Bug 4903178 Restore priority and cgroup on stop"Glenn Kasten2011-11-164-12/+28
|\ \ \ \ \ \ \
| * | | | | | | Bug 4903178 Restore priority and cgroup on stopGlenn Kasten2011-11-164-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On AudioTrack and AudioRecord stop or failed start, restore the priority and cgroup of the caller to their previous values, rather than forcing to NORMAL. Dependent on new thread APIs. Also fixes bug where priority was set to AUDIO but cgroup not set. Change-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8
* | | | | | | | 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
* | | | | | | | Merge "Expand RS vector3 types to vector4."Alex Sakhartchouk2011-11-169-24/+176
|\ \ \ \ \ \ \ \
| * | | | | | | | Expand RS vector3 types to vector4.Alex Sakhartchouk2011-11-159-24/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=5609007 The underlying LLVM implementation for vector3 types does this implicitly. If RS does not adjust its implementation, we will always be misaligned for any subsequent data after a vector3 type. We previously inserted padding into the reflected layers from llvm-rs-cc (hence the skip padding part of this change). We can safely ignore the padding now that the Java/native code is updated to use the expanded size. The compiler will also need modification to ensure that we don't mistakenly skip over any end-of-struct padding. Fixing the 3 component vector padding problem. Change-Id: If68af42287deb8f4b28addcd19a9fa314656be44
* | | | | | | | | am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ↵The Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-factoryrom-2-release * commit 'c172688d5e9a1d26e2792297939cbb7bd93acaf2': Fix bug in TextLayoutCacheKey handling embedded nulls. DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
| * | | | | | | | am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c7403258528a08ab74f7c29277d0c34ba6edc53d': Fix bug in TextLayoutCacheKey handling embedded nulls. DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
| | | | | | | | |
| | | \ \ \ \ \ \
| | *-. \ \ \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
| | | | * | | | | | Fix bug in TextLayoutCacheKey handling embedded nulls.Jeff Brown2011-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were not passing the length of the UTF-16 string to String16::setTo. As a result, it was copying the contents of the text up to the first null it found. First problem, these strings are not typically null terminated! Second problem, if the string contained a null character, then we might truncate it. However, we only truncated the string when the copy constructor was invoked (say, when we called get() on the cache) but not in internalTextCopy() (before adding the key to the cache). As a result of the second problem, we would first search the cache for a key that matched a partially copied truncated string (potentially reading uninitialized memory that followed it). Finding none, we would add the entry to the cache using the correct key. If the cache already had a value associated with the correct key, then the put would fail, returning false. Charging ever onwards, we would add the size of the entry to the cache size. Proceeding in this manner, it was possible for the cache to believe it had less remaining space than it really did. At that point, it was possible for the cache to evict all entries and yet still not think it had room to add a new one, so it would continue trying to make space indefinitely. Bug: 5576812 Change-Id: I05251594f6b2da0a5dc09f7200f04fe9100ec766
| | | * | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-150-0/+0
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | | * | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-140-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-130-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open anAdam Powell2011-11-112-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow menu under invalid circumstances. Change-Id: Ifb847b914b880ffb21dd5fc6efa833f46466f224
| | | | | | * | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-110-0/+0
| | | | | | |\ \ \ \ \ \
* | | | | | | \ \ \ \ \ \ Merge changes I2c304952,Ic04bbd69,Ibbac2268Steve Block2011-11-162-15/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Update Java Bridge test for coercing JavaScript String to Java char in an array Add tests for multidimensional arrays in WebView's Java Bridge Fix tests for methods returning arrays in WebView's Java Bridge
| * | | | | | | | | | | | | Update Java Bridge test for coercing JavaScript String to Java char in an arraySteve Block2011-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/150052 Bug: 5619677 Change-Id: I2c3049529312b38bd3731dfc79b14edcb8cd6357
| * | | | | | | | | | | | | Add tests for multidimensional arrays in WebView's Java BridgeSteve Block2011-11-161-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a test for objects with a non-numeric length property being passed to a method expecting an array. Change-Id: Ic04bbd691c55744472cab9fb732e504997c62434
| * | | | | | | | | | | | | Fix tests for methods returning arrays in WebView's Java BridgeSteve Block2011-11-161-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibbac2268307fbfcff09a2d3b0f841ce420edc416
* | | | | | | | | | | | | | Merge "Add tests for invalid and static methods in the WebView's Java Bridge"Steve Block2011-11-161-14/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add tests for invalid and static methods in the WebView's Java BridgeSteve Block2011-11-141-14/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I18dacf4a4de8c787e46ea2781f5a365372a0a7da
* | | | | | | | | | | | | am 0f2dec50: am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for ↵Jake Hamby2011-11-153-11/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7-bit national language tables." into ics-mr0 * commit '0f2dec5033919fab77a2b52bb3cf33cf4975f2c9': Fix 3GPP SMS send failure for 7-bit national language tables.
| * | | | | | | | | | | | am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit ↵Jake Hamby2011-11-153-11/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | national language tables." into ics-mr0 * commit 'bd7836846c1e5d3610ba6c26686674d429a4316c': Fix 3GPP SMS send failure for 7-bit national language tables.
| | * | | | | | | | | | | am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language ↵Jake Hamby2011-11-153-11/+52
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tables." into ics-mr0 * commit '7d4046e9b7b95e1d5de12a54109b44d8305a6fdc': Fix 3GPP SMS send failure for 7-bit national language tables.
| | | * | | | | | | | | | Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ↵Jake Hamby2011-11-153-11/+52
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr0
| | | | * | | | | | | | | | Fix 3GPP SMS send failure for 7-bit national language tables.Jake Hamby2011-11-143-11/+52
| | | | | |/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a NullPointerException when sending a single-part SMS containing characters in one of the enabled national language tables. Also added a few log messages for several error cases to help with debugging any future problems in the SMS dispatcher. Bug: 5553544 Change-Id: I61c1cbe297b2e222027f0db7c833df6a03c2974a
* | | | | | | | | | | | | am df1aba0a: am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code ↵Bill Gruber2011-11-151-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snippet Bug 5221766" into ics-mr0 * commit 'df1aba0a9d25a0f9d38593d369ba963dfcd45866': IAB Doc Fix: Error in code snippet Bug 5221766
| * | | | | | | | | | | | am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug ↵Bill Gruber2011-11-151-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5221766" into ics-mr0 * commit 'c7b354810e9caebe1d4c79d8a2e756f3c194e68f': IAB Doc Fix: Error in code snippet Bug 5221766
| | * | | | | | | | | | | am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0Bill Gruber2011-11-151-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b': IAB Doc Fix: Error in code snippet Bug 5221766
| | | * | | | | | | | | | Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0Bill Gruber2011-11-151-5/+5
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | IAB Doc Fix: Error in code snippetBill Gruber2011-11-151-5/+5
| | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5221766 Change-Id: I7af624ed69526b545c97d1419e08f60c92b79d8e
* | | | | | | | | | | | | am 7456cf0a: am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best ↵Adrian Ludwig2011-11-152-0/+776
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Practices" to the html docs." into ics-mr0 * commit '7456cf0a125b47860a43d9915bae69b5ef374703': Adding new "Security Best Practices" to the html docs.
| * | | | | | | | | | | | am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the ↵Adrian Ludwig2011-11-152-0/+776
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | html docs." into ics-mr0 * commit 'cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b': Adding new "Security Best Practices" to the html docs.
| | * | | | | | | | | | | am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." ↵Adrian Ludwig2011-11-152-0/+776
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '0fd69ff4b9311c6b5406b769d50c9aa22787b816': Adding new "Security Best Practices" to the html docs.
| | | * | | | | | | | | | Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0Adrian Ludwig2011-11-152-0/+776
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Adding new "Security Best Practices" to the html docs.Adrian Ludwig2011-11-082-0/+776
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iada088b23c4709e9c9212f41724f99f4e0fa393e
* | | | | | | | | | | | | am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called ↵James Dong2011-11-152-9/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with onPause() and onStop() for media objects" into ics-mr1 * commit '4e72e2bfc24afe053ca98c6de2591a4057cfd9fa': Document that release() should be called with onPause() and onStop() for media objects
| * | | | | | | | | | | | am 4fdc36e6: Merge "Document that release() should be called with onPause() ↵James Dong2011-11-152-9/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and onStop() for media objects" into ics-mr1 * commit '4fdc36e6d6003cdce911678f0b233697554f8dbf': Document that release() should be called with onPause() and onStop() for media objects
| | * | | | | | | | | | | Merge "Document that release() should be called with onPause() and onStop() ↵James Dong2011-11-152-9/+28
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for media objects" into ics-mr1
| | | * | | | | | | | | | | Document that release() should be called with onPause() and onStop() for ↵James Dong2011-11-152-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | media objects Change-Id: I12dd734b4314df4f0573ad56a1714348e50da05e related-to-bug: 5616833
generated by cgit v1.1 at 2025-08-05 03:58:58 +0000