Commit Graph

30164 Commits

Author SHA1 Message Date
Adam Powell
04951a51f8 Merge "New implementation for ScaleGestureDetector" into jb-mr1-dev 2012-08-28 18:51:24 -07:00
Elliott Hughes
989e14bee1 Merge "Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings." 2012-08-28 16:54:14 -07:00
Elliott Hughes
47a0539eca Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
Change-Id: Id9e3b678a98751c4ca85f63b130cc7781d2a6cfe
2012-08-28 16:41:37 -07:00
John Reck
5a55494d15 am 992fde95: am b5b2acec: Merge "Remove dead code" into jb-mr1-dev
* commit '992fde950886606adbe29b523188428308e7502d':
  Remove dead code
2012-08-28 16:32:20 -07:00
Dianne Hackborn
80a4af2bbc Start implementing concept of "running" users.
The activity manager now keeps track of which users are running.

Initially, only user 0 is running.

When you switch to another user, that user is started so it is
running.  It is only at this point that BOOT_COMPLETED is sent
for that user and it is allowed to execute anything.

You can stop any user except user 0, which brings it back to the
same state as when you first boot the device.  This is also used
to be able to more cleaning delete a user, by first stopping it
before removing its data.

There is a new broadcast ACTION_USER_STOPPED sent when a user is
stopped; system services need to handle this like they currently
handle ACTION_PACKAGE_RESTARTED when individual packages are
restarted.

Change-Id: I89adbd7cbaf4a0bb72ea201385f93477f40a4119
2012-08-28 16:30:55 -07:00
John Reck
2ec1098961 DO NOT MERGE Remove dead code
Cherry pick

Change-Id: I19603a6e234b0b2592ef90fd426b2973cff8e4fd
2012-08-28 16:29:51 -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
rich cannings
d72fa31644 am a76fd600: am 2deaa369: Merge "Add permission checks for Verification API calls" into jb-mr1-dev
* commit 'a76fd600e8f886bfb3893cc09ec40c996ffe1cde':
  Add permission checks for Verification API calls
2012-08-28 15:19:28 -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
a65517e4df am 62814d5c: am b1a1e5ca: Merge "Use correct WindowManager for Toast." into jb-mr1-dev
* commit '62814d5cf8a66ae5643e19304978cc3b668a7d3d':
  Use correct WindowManager for Toast.
2012-08-28 14:48:14 -07:00
Craig Mautner
b1a1e5ca7d Merge "Use correct WindowManager for Toast." into jb-mr1-dev 2012-08-28 14:43:59 -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
Jean-Baptiste Queru
8a4d29e601 am 5f615660: am 8d864647: am 1112a376: am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter"
* commit '5f6156601a5cc26f8304b50c0601462a3fc5d380':
  Change StringTokenizer to TextUtils.StringSplitter
2012-08-28 13:46:35 -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
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
Jean-Baptiste Queru
5b231a4dbd am e8f24cc2: am a3b63c00: am 337756fa: am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
* commit 'e8f24cc2678240c502d6d6156fd88bc0fa129de1':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
2012-08-28 13:02:29 -07:00
Jean-Baptiste Queru
416362e6d8 Merge "Change StringTokenizer to TextUtils.StringSplitter" 2012-08-28 12:22:39 -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
ed9a656565 am 2d27c5cb: am 70574efd: Fix threading issue in BlockingAudioTrack.
* commit '2d27c5cb8d98b65576a8ec4e6e553c19d08f1d71':
  Fix threading issue in BlockingAudioTrack.
2012-08-28 02:26:21 -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
e8a4fa857f am 5751fe47: am c5fd6e59: Fix build
* commit '5751fe47954f7755295a874babe8a61fcbeff195':
  Fix build
2012-08-28 02:07:52 -07:00
Irfan Sheriff
c5fd6e59db Fix build
Change-Id: Id17b70154b3f8a101457b20fb37db0a16159dff9
2012-08-28 02:02:21 -07:00
Irfan Sheriff
749728e391 Merge commit '949dcad8' into manualmerge
Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: I02fee6839c2a8879fb6e885d8fc8483f17d655c2
2012-08-27 23:03:50 -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
Jeff Brown
9315bda432 am 87f67b72: am 5c807b4e: Merge "Fix improper use of CloseGuard." into jb-mr1-dev
* commit '87f67b727c4256e05de17eece2e62e89aa8f7da2':
  Fix improper use of CloseGuard.
2012-08-27 17:26:19 -07:00
Jeff Brown
dd6261eb23 am 398a6cbe: am dc7d8008: Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev
* commit '398a6cbe51bfe8d4c11942ddf9c438aaa8d3cbac':
  Add plumbing for new surface flinger display API.
