83457 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
38f197863a am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
* commit '14c0c989d21531056a5d0a0739c3ffdd1b04b295':
  Fix SkBitmap::fPixels not being locked correctly
2012-08-29 12:00:10 -07:00
Jean-Baptiste Queru
14c0c989d2 am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
* commit '4ba4caede125ff602b0d93f577f9054a07791ff7':
  Fix SkBitmap::fPixels not being locked correctly
2012-08-29 11:55:20 -07:00
Jean-Baptiste Queru
4ba4caede1 Merge "Fix SkBitmap::fPixels not being locked correctly" 2012-08-29 11:27:31 -07:00
Jean-Baptiste Queru
c88a80a1d7 am 15e099cc: am 0e0942c7: Merge "Default WiFi sleep policy setting"
* commit '15e099cc09589f963933f046d7267552ba3ffad8':
  Default WiFi sleep policy setting
2012-08-29 10:58:35 -07:00
Irfan Sheriff
d5a1074c4e am c5f34bd4: am 48c45d0e: Merge "Fix join scenario with provision discovery"
* commit 'c5f34bd40bc68925c6e99da02e179227d8eb3ae4':
  Fix join scenario with provision discovery
2012-08-29 10:58:30 -07:00
Jean-Baptiste Queru
15e099cc09 am 0e0942c7: Merge "Default WiFi sleep policy setting"
* commit '0e0942c7209c758bc00939ae54059dc24bce3abb':
  Default WiFi sleep policy setting
2012-08-29 10:49:25 -07:00
Irfan Sheriff
c5f34bd40b am 48c45d0e: Merge "Fix join scenario with provision discovery"
* commit '48c45d0e3bcacebfc3635bc893875146b7ecb787':
  Fix join scenario with provision discovery
2012-08-29 10:49:20 -07:00
Jean-Baptiste Queru
0e0942c720 Merge "Default WiFi sleep policy setting" 2012-08-29 09:50:45 -07:00
Irfan Sheriff
48c45d0e3b Merge "Fix join scenario with provision discovery" 2012-08-29 09:47:27 -07:00
Irfan Sheriff
127efc4e25 Fix join scenario with provision discovery
Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
2012-08-29 08:36:17 -07:00
Michal Stawinski
35ef567140 Fix SkBitmap::fPixels not being locked correctly
In some cases bitmap's pixels where freed during encoding, which
caused a null pointer dereference.
This fix makes sure that underlaying buffer is locked for the whole
process of compression.

Change-Id: I0ac56821f5d333072271dc2670fa30f1562adfa3
2012-08-29 15:54:01 +02:00
Erik Ljungberg
7e07147ece Default WiFi sleep policy setting
Creates a defult.xml setting for WiFi sleep policy.

It is now possible, through device overlays, to change
the default sleep policy to e.g. never in order to improve
user experience of WiFi.

Change-Id: Ie459b8e70fdbc7c605452fe0692d7bc26460e939
2012-08-29 09:52:12 +02:00
Amith Yamasani
2c577f1777 Merge "Fix adding live wallpaper in a second user" into jb-mr1-dev 2012-08-28 22:47:45 -07:00
Amith Yamasani
4e2820c22b Fix adding live wallpaper in a second user
When the second user downloads a new wallpaper service, Wallpaper
service needs to query the correct user's package state to figure
out if it is available and bind to it.

Change-Id: Ifb95db1c859887f996f5b2e821b4b46510ee7016
2012-08-28 22:45:17 -07:00
Adam Powell
04951a51f8 Merge "New implementation for ScaleGestureDetector" into jb-mr1-dev 2012-08-28 18:51:24 -07:00
Craig Mautner
c479b55abe Merge "Check proximity detector before powering off." into jb-mr1-dev 2012-08-28 17:16:28 -07:00
Craig Mautner
4ccbdd1770 Check proximity detector before powering off.
Do not automatically power off if the proximity detector wakelock is
active.

Fixes bug 7047455.

