85119 Commits

Author SHA1 Message Date
Dave Burke
ca68f4a32f Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev 2012-09-25 23:30:48 -07:00
Irfan Sheriff
0f08b813bb Remove WifiStateTracker code tracking wifi p2p
This code was never supposed to have been there. It just remained
from an old implementation and actually results in
CS getting the wrong network info when both wifi and p2p are connected

Exposing p2p network type to CS needs to be done differently.

Bug: 7233984
Change-Id: I84a6091b8236cf5bdfcef3e7f626163d629e372d
2012-09-25 23:02:47 -07:00
Mathias Agopian
17ef62cc1f fix a possible dead-lock when clearing caches
Bug: 7195815
Change-Id: I8e226b7ec445f9f4fe46ae216ef7cc41efc5a0fd
2012-09-25 22:52:40 -07:00
Dave Burke
348f08f468 Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-dev 2012-09-25 21:53:31 -07:00
Mathias Agopian
54643d72f8 make sure to destroy GL objects on the GL thread
Bug: 7195815
Change-Id: I5bcac61cd0b903d1ccca0754fdb9cb1023efbe0f
2012-09-25 21:41:38 -07:00
Matthew Xie
5e1c74dbbe Merge "Remove permission check in registerAdapter" into jb-mr1-dev 2012-09-25 21:04:15 -07:00
Dave Burke
cefbd1438c Merge "Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"" into jb-mr1-dev 2012-09-25 20:31:08 -07:00
Dave Burke
56257aff8a Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"
This reverts commit 8a1374946a928fcba7495c87ff6adda327fdfb9f

Change-Id: I53564a6c531d334afcc1fce0bea1e57ae266aa78
2012-09-25 20:30:09 -07:00
Adam Powell
e8e2b67256 Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev 2012-09-25 19:35:54 -07:00
Adam Powell
d736d2069b Further tweak touchMajor/Minor stabilization in ScaleGestureDetector
Change-Id: Ifa717c7dee96c5a2eb18a414a257f01762365b00
2012-09-25 19:30:44 -07:00
Scott Main
9703880d73 am 82e7fdfd: am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state
* commit '82e7fdfd47e7de5408c3a0e296475bb1e945f339':
  add tip about including android:id for layout state
2012-09-25 19:08:15 -07:00
Scott Main
82e7fdfd47 am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state
* commit '4f832bc796bad90e5632c3ab69e305b3c7c008ba':
  add tip about including android:id for layout state
2012-09-25 19:05:35 -07:00
Scott Main
4f832bc796 am 3b1c5d55: add tip about including android:id for layout state
* commit '3b1c5d55517260516bfa5591ca08bb39d336d511':
  add tip about including android:id for layout state
2012-09-25 19:03:33 -07:00
Scott Main
3b1c5d5551 add tip about including android:id for layout state
Change-Id: I9bc9157b320f8a8ac37ab30bc31fb9c457ecf4f6
2012-09-25 19:01:09 -07:00
Matthew Xie
670ef53353 Remove permission check in registerAdapter
This matches the JB behavior of getDefaultAdapter public api
bug 6948829

Change-Id: I86135bf45fddbb2d078f855f91a34d6fcce237a2
2012-09-25 18:25:54 -07:00
Jeff Brown
067b4732f6 Merge "Use more reasonable warning thresholds for power on/off." into jb-mr1-dev 2012-09-25 18:13:23 -07:00
Joe Fernandez
be07e6a4c0 am c80188eb: am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
* commit 'c80188ebefbcbe8448fdab0a9f44f02f770f6e8a':
  cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
2012-09-25 17:59:43 -07:00
Joe Fernandez
c80188ebef am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
* commit '9b5163836ccf121af89040c1e465a3f96d37aa7b':
  cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
2012-09-25 17:57:56 -07:00
Joe Fernandez
9b5163836c am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
* commit 'e35d9280d6cd5bfca13f9f1c3e8e90636e00c6cf':
  cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
2012-09-25 17:56:43 -07:00
Jeff Sharkey
6e065a729d Merge "Handle multi-user mountObb() requests." into jb-mr1-dev 2012-09-25 17:52:14 -07:00
Joe Fernandez
e35d9280d6 cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7
docs: Systrace tool documentation

Change-Id: I85413fad63edd536a18123a5c09abee47051fca6
2012-09-25 17:52:02 -07:00
Jeff Sharkey
4fbbda4cec Handle multi-user mountObb() requests.
Since emulated external storage paths differ based on execution
context, carefully fix up paths for various use-cases:

1. When sending paths to DefaultContainerService, always scope
   OBB paths as belonging to USER_OWNER.
2. When sending paths to vold, always build emulated storage paths
   visible to root.
3. Always use the original untouched path when talking with apps.

Mount OBB containers using shared app GID, so that an app can read
the mount point across users.

Handle legacy paths like "/sdcard" by resolving the canonical path
before sending to MountService.  Move tests to servicestests, and
add tests for new path generation logic.

Bug: 7212801
Change-Id: I078c52879cd08d9c8a52cc8c83ac7ced1e8035e7
2012-09-25 17:34:48 -07:00
Adam Powell
b4693e25b1 Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev 2012-09-25 17:17:22 -07:00
Svetoslav Ganov
2fd6cb0439 Merge "Fixing the build" into jb-mr1-dev 2012-09-25 17:05:04 -07:00
Svetoslav Ganov
063158561e Fixing the build
Change-Id: Ia3a7051bf26001da019b08d1b718d0a63d6c7919
2012-09-25 17:03:12 -07:00
Jeff Brown
b32e221699 Merge changes I332f020f,I632648ac into jb-mr1-dev
* changes:
  Update references to migrated global settings.
  Handle user switched for settings changes.
