34171 Commits

Author SHA1 Message Date
Svetoslav Ganov
e136a72810 Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev 2012-09-14 11:37:15 -07:00
Svetoslav Ganov
b8c50e8e44 Text layout in switch may be null when accessibility events are fired.
1. The layout containing the text of a Switch is initialized on measure
   and if an accessibility event is fired before that then a NPE happens.

bug:7169419

Change-Id: Iee3c01ca9157d14d228c4ff33c0810507e0e25a7
2012-09-14 11:36:29 -07:00
Christopher Tate
0dbc410800 Merge "Fix Settings writes to a different user" into jb-mr1-dev 2012-09-14 11:35:19 -07:00
Jeff Brown
2dc6af2082 Merge "Fixup a comment." into jb-mr1-dev 2012-09-14 00:01:06 -07:00
Jeff Brown
565f0425ba Fixup a comment.
Change-Id: I7b73f7e0f0aa903e5cd02d1cdb678e65a6d40e0c
2012-09-14 00:00:17 -07:00
Romain Guy
51d71003e4 Merge "Prevent crash when invalidating all Views Bug #7165793" into jb-mr1-dev 2012-09-13 22:53:13 -07:00
Romain Guy
f84208faf8 Prevent crash when invalidating all Views
Bug #7165793

A ViewRootImpl's root view can be null. Check for this condition to
prevent an NPE invalidateWorld(). Other messages perform a similar
check to properly handle the case where mView == null.

Change-Id: I5bcfc41c48a469d38b21be74df2f6c715b0f9352
2012-09-13 22:50:18 -07:00
Baligh Uddin
cd6e7e1b5c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-13 21:58:41 -07:00
Christopher Tate
78d2a66ac1 Fix Settings writes to a different user
Oops.  Stacked bugs:  first, the desired user handle was not properly
being passed from the call() entry point to the database operations;
then on top of that, the client-side cache management was still
looking in the local user's cache for the data, so a request to read
a different user's settings would return the local user's instead if
that key was already known to the local user's cache.

Reads and writes of a different user's settings are now uncached,
so they're relatively much slower.  They're rare, however, so this
is not something to worry about unless we encounter a real world
case where it's a significant factor.

This CL also adds a bit of cross-user settings read/write testing
to the existing provider suite.  These new tests caught both the
known wrong-user-write bug and discovered the client-side cache
bug, so yay.

Finally, the existing wholesale mutual-exclusion approach would
deadlock in certain circumstances due to the fact that the
settings database creation code might have to call out to the
Package Manager while populating the bookmark/shortcut table,
and the Package Manager would then call back into the settings
provider in the course of handling that request.  The synchronization
regime has been significantly tightened up now: now the database
code [which is known to deal with concurrency itself] is allowed
to cope with multiple parallel openers of the same db; this
allows the settings provider to avoid calling out to other parts
of the system even implicitly while its internal lock is held.

Change-Id: Ib77d445b4a2ec658cc5c210830f6977c981f87ed
2012-09-13 19:15:54 -07:00
Svetoslav Ganov
33aef98fd2 Allowing association between a view and its label for accessibility.
1. For accessibility purposes it is important to be able to associate
   a view with content with a view that labels it. For example, if
   an accessibility service knows that a TextView is associated with
   an EditText, it can provide much richer feedback.

   This change adds APIs for setting a view to be the label for another
   one and setting the label for a view, i.e. the reverse association.

bug:5016937

Change-Id: I7b837265c5ed9302e3ce352396dc6e88413038b5
2012-09-13 18:41:40 -07:00
Alan Viverette
0f7551341f Revert "Add accessibility scroll actions to TabWidget"
This reverts commit 6053088884171f67e2df253576eab116fd05b4fe