Change-Id: I44e30bf388292e5c476dfb5d0de9226d21853e4d
2012-08-28 17:12:52 -07:00
Amith Yamasani
7af0c166f0 Merge "Fix recents list for multiuser" into jb-mr1-dev 2012-08-28 17:02:29 -07:00
Amith Yamasani
c3815a5679 Merge "Fix PendingIntent caching for multiuser" into jb-mr1-dev 2012-08-28 16:56:19 -07:00
John Reck
b5b2acec80 Merge "Remove dead code" into jb-mr1-dev 2012-08-28 16:28:15 -07:00
John Reck
25b86b6bf0 Remove dead code
Change-Id: Ice4bf3a94743019a8fc8ab04ee3de19f27a9e2c3
2012-08-28 16:24:28 -07:00
Adam Powell
618cbea4e7 New implementation for ScaleGestureDetector
This solves the problems around active pointer tracking when the
caller may skip events in the MotionEvent stream and replaces the
old implementation with a much simpler algorithm.

Change-Id: I6b15a2e215cab7b9559db800fcc57374702357fc
2012-08-28 16:20:32 -07:00
Irfan Sheriff
608e5c416f Merge "Fix join scenario with provision discovery" into jb-mr1-dev 2012-08-28 16:07:40 -07:00
Irfan Sheriff
4bbb13976e Fix join scenario with provision discovery
Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
2012-08-28 16:05:43 -07:00
Dianne Hackborn
def8b0f011 Merge "Fix infinite loop when uninstalling apps." into jb-mr1-dev 2012-08-28 16:01:53 -07:00
Dianne Hackborn
377de7b13e Fix infinite loop when uninstalling apps.
Change-Id: Ibdf7fa832529a358d1115fc300651101c5185484
2012-08-28 15:57:33 -07:00
Baligh Uddin
b210018760 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-28 15:51:02 -07:00
Amith Yamasani
d2e99565f5 Fix recents list for multiuser
Since the Recents is now an activity running in the respective user's sandbox,
it shouldn't use the special API to get the current user's recent tasks.
Otherwise it causes all users to fetch the state of the current foreground user
instead of their own recents.

Change-Id: Ice8c2978e6a7ae71c44666c79a19ac07a2cbea1b
2012-08-28 15:49:06 -07:00
Baligh Uddin
97d8f83818 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-28 15:31:22 -07:00
rich cannings
2deaa3698d Merge "Add permission checks for Verification API calls" into jb-mr1-dev 2012-08-28 15:14:26 -07:00
Craig Mautner
b1a1e5ca7d Merge "Use correct WindowManager for Toast." into jb-mr1-dev 2012-08-28 14:43:59 -07:00
Amith Yamasani
4ea6069323 Fix PendingIntent caching for multiuser
Store the userId in the PendingIntentRecord.Key, so that it doesn't match
an identical pending intent from another user.

Change-Id: Icfc39e0f717c902dc3a60bdf5283a3402bbd2eaa
2012-08-28 14:34:53 -07:00
Craig Mautner
b6ee2a2429 Use correct WindowManager for Toast.
The WindowManager retrieved from the activity Context with
getSystemService is incorrect for a Toast. Because it contains
a parent window when addView is called its LayoutParams.token
is set to the value of the parent window. Then when an Activity
is dismissed WindowManagerGlobal.closeAll() sees the incorrect
token and incorrectly closes the Toast.

This fix uses the application Context instead of the activity
Context to retrieve a WindowManager with no parent window. This
leaves the token unchanged and keeps from dismissing the toast when
the activity is closed.

Fixes bug 7048792.

Change-Id: I92c3095d8fabd6e9e4206e9bc8e917885ab322a9
2012-08-28 14:28:53 -07:00
rich cannings
7e67151b91 Add permission checks for Verification API calls
Ensure that only applications with
android.Manifest.permission.PACKAGE_VERIFICATION_AGENT can call application
verification APIs, like PackageManager.verifyPendingInstall and
PackageManager.extendVerificationTimeout