2012-08-27 17:23:25 -07:00
Jeff Brown
5c807b4e84 Merge "Fix improper use of CloseGuard." into jb-mr1-dev 2012-08-27 17:21:12 -07:00
Jeff Brown
0e274c2f1a am abd696f7: am ac66d4a8: Merge "Use new surface flinger API." into jb-mr1-dev
* commit 'abd696f7d43bb137f674c3a4b04fd128818897b5':
  Use new surface flinger API.
2012-08-27 17:20:05 -07:00
Jeff Brown
dc7d8008ec Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev 2012-08-27 17:16:53 -07:00
Jeff Brown
ac66d4a8d6 Merge "Use new surface flinger API." into jb-mr1-dev 2012-08-27 17:15:25 -07:00
John Reck
3d227674fe am 12d8776b: am f9202718: Merge "Protect against focus changes after .destroy()" into jb-mr1-dev
* commit '12d8776b8667946a6741f85013a24373900df830':
  Protect against focus changes after .destroy()
2012-08-27 16:59:34 -07:00
John Reck
f920271828 Merge "Protect against focus changes after .destroy()" into jb-mr1-dev 2012-08-27 16:54:18 -07:00
John Reck
1612fab07b Protect against focus changes after .destroy()
Bug: 7026042

Change-Id: I656b612a4b5304225863d3100a98bf2b97d9890d
2012-08-27 16:44:39 -07:00
alanv
b72fe7a263 Don't overwrite accessibility delegates in AbsListView items.
Bug: 6856579
Change-Id: I2963edcefdc0dd5e1413b57858e6f319904a269d
2012-08-27 16:44:25 -07:00
Charles Chen
f743a5da0b am 3ff601e7: am 40edfc97: Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev
* commit '3ff601e730c48252f50bc3eebdb424b4d9c5e2ca':
  Reload page when A11y is on and the JavaScript state changes.
2012-08-27 15:48:19 -07:00
alanv
c98b34608b Reload page when A11y is on and the JavaScript state changes.
Bug: 6910403
Change-Id: I85af7d2019a02c1a6cc17b0c4930276b7fb69e33
2012-08-27 15:21:09 -07:00
Adam Powell
000de44012 am c7c1d174: am ac137b32: Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev
* commit 'c7c1d174b39ca4d81f42069799f7891de5102158':
  Add setOnDismissListener to AlertDialog.Builder
2012-08-27 15:17:45 -07:00
Jeff Sharkey
c44b06d414 am f261d88f: am 116ee10b: Merge "Always-on VPN." into jb-mr1-dev
* commit 'f261d88f818df20dfd033746bd3072bd42b705c9':
  Always-on VPN.
2012-08-27 15:17:41 -07:00
Jeff Brown
3e7e7f025e Fix improper use of CloseGuard.
Change-Id: I37131a86e27a4be55956384a3566de9dcfd90fe5
2012-08-27 14:34:55 -07:00
Jeff Brown
64a55af0ac Add plumbing for new surface flinger display API.
Cleaned up the implementation of Surface and SurfaceSession
to use more consistent naming and structure.

Added JNI for all of the new surface flinger display API calls.

Enforced the requirement that all Surfaces created by
the window manager be named.

Updated the display manager service to use the new methods.

Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
2012-08-27 14:34:54 -07:00
Jeff Brown
0b722fe9ce Use new surface flinger API.
Change-Id: Ic888577408a59a36481a48010e19c5e77c24e211
2012-08-27 14:34:53 -07:00
Adam Powell
ac137b3211 Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev 2012-08-27 14:04:29 -07:00
Jeff Sharkey
116ee10b95 Merge "Always-on VPN." into jb-mr1-dev 2012-08-27 13:57:58 -07:00
Adam Powell
7f02dc5c9c Add setOnDismissListener to AlertDialog.Builder
Add documentation to setOnCancelListener to clarify that the cancel
event plus the events for the various choice buttons are not the
exhaustive set of ways the dialog can be dismissed, and that a dismiss
listener should be used if the app needs to cover all cases of
dismissal.

Change-Id: I9e9d6f90f6f9ccaeb2c697474ab353e2d78f37b9
2012-08-27 13:53:29 -07:00
Dianne Hackborn
1ce05ed2de am 737e99d8: am e45ca31a: am aae49432: am 4763989d: am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future"
* commit '737e99d8d621bfdde810c8f9ce23b25c67ad4de4':
  Fixes relative time formatting issue for dates in future
2012-08-27 13:16:13 -07:00