Commit Graph

25085 Commits

Author SHA1 Message Date
Kristian Monsen
cdd2dd58d8 am 4cb846b8: Merge "Hiding some of the deprecated android.webkit API\'s" into jb-mr1-dev
* commit '4cb846b8defa298fe62e6420d1dcd7d8f65a1d74':
  Hiding some of the deprecated android.webkit API's
2012-09-14 14:03:59 -07:00
Kristian Monsen
4cb846b8de Merge "Hiding some of the deprecated android.webkit API's" into jb-mr1-dev 2012-09-14 14:01:37 -07:00
Jeff Sharkey
d0f5607e76 am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev
* commit '04a34b375513eaeec67f54bb203ef6b763328751':
  Actually move to Global settings.
2012-09-14 13:51:19 -07:00
Jeff Sharkey
04a34b3755 Merge "Actually move to Global settings." into jb-mr1-dev 2012-09-14 13:49:24 -07:00
Jeff Sharkey
e6e6197d7c Actually move to Global settings.
Also add better ConnectivityService logging.

Bug: 7157464
Change-Id: Ia235a7e62ed809240913c4782920c1410c7d597d
2012-09-14 13:47:51 -07:00
Jeff Sharkey
d3941f4c33 am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
* commit 'a043c2c0534afe418fc39bdb43bfaab394ba821a':
  Move to Global.NETSTATS and Global.NTP constants.
2012-09-14 13:17:46 -07:00
Jeff Sharkey
a043c2c053 Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev 2012-09-14 13:15:16 -07:00
Jeff Sharkey
023c05a341 Move to Global.NETSTATS and Global.NTP constants.
Bug: 7157464
Change-Id: Ief10fd37940f62420f5684940994c9f93802e0be
2012-09-14 13:14:21 -07:00
Jim Miller
76d795c313 am f229e4d3: Add support for settings for lock widgets
* commit 'f229e4d3eb8f910c181f96416c6798f6f305a395':
  Add support for settings for lock widgets
2012-09-14 12:40:05 -07:00
Jim Miller
f229e4d3eb Add support for settings for lock widgets
Change-Id: Iade094c6f32a7653bdbbd4921d345d68f2443ff4
2012-09-14 12:31:24 -07:00
Michael Jurka
1733eb309b am 95a2ff7c: Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev
* commit '95a2ff7cb40d5eb3ca6fe4df0282f45e63d76ae2':
  Adding a couple extras keys for keyguard widget selection
2012-09-14 12:23:46 -07:00
Michael Jurka
95a2ff7cb4 Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev 2012-09-14 12:20:08 -07:00
Svetoslav Ganov
bed49f9d58 am e136a728: Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev
* commit 'e136a72810197029a01b4e30b2063d9993b7a9ad':
  Text layout in switch may be null when accessibility events are fired.
2012-09-14 11:39:39 -07:00
Christopher Tate
c1e27dc060 am 0dbc4108: Merge "Fix Settings writes to a different user" into jb-mr1-dev
* commit '0dbc4108005445d241c5f6990000d25a09a8e00e':
  Fix Settings writes to a different user
2012-09-14 11:37:54 -07:00
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
419822e22f am 2dc6af20: Merge "Fixup a comment." into jb-mr1-dev
* commit '2dc6af2082b93849b2e5519a8ae7504757286aa9':
  Fixup a comment.
2012-09-14 00:04:15 -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
c4ea87e50d am 51d71003: Merge "Prevent crash when invalidating all Views Bug #7165793" into jb-mr1-dev
* commit '51d71003e4211b273b8e00adf85389e91ea4bdff':
  Prevent crash when invalidating all Views Bug #7165793
2012-09-13 22:55:24 -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
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
0ae6039adc am 33aef98f: Allowing association between a view and its label for accessibility.
* commit '33aef98fd28dcac0a2ad37e7329afd3e666f5e0a':
  Allowing association between a view and its label for accessibility.
2012-09-13 18:47:06 -07:00
Alan Viverette
0f2d09fc59 am 0f755134: Revert "Add accessibility scroll actions to TabWidget"
* commit '0f7551341f7504632e4943c66d6a4fd504bf5a0e':
  Revert "Add accessibility scroll actions to TabWidget"
2012-09-13 18:41:53 -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 6053088884

Change-Id: Ia648d7e3e092c396a038740d708de37fe4169d80
2012-09-13 18:36:06 -07:00
Adam Powell
c59d86ef15 am 83835b17: Merge "Break flings with opposing velocities" into jb-mr1-dev
* commit '83835b17f259fc38478c72b7f59b14796bbc622a':
  Break flings with opposing velocities
2012-09-13 17:26:39 -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
e63a1a05d7 am cdfc56a3: Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev
* commit 'cdfc56a3872f6bae7c43aedd5c718c5fa3fbdf9d':
  Add preliminary API for reporting display capabilities.
2012-09-13 15:36:19 -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
e6a0b56032 am 83cdb021: Merge "Add accessibility scroll actions to TabWidget" into jb-mr1-dev
* commit '83cdb021eb9a8cfe26cd565febadb1a70380f3a9':
  Add accessibility scroll actions to TabWidget
2012-09-13 15:07:10 -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
5d6d5f3d7a am 24271a8c: Merge "Use shared app gid for forward-locked processes" into jb-mr1-dev
* commit '24271a8c4c55a60047fd3d35c8a7af98b0f4e666':
  Use shared app gid for forward-locked processes
2012-09-13 14:46:38 -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
965c9f9709 am dcd8c81b: Merge "Propagate systemUiVisibility changes to window manager" into jb-mr1-dev
* commit 'dcd8c81bf4beb719888b6be1b9418303c9075938':
  Propagate systemUiVisibility changes to window manager
2012-09-13 13:58:08 -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
Jeff Brown
c5df37c285 Add preliminary API for reporting display capabilities.
Change-Id: Ie18dce5b5d130f9a7cdfca08cddbf9b099312277
2012-09-13 11:45:07 -07:00
Eino-Ville Talvala
caea2213d5 am f353f948: Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev
* commit 'f353f948a5867fb43c9ee1dbec1ebc93f91655ec':
  NEW_API: Unhide android.hardware.Camera#enableShutterSound
2012-09-13 11:18:09 -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
Jeff Sharkey
e2332dfc3b am cae22d83: Merge "Give DefaultContainerService all external storage." into jb-mr1-dev
* commit 'cae22d83a7225c38ef6f51723e13d5741d1cd69b':
  Give DefaultContainerService all external storage.
2012-09-13 01:34:30 -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
6ba04590de am 3e451fa1: Merge "New permissions UI, again." into jb-mr1-dev
* commit '3e451fa128e5b7beb22b413eb5600d6c980e5a29':
  New permissions UI, again.
2012-09-12 21:39:06 -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