Bug: 7049083
Change-Id: I5fc28b37e864d67cd319a1ed9d03a90dd15ad052
2012-08-28 14:00:46 -07:00
Daniel Sandler
0d43c567ce am 393e3170: am ad955fe8: Merge "SystemUI: Fix data activity overlay not being removed when data is disabled"
* commit '393e3170b3f52a3e191554ffd8c8f81821ba2074':
  SystemUI: Fix data activity overlay not being removed when data is disabled
2012-08-28 13:41:19 -07:00
Jean-Baptiste Queru
8d8646471c am 1112a376: am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter"
* commit '1112a376e81af8ef4c2b661f5bda443596ba37da':
  Change StringTokenizer to TextUtils.StringSplitter
2012-08-28 13:41:15 -07:00
Baligh Uddin
0d51d679b2 Import translations. DO NOT MERGE
Change-Id: I4739f1d06aba86718416cde965590fe9535bde51
Auto-generated-cl: translation import
2012-08-28 13:30:55 -07:00
Daniel Sandler
393e3170b3 am ad955fe8: Merge "SystemUI: Fix data activity overlay not being removed when data is disabled"
* commit 'ad955fe87f44b43dbb2842fdcbe4e62900b5a07f':
  SystemUI: Fix data activity overlay not being removed when data is disabled
2012-08-28 13:19:52 -07:00
Jean-Baptiste Queru
1112a376e8 am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter"
* commit '416362e6d8c8d0a34e09704138688f75aa810c9b':
  Change StringTokenizer to TextUtils.StringSplitter
2012-08-28 13:19:48 -07:00
Baligh Uddin
3b87a57aca Import translations. DO NOT MERGE
Change-Id: Ia11f923dfd05112764cd795034e5a8b33b2d67fe
Auto-generated-cl: translation import
2012-08-28 13:10:55 -07:00
Daniel Sandler
ad955fe87f Merge "SystemUI: Fix data activity overlay not being removed when data is disabled" 2012-08-28 12:52:49 -07:00
Wink Saville
97d28d92c9 Merge "Unhide some CellSignalStrength methods." into jb-mr1-dev 2012-08-28 12:34:22 -07:00
Jean-Baptiste Queru
416362e6d8 Merge "Change StringTokenizer to TextUtils.StringSplitter" 2012-08-28 12:22:39 -07:00
Wink Saville
82e6ee62b2 Unhide some CellSignalStrength methods.
When submitting originally I'd missed unhiding these methods.

Change-Id: I627a5ea0c8c29b6ddfe5b1c49f9c0789d5e86456
2012-08-28 12:05:16 -07:00
Jean-Baptiste Queru
a3b63c001c am 337756fa: am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
* commit '337756fa6587bca84afdfdc964805f962ea534ed':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
2012-08-28 11:13:38 -07:00
Jean-Baptiste Queru
337756fa65 am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
* commit '78ad66b43cf5b649869de18ee9c246c95b135c10':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
2012-08-28 11:08:22 -07:00
Jean-Baptiste Queru
78ad66b43c Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal." 2012-08-28 10:43:10 -07:00
Przemyslaw Szczepaniak
70574efd8f Fix threading issue in BlockingAudioTrack.
This fixes the issue where one thread calls .stop() on
mAudioTrack that was released (or being released) by other thread.

Bug: 7029291
Change-Id: Ia6db803e8ee40379b63327acf578466127cfabcb
2012-08-28 02:19:20 -07:00
Irfan Sheriff
c5fd6e59db Fix build
Change-Id: Id17b70154b3f8a101457b20fb37db0a16159dff9
2012-08-28 02:02:21 -07:00
Irfan Sheriff
da6da0907b Captive portal handling
We now notify the user of a captive portal before switching to the network as default.
This allows background applications to continue to work until the user confirms he
wants to sign in to the captive portal.

Also, moved out captive portal handling out of wifi as a seperate component.

Change-Id: I7c7507481967e33a1afad0b4961688bd192f0d31
2012-08-27 22:27:06 -07:00