Change-Id: Ia648d7e3e092c396a038740d708de37fe4169d80
2012-09-13 18:36:06 -07:00
Adam Powell
83835b17f2 Merge "Break flings with opposing velocities" into jb-mr1-dev 2012-09-13 16:45:24 -07:00
Adam Powell
cd66359ab9 Break flings with opposing velocities
Change-Id: Iafab692997ad7c2cbbf02d786a716e6edb6475a7
2012-09-13 16:28:29 -07:00
Jeff Brown
cdfc56a387 Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev 2012-09-13 15:34:51 -07:00
Svetoslav Ganov
83cdb021eb Merge "Add accessibility scroll actions to TabWidget" into jb-mr1-dev 2012-09-13 15:04:03 -07:00
Kenny Root
24271a8c4c Merge "Use shared app gid for forward-locked processes" into jb-mr1-dev 2012-09-13 14:43:20 -07:00
alanv
6053088884 Add accessibility scroll actions to TabWidget
Bug: 6537369
Change-Id: I8a5bf1d6f85f0ceef316aa4a5938d32a545587db
2012-09-13 14:02:29 -07:00
Craig Mautner
dcd8c81bf4 Merge "Propagate systemUiVisibility changes to window manager" into jb-mr1-dev 2012-09-13 13:55:51 -07:00
Craig Mautner
7eac0f557c Propagate systemUiVisibility changes to window manager
The mAttachInfo.mSystemUiVisibility value was changing in
View.dispatchAttachedToWindow but
mAttachInfo.mRecomputeGlobalAttributes was not being set.
Consequently ViewRootImpl.collectViewAttributes was returning
without updating the subtreeSystemUiVisibility. This is fixed
by calling needGlobalAttributesUpdate in dispatchAttachedToWindow.

WIthin ViewRootImpl.collectViewAttributes the assignment to
subtreeSystemUiVisibility was only being made if
mAttachInfo.mSystemUiVisibility was changed within
collectViewAttributes. But mAttachInfo.mSystemUiVisibility
was changing outside of collectViewAttributes in
dispatchAttachedToWindow. Consequently subtreeSystemUiVisibility
was never updated. By looking for a mismatch between
subtreeSystemUiVisibility and mSystemUiVisibility
subtreeSystemUiVisibility gets assigned whenever it is out of
sync.

Fixes bug 7091817.

Change-Id: I1e97a7dec14dc9594876175ae26370fb9030a8a6
2012-09-13 13:14:14 -07:00
Baligh Uddin
cf6fa9f070 Import translations. DO NOT MERGE
Change-Id: Ibc972f1a4f6689c335727a2115aaed3e47d7b339
Auto-generated-cl: translation import
2012-09-13 11:49:24 -07:00
Jeff Brown
c5df37c285 Add preliminary API for reporting display capabilities.
Change-Id: Ie18dce5b5d130f9a7cdfca08cddbf9b099312277
2012-09-13 11:45:07 -07:00
Eino-Ville Talvala
f353f948a5 Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev 2012-09-13 11:15:15 -07:00
Geremy Condra
f60921d921 Merge changes I69689a73,Iaaef6d41,I7e3cb47a,I42307f58 into jb-mr1-dev
* changes:
  DO NOT MERGE Push event logging down into libcore.EventLogger
  DO NOT MERGE Added event logging for config installation failures.
  DO NOT MERGE Create intermediate directories when installing config data.
  DO NOT MERGE Add components for the Android Config Updater to system server.
2012-09-13 10:42:22 -07:00
Dianne Hackborn
e00138285f Merge "Bring back new permission organization." into jb-mr1-dev 2012-09-13 10:40:55 -07:00
Jeff Sharkey
cae22d83a7 Merge "Give DefaultContainerService all external storage." into jb-mr1-dev 2012-09-13 01:31:04 -07:00
Jeff Sharkey
dfa45309e0 Give DefaultContainerService all external storage.
Now we can bind to just one instance of DCS, instead of requiring
one-per-user. This also means we can operate on otherwise-stopped
users.

Bug: 7003520
Change-Id: I4881e064ae8942907f6a02c6b868926223455cdc
2012-09-13 01:04:15 -07:00
Dianne Hackborn
cd403fc031 Bring back new permission organization.
Change-Id: I83e7dd06989ab7b0116bcff5ad52d36e01b851d1
2012-09-13 00:24:38 -07:00
Dianne Hackborn
7454d3b73c New permissions UI, again.
Change-Id: I0bbecd88ff1f212b30d1ef32d5bcaa49cdf1e9ce
2012-09-12 18:57:07 -07:00
Geremy Condra
69689a7356 DO NOT MERGE Push event logging down into libcore.EventLogger
This changes the default behavior of the EventLogger from logging
to the normal logs to logging to the event logs.