2012-09-25 17:03:11 -07:00
Jeff Brown
0a52088e58 Merge "Fix typo." into jb-mr1-dev 2012-09-25 17:02:06 -07:00
Jeff Brown
80cd819a04 Use more reasonable warning thresholds for power on/off.
To encourage vendors to make power on/off as efficient
and responsive as possible, we log some warnings whenever it
is too slow.  The previous thresholds were a little
unreasonable mainly because we wanted to understand
how long the process tends to take even when it's fast.

Raise the warning limit while still being aggressive about
timings.  Ideally we want the screen to turn on/off within
no more than a few frames.

Bug: 7167820
Change-Id: Id28dbf8c91cefa7ae7544b72887104af7aabccff
2012-09-25 16:59:58 -07:00
Winson Chung
282c51d391 Merge "Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)" into jb-mr1-dev 2012-09-25 16:51:11 -07:00
Dianne Hackborn
61ad1bacf8 Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev 2012-09-25 16:49:05 -07:00
Svetoslav Ganov
c91fb5875b Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 2012-09-25 16:47:06 -07:00
Brian Carlstrom
fe54290df0 Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev 2012-09-25 16:46:09 -07:00
Winson Chung
c86b23b9a6 Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)
Change-Id: If42308a0bbc4a31ffb7f5f0b66063c3b1418ca3e
2012-09-25 16:44:29 -07:00
Jason Sams
0c62257079 Merge "Reduce test warmup time to avoid driving into thermal throttle." into jb-mr1-dev 2012-09-25 16:42:10 -07:00
Romain Guy
5d50ab7cba Merge "Deleting objects on the wrong thread is a silly idea Bug #7195815" into jb-mr1-dev 2012-09-25 16:34:04 -07:00
Elliott Hughes
bf5d185800 Merge "Attempt to clarify how pluralization actually works." into jb-mr1-dev 2012-09-25 16:25:29 -07:00
Michael Jurka
99f19db697 Merge "Fix 7216326: Recents has a "dead zone" on tablets" into jb-mr1-dev 2012-09-25 16:22:31 -07:00
Adam Powell
a4ce6ae0d3 Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector.
Bug 7199099

Change-Id: I7268268237cc690c2ff952d4b2cd2ddc6dce2ca5
2012-09-25 16:21:53 -07:00
Michael Jurka
76218b8a16 Fix 7216326: Recents has a "dead zone" on tablets 2012-09-25 16:17:12 -07:00
Elliott Hughes
0cd016741d Attempt to clarify how pluralization actually works.
Many languages are very unlike English.

Bug: 7229680
Change-Id: I3a2b9d10ee7d92b0a0bc47d81bd372fd8ce6ba19
2012-09-25 16:15:35 -07:00
Svetoslav Ganov
e20a177d3f Adding a global accessibility action to open quick settings.
1. Added APIs for opening the quick settings to the StatusBarManagerService
   and the local StatausBarManager. The new APIs are protected by the old
   EXPAND_STATUS_BAR permission.
   Renamed the expand* and collapse* non-public APIs that are expanding
   the notifications to expandNotifications* collapseNotifications* to
   better convey what they do given that this change adds
   expandQuickSettings* and collapseQuickSettings*.
   Added a global action to the accessibility layer to expand the quick
   settings which is calling into the new status bar manager APIs.

bug:7030487

Change-Id: Ic7b46e1a132f1c0d71355f18e7c5a9a2424171c3
2012-09-25 16:07:59 -07:00
Michael Jurka
150443a99f Merge "Fix 7216870: recents relaunches dismissed activity" into jb-mr1-dev 2012-09-25 16:04:53 -07:00
Fabrice Di Meglio
e8e98704f3 Merge "Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode" into jb-mr1-dev 2012-09-25 15:58:56 -07:00
Irfan Sheriff
e79275a9f6 Merge "P2p fixes" into jb-mr1-dev 2012-09-25 15:54:47 -07:00
Amith Yamasani
be47828fbc Merge "Load resources for the correct user" into jb-mr1-dev 2012-09-25 15:49:39 -07:00
Romain Guy
8a1374946a Deleting objects on the wrong thread is a silly idea
Bug #7195815

Turns out that multi-threading is hard.

Change-Id: Ib0b4bd6dc3caea27f7ced22cbb363bb955fe58ab
2012-09-25 15:49:03 -07:00
Svetoslav Ganov
1908cf9ec4 Merge "Fixing argument expectations of View.requestRectangleOnScreen" into jb-mr1-dev 2012-09-25 15:45:35 -07:00
Amith Yamasani
98edc95171 Load resources for the correct user
For apps that are only installed on secondary users, the SystemUI is
unable to see them by default. Added some methods to explicitly pass the
userId of the user the resources are requested for by the StatusBarIcon

Bug: 7214384

Also fix binding to remote views

Bug: 7192802

Change-Id: I5d6c5f624aa37fb231f3467f9764c8d99077a91d
2012-09-25 15:45:27 -07:00
Alon Albert
fd901f735c Add a static generator that takes a Socket Write Timeout Argumanet
Use it from AndroidHttpClient

Bug: 6693087
Change-Id: I08648e441a6431d0944caaec0db516a26671f2a5
2012-09-25 15:33:28 -07:00
Jeff Brown
bf6f6f9de7 Update references to migrated global settings.
Fixed one setting that was migrated but not marked deprecated.

Removed a hidden setting that is no longer used by the new
power manager service.

Bug: 7231172
Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7
2012-09-25 15:27:51 -07:00