Dianne Hackborn
5134d711d1
am 574352a7: am aa8cac86: Merge "frameworks/base: release references of UriPermissionOwner"
...
* commit '574352a796e6398ff4f2b7fb1e14ada035e9a47a':
frameworks/base: release references of UriPermissionOwner
2012-06-11 11:22:09 -07:00
Jean-Baptiste Queru
b8c6405fda
resolved conflicts for merge of cddaf4d5 to jb-dev-plus-aosp
...
Change-Id: I973d361a9599b32f9eaced0748d984900590ea3d
2012-06-11 11:01:19 -07:00
Dianne Hackborn
3857681e58
am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev
...
* commit 'a7e3a1e0e7d308e7e78a1992038a34485d04ab29':
Include important native processes in watchdog stacks.
2012-06-11 10:41:09 -07:00
Dianne Hackborn
a7e3a1e0e7
Merge "Include important native processes in watchdog stacks." into jb-dev
2012-06-11 10:37:51 -07:00
The Android Open Source Project
8f3523b020
Reconcile with jb-release
...
Change-Id: Iad375a456e4243fce9a4e651d1c831dc5bd69451
2012-06-11 09:20:57 -07:00
The Android Automerger
64fd4fb65a
merge in jb-release history after reset to jb-dev
2012-06-11 07:02:43 -07:00
Chet Haase
fdb67a4dda
am 913bf804: Merge "Don\'t allow apps to request scrolls to out-of-bounds positions" into jb-dev
...
* commit '913bf80416a81f2783376939e7ad0b956975b05c':
Don't allow apps to request scrolls to out-of-bounds positions
2012-06-10 12:33:19 -07:00
Chet Haase
913bf80416
Merge "Don't allow apps to request scrolls to out-of-bounds positions" into jb-dev
2012-06-10 12:30:33 -07:00
Svetoslav Ganov
2622a7cd6e
am b7726159: Merge "Crash in the touch explorer." into jb-dev
...
* commit 'b7726159e3ee29b45381ede8446c1e87fbbaa23a':
Crash in the touch explorer.
2012-06-10 10:02:40 -07:00
Svetoslav Ganov
b7726159e3
Merge "Crash in the touch explorer." into jb-dev
2012-06-10 09:59:24 -07:00
Svetoslav Ganov
3dbb70ec9c
am 86bbf705: Merge "Settings crash after enabling TalkBack accessibility." into jb-dev
...
* commit '86bbf70587602c1fd86fce1a2a4be78da45aaedc':
Settings crash after enabling TalkBack accessibility.
2012-06-10 09:53:17 -07:00
Svetoslav Ganov
86bbf70587
Merge "Settings crash after enabling TalkBack accessibility." into jb-dev
2012-06-10 09:50:24 -07:00
Dianne Hackborn
a8e46828bf
am c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState method"
...
* commit 'c99e6ee202ba9d895c96f034643fd39a035ea7f2':
Fix dumpPowerState method
2012-06-08 18:55:56 -07:00
Dianne Hackborn
574352a796
am aa8cac86: Merge "frameworks/base: release references of UriPermissionOwner"
...
* commit 'aa8cac86d8f41eaf89f9e78492db2dc5c3052e0c':
frameworks/base: release references of UriPermissionOwner
2012-06-08 18:51:18 -07:00
Dianne Hackborn
cddaf4d572
am 2d18c60a: Merge "Performance: Activity manager perf unnecessary recalc of oom_adj"
...
* commit '2d18c60a0b16c4abac54d373731f4b4afc74e283':
Performance: Activity manager perf unnecessary recalc of oom_adj
2012-06-08 18:51:14 -07:00
Dianne Hackborn
c99e6ee202
am c9aa32e9: Merge "Fix dumpPowerState method"
...
* commit 'c9aa32e93f39f84033e4ac812efec662a1f824ac':
Fix dumpPowerState method
2012-06-08 18:51:11 -07:00
Dianne Hackborn
aa8cac86d8
Merge "frameworks/base: release references of UriPermissionOwner"
2012-06-08 18:45:10 -07:00
Dianne Hackborn
2d18c60a0b
Merge "Performance: Activity manager perf unnecessary recalc of oom_adj"
2012-06-08 18:40:04 -07:00
Dianne Hackborn
f72467ad98
Include important native processes in watchdog stacks.
...
Helps us track down deadlocks involving native service processes.
Bug: 6615693
Change-Id: I580047550772e29586195a8cf440141574e3f40c
2012-06-08 18:36:48 -07:00
Dianne Hackborn
c9aa32e93f
Merge "Fix dumpPowerState method"
2012-06-08 18:33:48 -07:00
Svetoslav Ganov
e45c0b230b
Crash in the touch explorer.
...
1. The touch explorer was notified for accessibility events from
a binder thread which was poking the internal state of the
latter which by design is not tread safe. Since the touch
explorer is expected to be running only on the main thread
the accessibility manager service delivers the accessibility
events to the explorer on that thread.
bug:6635496
Change-Id: Ifdc5329e4be8e485d7f77f0fb472184494fa0d15
2012-06-08 17:49:52 -07:00
Victoria Lease
2203fab249
am 2e6f9be5: Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev
...
* commit '2e6f9be5633cf37223425b9b93c0b1512db091af':
Fix fake bold for fallback fonts in frameworks.
2012-06-08 17:29:56 -07:00
Victoria Lease
2e6f9be563
Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev
2012-06-08 17:27:28 -07:00
Eric Fischer
4bdf62727e
am d9038fd5: Import translations. DO NOT MERGE
...
* commit 'd9038fd5568522abea033f2b826823f197c2a970':
Import translations. DO NOT MERGE
2012-06-08 16:41:34 -07:00
Eric Fischer
d9038fd556
Import translations. DO NOT MERGE
...
Change-Id: I0edaecd41cef0eb158d003a3a0aafe28f49949f7
2012-06-08 16:31:51 -07:00
Svetoslav Ganov
ee33ad24cd
Settings crash after enabling TalkBack accessibility.
...
1. AccessibilityInput filter was not checking whether the touch
explorer instance is not null before passing it an accessibility
event. If the accessibility event is dispatched before the input
filter is installed but after it is created we runt into this
case.
2. Added a missing null check in accessibility node info.
bug:6635089
Change-Id: Ia389dc1f427427eb73794f6331ccb870e0b44c55
2012-06-08 16:09:36 -07:00
Brian Colonna
d86c24745c
Bug 6605167: Turning off FUL during error counts as attempt
...
If FUL was turned off while the error message was displayed it would
not count as a failed attempt. This commit changes the
reportFailedAttempt callback to just report the failure rather than
report the failure and close. This allows the FUL service to send the
reportFailedAttempt message earlier and then later close using the
existing cancel function, which closes without reporting a failed
attempt.
Change-Id: Ib3b76f477a98b149fcccc32ac39ecaeccd88a7e2
2012-06-08 15:52:01 -07:00
Jean-Baptiste Queru
3e751f1b7b
am 60c77212: am 2a393a99: Merge "MountService: unlink death notification when unregistering listeners"
...
* commit '60c7721210d327a464fdc95dbbe504e8eb10525c':
MountService: unlink death notification when unregistering listeners
2012-06-08 15:36:41 -07:00
Brian Colonna
c95f249ea9
am 5ebf04cc: Merge "Bug 6605167: Turning off FUL during error counts as attempt" into jb-dev
...
* commit '5ebf04cce420ca8f32270245189c4d71f28cfd27':
Bug 6605167: Turning off FUL during error counts as attempt
2012-06-08 15:30:47 -07:00
Jean-Baptiste Queru
60c7721210
am 2a393a99: Merge "MountService: unlink death notification when unregistering listeners"
...
* commit '2a393a99dc9612516dd9efbf74b6b5924d7d608a':
MountService: unlink death notification when unregistering listeners
2012-06-08 15:28:39 -07:00
Chet Haase
0061e16e53
Don't allow apps to request scrolls to out-of-bounds positions
...
An app was requesting smooth scrolling to a view position beyond the
number of items in the list. This caused our setup logic to execute on
every frame, waiting for the target view to be added.
This fix clamps the requested target position to the number of items
actually in the list.
Issue #6572175 Messaging: Sometimes conversation doesn't scroll when focus is brought to the compose field
Change-Id: I23707aeb213e67af4297713a03c2f5b446c8e2b6
2012-06-08 15:01:56 -07:00
Brian Colonna
5ebf04cce4
Merge "Bug 6605167: Turning off FUL during error counts as attempt" into jb-dev
2012-06-08 14:45:11 -07:00
Jean-Baptiste Queru
4fe782d2a2
am 69e28c2f: (-s ours) am ce4de8d1: Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||"
...
* commit '69e28c2ff7b46a05bf5b60cae59dbaf86ad2ad7f':
stagefright aacenc: Add parentheses in expression with mixed && and ||
2012-06-08 14:34:28 -07:00
Jean-Baptiste Queru
2a393a99dc
Merge "MountService: unlink death notification when unregistering listeners"
2012-06-08 14:30:52 -07:00
Jean-Baptiste Queru
69e28c2ff7
am ce4de8d1: Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||"
...
* commit 'ce4de8d141386ade1f184aa1b56fff7d3097dc3f':
stagefright aacenc: Add parentheses in expression with mixed && and ||
2012-06-08 14:19:17 -07:00
Jean-Baptiste Queru
ce4de8d141
Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||"
2012-06-08 14:10:11 -07:00
Kenny Root
3a3c7e7bc4
am 63dd4c65: am 60b3d59d: Merge "Modify installd to set the SELinux security context on package directories."
...
* commit '63dd4c65c41187967ba0828d386117f90020840e':
Modify installd to set the SELinux security context on package directories.
2012-06-08 14:01:54 -07:00
Kenny Root
d26f7139a7
Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp
2012-06-08 13:59:21 -07:00
Victoria Lease
b26fa0ce68
Fix fake bold for fallback fonts in frameworks.
...
This change is analogous to Ic0e9f1bbd8cae9fdd3a6d1d015bb9224c8be545c
in WebView, and depends upon the same Skia change that that CL makes
use of.
This flips the "fake bold" flag on for bold fonts in
TextView.setTypeface(), with the expectation that Skia will ignore
the flag if the final typeface used to render the glyphs is already
bold. It also does the same for StyleSpans, TextAppearanceSpans,
TypefaceSpans, and the Switch widget.
With this, fake bold should work uniformly across all scripts - if
fake bold works for a primary typeface, it should also work for all
fallback typefaces.
Bug: 6629786
Change-Id: Id3b8639ab0df83052ffd82809cb12adaacc1d46b
2012-06-08 13:52:17 -07:00
Irfan Sheriff
efcc0ca754
am 4206ee2b: Merge "Fix clear services API" into jb-dev
...
* commit '4206ee2b680fb2c273c03efc9083e327c7051121':
Fix clear services API
2012-06-08 13:48:14 -07:00
Kenny Root
e38b1c4d15
resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp
...
Change-Id: I012bd3b5946dedba3439285caa93739d44ebc60f
2012-06-08 13:47:46 -07:00
Irfan Sheriff
4206ee2b68
Merge "Fix clear services API" into jb-dev
2012-06-08 13:45:19 -07:00
Daniel Sandler
4dc0cf7bf3
am 6cf0c336: Merge "Various notification template cleanups." into jb-dev
...
* commit '6cf0c3365a40854f63f0abff2fa67d24432d0218':
Various notification template cleanups.
2012-06-08 13:40:05 -07:00
Daniel Sandler
6cf0c3365a
Merge "Various notification template cleanups." into jb-dev
2012-06-08 13:38:02 -07:00
Craig Mautner
af2ab39aba
am 78fc35bd: Merge "Hide wallpaper when wallpaper target gets hidden." into jb-dev
...
* commit '78fc35bde452c2fea18ecf9d8aeedee6d82ba1eb':
Hide wallpaper when wallpaper target gets hidden.
2012-06-08 13:18:13 -07:00
Craig Mautner
78fc35bde4
Merge "Hide wallpaper when wallpaper target gets hidden." into jb-dev
2012-06-08 13:14:54 -07:00
Kenny Root
63dd4c65c4
am 60b3d59d: Merge "Modify installd to set the SELinux security context on package directories."
...
* commit '60b3d59d7f788046a45a5fd4e97ec7235fb55787':
Modify installd to set the SELinux security context on package directories.
2012-06-08 13:09:15 -07:00
Kenny Root
9855f6e210
am 7b2d0563: Merge "Add JNI bindings for some of the libselinux interfaces."
...
* commit '7b2d056342176b5e7ff19842fc9202f2f8d36b76':
Add JNI bindings for some of the libselinux interfaces.
2012-06-08 13:09:12 -07:00
Craig Mautner
ff92f04e76
Hide wallpaper when wallpaper target gets hidden.
...
Another location that potentially hides the wallpaper target while
leaving the wallpaper itself still visible. Causes the wallpaper to
show up when upper surfaces are transparent all the way down.
Fixes bug b6621986.
Change-Id: If75053160f041eb78868eda36b7820fb2110d069
2012-06-08 12:56:14 -07:00
Craig Mautner
1189f855e6
am 7f786b8f: Merge "Do not animate keyboard and button brightness." into jb-dev
...
* commit '7f786b8fa20619dcd69324c521cb59242a8f2944':
Do not animate keyboard and button brightness.
2012-06-08 12:49:57 -07:00