Commit Graph

25248 Commits

Author SHA1 Message Date
Dianne Hackborn
6892f1ec96 am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev
* commit '0f6471ace77387560988964ed0679f843bba6f1f':
  Fix issue #6641368: can't launch gallery
2012-06-12 12:41:36 -07:00
Chia-chi Yeh
a2becffcf2 am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev
* commit 'd667aebfb34085960e2b41a2f52d10ae749ec44c':
  VPN: move VpnDialogs away from system uid.
2012-06-12 12:41:12 -07:00
Jeff Brown
f195b80c2b resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp
Change-Id: I1426b282bb4c392b0a5bcb96760c04f215a26b4e
2012-06-12 11:10:26 -07:00
Dianne Hackborn
acfb11b7c4 am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit '2e479fefbfcb388d2aa62978307420357f322441':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:36:49 -07:00
Dianne Hackborn
82b131f274 am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:36:42 -07:00
Dianne Hackborn
2e479fefbf am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:32:26 -07:00
Dianne Hackborn
f6e39b068d am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit 'a03696dc6b8128bd44dc700b62ef9b5fd3ac4534':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:32:20 -07:00
Dianne Hackborn
bb53609666 Merge "Improved documentation (clarify on issue 8727)" 2012-06-11 16:01:38 -07:00
Dianne Hackborn
a03696dc6b Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 2012-06-11 15:58:22 -07:00
Dianne Hackborn
0f6471ace7 Merge "Fix issue #6641368: can't launch gallery" into jb-dev 2012-06-11 13:09:22 -07:00
Dianne Hackborn
2bd8d0403b Fix issue #6641368: can't launch gallery
This is a revert of 1db36528b1,
but with comments added so I don't make this mistake again. :)

Change-Id: I053216279e3721f08f32f561bb989736ef619f82
2012-06-11 12:27:05 -07:00
Jean-Baptiste Queru
80d21f2f83 am 19703b13: Merge "Avoid memory leak in the Shutdown confirmation dialog."
* commit '19703b13a6201812ebcf73904feb700aeb1afb45':
  Avoid memory leak in the Shutdown confirmation dialog.
2012-06-11 12:03:32 -07:00
Chia-chi Yeh
d667aebfb3 Merge "VPN: move VpnDialogs away from system uid." into jb-dev 2012-06-11 11:49:46 -07:00
Jeff Brown
926a5c507b Merge "Remove edge slop handling from ScaleGestureDetector." into jb-dev 2012-06-11 11:46:42 -07:00
Jean-Baptiste Queru
19703b13a6 Merge "Avoid memory leak in the Shutdown confirmation dialog." 2012-06-11 11:21:58 -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
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
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
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
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
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
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
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
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
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
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
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
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
Chia-chi Yeh
dadc857d9d VPN: move VpnDialogs away from system uid.
Bug: 6632536
Change-Id: Iece647c077caf5298ccfe7d7aba5f0911a4ed0d1
2012-06-08 13:05:58 -07:00
Kenny Root
7b2d056342 Merge "Add JNI bindings for some of the libselinux interfaces." 2012-06-08 12:25:07 -07:00
Dianne Hackborn
33e39aefdf am 0876ab0a: Merge "Fix issue #6295373: "Package com.google.android.apps.authenticator2 has..." into jb-dev
* commit '0876ab0ac17518c479e9dffe025884870a586d9c':
  Fix issue #6295373: "Package com.google.android.apps.authenticator2 has...
2012-06-08 11:04:13 -07:00
Dianne Hackborn
0876ab0ac1 Merge "Fix issue #6295373: "Package com.google.android.apps.authenticator2 has..." into jb-dev 2012-06-08 11:01:42 -07:00
Kenny Root
f549099705 am af95137a: Merge "Whoops, this version number wasn\'t updated when JB was introduced!" into jb-dev
* commit 'af95137a9f48710d8356c5f33334b9ce60f2fb68':
  Whoops, this version number wasn't updated when JB was introduced!
