drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,377 Commits 1 Branch 0 Tags
Commit Graph

80377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
963a7307e9 Add JavaBridge test to ensure objects injected into child frames. 
Child frames should have also have any injected javascript interfaces
from the main frame. Add a test to verify this behavior.

Bug: 6640270

Change-Id: Ifca486e329333b642d8195391fb1829bbf9a684c
 2012-06-11 15:29:15 +01:00
Jean-Baptiste Queru
7d77977ffa Merge "Fix Force Close when enable airplane mode" 2012-06-11 07:27:05 -07:00
The Android Automerger
64fd4fb65a merge in jb-release history after reset to jb-dev 2012-06-11 07:02:43 -07:00
Athimoolam Ealumalai
44030b7864 Added support for customization of mobile data setting. 
Introduced system property "mobiledata", which will be
used for default behavior of the mobile data connection
either on/off.

This is analog to how the setting for "dataroaming" is
handeled.

Change-Id: Ifae8822dedfa55a515671014e2e29d43c469e701
 2012-06-11 15:20:34 +02:00
Mattias Petersson
8b4b63403a Avoid memory leak in the Shutdown confirmation dialog. 
How to reproduce:
1) Lock the screen.
2) Open the Phone options menu by long pressing the power
   button.
3) Tap "Power off" to display the confirmation dialog.
4) Repeat step 2 and 3 a few times (without closing the
   confirmation dialog.

Each time the confirmation dialog is displayed, a new
instance is created. A stack of confirmation dialogs are
created on the screen.

This is fixed by making sure the previous dialog is
dismissed before launching a new dialog.

Change-Id: I6b6c61ccc56364b66eed3528019f761e75bbe268
 2012-06-11 10:18:09 +02:00
Chet Haase
0163b175d3 am fdb67a4d: am 913bf804: Merge "Don\'t allow apps to request scrolls to out-of-bounds positions" into jb-dev 
* commit 'fdb67a4dda0da858eba2103f899250acf9a221e5':
  Don't allow apps to request scrolls to out-of-bounds positions
 2012-06-10 12:37:54 -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
cce365a505 am 2622a7cd: am b7726159: Merge "Crash in the touch explorer." into jb-dev 
* commit '2622a7cd6e923a88ffbdd1925a9112a7b141fb04':
  Crash in the touch explorer.
 2012-06-10 10:06:37 -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
a656414e94 am 3dbb70ec: am 86bbf705: Merge "Settings crash after enabling TalkBack accessibility." into jb-dev 
* commit '3dbb70ec9c593e11dd19efa528a99e9ec21d63e0':
  Settings crash after enabling TalkBack accessibility.
 2012-06-10 09:57:18 -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
8e4e795936 am a8e46828: am c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState method" 
* commit 'a8e46828bf463cf542885d7726310abeac915e0a':
  Fix dumpPowerState method
 2012-06-08 19:00:38 -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
c3672a4e19 am 2203fab2: am 2e6f9be5: Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev 
* commit '2203fab24966c80af5c37f0a58263218dbbcd610':
  Fix fake bold for fallback fonts in frameworks.
 2012-06-08 17:33:35 -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
cfa5102dd7 am 4bdf6272: (-s ours) am d9038fd5: Import translations. DO NOT MERGE 
* commit '4bdf62727ef2c7c815dc2a217b49ef147b4d3d7d':
  Import translations. DO NOT MERGE
 2012-06-08 16:46:35 -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
Jeff Brown
076f17375b Remove edge slop handling from ScaleGestureDetector. 
The edge slop code could violate invariants of ScaleGestureDetector,
such as the assumption that if an ACTION_POINTER_DOWN is observed
or if getPointerCount() >= 2, then there must be at least two
active pointers to choose from.  But due to the edge slop handling,
it was possible for findNewActiveIndex to return -1 in this
case, resulting in a crash.

Bug: 6613154
Change-Id: I4e08e38a49ab27dac1be9484e19de086bc43624a
 2012-06-08 16:40:01 -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
d208c1b8c9 am 3e751f1b: am 60c77212: am 2a393a99: Merge "MountService: unlink death notification when unregistering listeners" 
* commit '3e751f1b7bc9ae4c477b75290e59d7c3904f94dc':
  MountService: unlink death notification when unregistering listeners
 2012-06-08 15:41:41 -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
a1988efb14 am c95f249e: am 5ebf04cc: Merge "Bug 6605167: Turning off FUL during error counts as attempt" into jb-dev 
* commit 'c95f249ea98ae9281014e3a1dd5a64b9c38d73de':
  Bug 6605167: Turning off FUL during error counts as attempt
 2012-06-08 15:35:40 -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
Fabrice Di Meglio
a598720ad6 Make GridView widget aware of layout direction 
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: Id9ac26028c176e429a7f3ad76c0a428613e1afc8
 2012-06-08 15:22:20 -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
357dbbf53e am 4fe782d2: am 69e28c2f: (-s ours) am ce4de8d1: Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||" 
* commit '4fe782d2a247ca2c076996a2a4dbd10f13c3c56e':
  stagefright aacenc: Add parentheses in expression with mixed && and ||
 2012-06-08 14:43:28 -07:00
Marco Nelissen
92f4c7bc49 Merge "Bypass emulated storage for metadata extraction" 2012-06-08 14:40:09 -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
Marco Nelissen
c861411d4b Bypass emulated storage for metadata extraction 
b/6543148

Change-Id: Ic65957870199a2592ebe53b32517166f96e48ef2
 2012-06-08 14:22:56 -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
Colin Cross
241e702059 Merge "PowerManagerService: call surfaceflinger blank and unblank through binder" 2012-06-08 14:14:23 -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
da1446059d am 3a3c7e7b: am 63dd4c65: am 60b3d59d: Merge "Modify installd to set the SELinux security context on package directories." 
* commit '3a3c7e7bc4f599c35f5ed4feeead15c6c5a4621f':
  Modify installd to set the SELinux security context on package directories.
 2012-06-08 14:08:32 -07:00