Change-Id: I4338a1605928b82246a369adb3514bd31cd552e8

Conflicts:

	core/java/android/app/ActivityThread.java
2012-09-12 17:54:10 -07:00
Geremy Condra
b631084613 DO NOT MERGE Add components for the Android Config Updater to system server.
This adds the necessary bits to verify and install configuration
updates using system server. It also includes the cert pinning
updater as the first user.

Change-Id: I42307f58074157b33b6e01216aab10022340d449
2012-09-12 17:53:53 -07:00
Christopher Tate
79cf1a2291 Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev 2012-09-12 17:51:36 -07:00
Christopher Tate
c868b645b4 Moved a few telephony settings from Secure to Global
Also tidy up the bookkeeping for a few settings that were earlier
moved to Global without the redirect tables being fixed up.

Change-Id: I69275db3b2636cd6ba9c8c51b88e97d8ba4b7b7d
2012-09-12 17:42:43 -07:00
Fabrice Di Meglio
bbbb154c89 Merge "Fix Javadoc spelling" into jb-mr1-dev 2012-09-12 17:41:27 -07:00
Chet Haase
0c348b6dd7 Merge "end() a reverse()'d animation correctly" into jb-mr1-dev 2012-09-12 17:30:16 -07:00
Dianne Hackborn
3c78702db5 Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev 2012-09-12 17:04:42 -07:00
Jim Miller
6fba0a0c72 Music in keyguard improvements
- fix overscroll issue with workaround described in bug 7137941
- ignore noisy signals from music player that sometimes hide it

Change-Id: I6a25674ce7157bd70409f56881ec62644f5fce9b
2012-09-12 16:38:56 -07:00
Chet Haase
4dd1768643 end() a reverse()'d animation correctly
Previously, an animator that had been reverse()'d (and was thus
playing backwards) would not end() at the right value. That is, a call
to end() would cause the animation to snap to its original end value, not
the reverse-playing end value (i.e., its start value). Logic to handle
calculating the proper end value was not taking the reversing behavior
into account.

Issue #6583656 When you call end() after calling reverse() on an animation that has not started leads to forward animation finishing.

Change-Id: Ifca60a32d4973c21b85aed9c459f802526c0207e
2012-09-12 16:33:26 -07:00
Fabrice Di Meglio
61a21770b7 Fix Javadoc spelling
Change-Id: I93685d3d092ce5e16bfa0e65e11d85ae030f3f29
2012-09-12 16:33:13 -07:00
Jim Miller
4f77268c8a Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev 2012-09-12 16:16:21 -07:00
Makoto Onuki
b11b9fc997 Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 2012-09-12 16:11:13 -07:00
Raph Levien
eb1f5349f8 Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev 2012-09-12 15:44:58 -07:00
Raph Levien
13ba4e478d Fix for b7155617 race condition in TextLayoutCache.cpp
There was the possibility for a race between clearing the caches and
using fonts. This patch simply protects both under the same mLock held
by the TextLayoutCache object.

Change-Id: Ib366e16a9a9ba702a46bc078d1bc0602713991e5
2012-09-12 15:15:51 -07:00
Selim Gurun
f4fd2eb5ee Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev 2012-09-12 13:41:09 -07:00
Selim Gurun
b4c02e6ffd Minor update to addjavascriptinterface documentation
Change-Id: I67525673e3d061e00fbe8989c08050ad84e78920
2012-09-12 13:36:21 -07:00
Fabrice Di Meglio
2cd35662ca Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev 2012-09-12 13:28:17 -07:00
Fabrice Di Meglio
8872465709 Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev 2012-09-12 13:26:56 -07:00
Fabrice Di Meglio
b967464049 Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev 2012-09-12 13:25:22 -07:00
Selim Gurun
4f8da32ffa Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 2012-09-12 12:48:32 -07:00
Brian Carlstrom
0efca17105 Tracking upgrade to bouncycastle 1.47
Change-Id: I4a3c508c5e65dd46a2df22935b5351092550fad5
2012-09-12 10:01:00 -07:00
Kristian Monsen
bd0fe87834 Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 2012-09-12 09:34:37 -07:00