2012-06-08 09:53:49 -07:00
Kenny Root
af95137a9f Merge "Whoops, this version number wasn't updated when JB was introduced!" into jb-dev 2012-06-08 09:51:04 -07:00
Daniel Sandler
619738c9e7 Various notification template cleanups.
Bug: 6597693 // hide line3 in InboxStyle
Bug: 6593691 // vertical centering inconsistencies
Bug: 6592116 // no left action gutter in BigPicture
Bug: 6622757 // missing subtext in BigText expanded
Change-Id: I941af99d0a905b6e0aa6fb74ad4eff29c17d9fc2
2012-06-08 11:41:37 -04:00
Dianne Hackborn
1db36528b1 Whoops, this version number wasn't updated when JB was introduced!
Change-Id: I9c9cd658cc1cba99b84059c8873c22b21b9f3c19
2012-06-07 18:20:55 -07:00
Dianne Hackborn
d0c5f515c0 Fix issue #6295373: "Package com.google.android.apps.authenticator2 has...
...mismatched uid: X on disk, Y in settings" errors on Froyo and Gingerbread

Deal more gracefully with the uid changing in three ways:

1. If the uid on disk has become root, then have installd change it to
   the application's uid.  This is to correct a potential case where
   installd was interrupted while linking or unlinking the libs dir,
   during which it temporarily changes the owner of the dir to root
   so that a malicious app can not get in its way.  So if the uid on
   disk has become root, we assume we can safely just change it back
   to the correct uid.

2. When scaning packages at boot, use the same "delete and rebuild data
   directory" code for third party applications as we have for system
   applications.  This allows us to at least end up in a state where the
   app will run, even if its data is lost.

3. But we really don't want to get in to case 2, so if an application
   update is being installed and we find that the uid we now have for
   the app is different than the one on disk, fail the update.  This will
   protect against for example a developer changing the sharedUserId of
   their app and getting into this bad state.

Bug: 6295373
Change-Id: Ic802fdd818ac62449ff3c61d1fff1aa4d4942f39
2012-06-07 16:57:57 -07:00
John Reck
b47601279f am 839fd414: Merge "Eliminate gap between finalize() and destroy()" into jb-dev
* commit '839fd4144e369a9bde4fff4a5a2b6cc9e078cef8':
  Eliminate gap between finalize() and destroy()
2012-06-07 16:34:34 -07:00
John Reck
13b9d28268 am 0e0ce11e: Merge "Stay in layer scroll if nothing to scroll" into jb-dev
* commit '0e0ce11e57a9506ad4429269732f3b7144875a84':
  Stay in layer scroll if nothing to scroll
2012-06-07 16:34:30 -07:00
John Reck
839fd4144e Merge "Eliminate gap between finalize() and destroy()" into jb-dev 2012-06-07 15:57:56 -07:00
John Reck
0e0ce11e57 Merge "Stay in layer scroll if nothing to scroll" into jb-dev 2012-06-07 15:29:46 -07:00
John Reck
919c89e204 Stay in layer scroll if nothing to scroll
Bug: 6628376
 The issue here is that contentX & contentY can both be 0 if we are scrolling
 slowly enough as they are adjusted by the page's scale and can thus round down.
 However, this would result in us falling out of layer drag mode even though
 we haven't tried to scroll past the edge of the layer. Detect this case, and
 stay in layer scroll mode.

Change-Id: I3c655d0d03e8f89887abbe718bd24699c133ee1a
2012-06-07 14:45:34 -07:00
Gilles Debunne
11c15cfb4e am 78c6aeef: Merge "Fixed cast exception with selectable text." into jb-dev
* commit '78c6aeeffac7b665a0e1d822e88c92ef2b5ef353':
  Fixed cast exception with selectable text.
2012-06-07 14:18:44 -07:00
Gilles Debunne
78c6aeeffa Merge "Fixed cast exception with selectable text." into jb-dev 2012-06-07 14:15:40 -07:00