Commit Graph

4244 Commits

Author SHA1 Message Date
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
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
dc7d8008ec Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev 2012-08-27 17:16:53 -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 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
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
James Dong
09433caa6d am abe12af2: am 71d7c3c6: Merge "Added some common error codes in MediaPlayer.java" into jb-mr1-dev
* commit 'abe12af2d957b5b4510f9a523088d9544771ede4':
  Added some common error codes in MediaPlayer.java
2012-08-27 10:11:53 -07:00
James Dong
2adac496a8 Added some common error codes in MediaPlayer.java
o related-to-bug: 6770717

Change-Id: Iea8ba6943755a9af8df5b6e91284c7c1b32c3c6c
2012-08-26 14:15:57 -07:00
Dianne Hackborn
43019827a5 am 068a98e6: am a31803fc: Merge "Keep track of whether an app is installed for each user." into jb-mr1-dev
* commit '068a98e6a0bc1e73c9f4fb4e06c208b71ad1aa32':
  Keep track of whether an app is installed for each user.
2012-08-24 14:41:12 -07:00
Dianne Hackborn
7767eac323 Keep track of whether an app is installed for each user.
This add a new per-user state for an app, indicating whether
it is installed for that user.

All system apps are always installed for all users (we still
use disable to "uninstall" them).

Now when you call into the package manager to install an app,
it will only install the app for that user unless you supply
a flag saying to install for all users.  Only being installed
for the user is just the normal install state, but all other
users have marked in their state for that app that it is not
installed.

When you call the package manager APIs for information about
apps, uninstalled apps are treated as really being not visible
(somewhat more-so than disabled apps), unless you use the
GET_UNINSTALLED_PACKAGES flag.

If another user calls to install an app that is already installed,
just not for them, then the normal install process takes place
but in addition that user's installed state is toggled on.

The package manager will not send PACKAGE_ADDED, PACKAGE_REMOVED,
PACKAGE_REPLACED etc broadcasts to users who don't have a package
installed or not being involved in a change in the install state.
There are a few things that are not quite right with this -- for
example if you go through a full install (with a new apk) of an
app for one user who doesn't have it already installed, you will
still get the PACKAGED_REPLACED messages even though this is
technically the first install for your user.  I'm not sure how
much of an issue this is.

When you call the existing API to uninstall an app, this toggles
the installed state of the app for that user to be off.  Only if
that is the last user user that has the app uinstalled will it
actually be removed from the device.  Again there is a new flag
you can pass in to force the app to be uninstalled for all users.

Also fixed issues with cleaning external storage of apps, which
was not dealing with multiple users.  We now keep track of cleaning
each user for each package.

Change-Id: I00e66452b149defc08c5e0183fa673f532465ed5
2012-08-24 13:53:13 -07:00
rich cannings
d08f6174dd am 5e4e1251: am e7485cbc: MAXIMUM_VERIFICATION_TIMEOUT incorrect
* commit '5e4e1251f6310460b08fd8ba03904e6fcb423153':
  MAXIMUM_VERIFICATION_TIMEOUT incorrect
2012-08-23 16:48:24 -07:00
rich cannings
e7485cbc45 MAXIMUM_VERIFICATION_TIMEOUT incorrect
Missed a 0.

Change-Id: Ia27d97520ef74cde529fb57ac05e6a37122cd3c2
2012-08-23 16:39:12 -07:00
rich cannings
4e7e743e3a am bf3f2858: am 7646c773: Merge "Allow verifiers to extend timeout" into jb-mr1-dev
* commit 'bf3f28583f9e1b78a4765472375a23abdf8a4513':
  Allow verifiers to extend timeout
2012-08-23 16:01:46 -07:00
rich cannings
d9ef3e5495 Allow verifiers to extend timeout
Create a new verifier API to extend the timeout for a giving package,
including the resulting action (allow or deny) upon the timeout occuring.

Bug: 6901038
Change-Id: I351f7944327f863aff1d7dd1227be74652fa1511
2012-08-23 15:39:02 -07:00
John Spurlock
38aea3a6a6 am d8351a48: am 21b53df7: Merge "Add framework support for multiple dreams." into jb-mr1-dev
* commit 'd8351a48b0836a43e8522d373cc43603c9f92e11':
  Add framework support for multiple dreams.
2012-08-23 10:49:32 -07:00
John Spurlock
21b53df7c3 Merge "Add framework support for multiple dreams." into jb-mr1-dev 2012-08-23 10:44:05 -07:00
John Spurlock
1a868b7981 Add framework support for multiple dreams.
Bug:7028665
Change-Id: I4fba6b8e39dc07af4490c621ac3bc7b3867371b2
2012-08-22 16:49:20 -04:00
Kenny Root
947a093391 am 9865132f: am 9b90ee2d: Merge "Add KeyPairGenerator for Android keystore" into jb-mr1-dev
* commit '9865132fd961610fbd53974d1590285b99cb6512':
  Add KeyPairGenerator for Android keystore
2012-08-22 08:59:20 -07:00
Kenny Root
9b90ee2d0b Merge "Add KeyPairGenerator for Android keystore" into jb-mr1-dev 2012-08-22 08:55:26 -07:00
Kenny Root
db026710ec Add KeyPairGenerator for Android keystore
This allows end-users to generate keys in the keystore without the
private part of the key ever needing to leave the device. The generation
process also generates a self-signed certificate.

Change-Id: I114ffb8e0cbe3b1edaae7e69e8aa578cb835efc9
2012-08-22 08:52:55 -07:00
Jeff Brown
128e527ffc am 64ce3396: am 572a0859: Merge "Add FloatMath.pow." into jb-mr1-dev
* commit '64ce3396dba49e95a0fbf912890c91d3339b7b87':
  Add FloatMath.pow.
2012-08-21 23:20:22 -07:00
Jeff Brown
572a0859dd Merge "Add FloatMath.pow." into jb-mr1-dev 2012-08-21 23:15:56 -07:00
Jeff Brown
e2c279e8a1 Add FloatMath.pow.
Change-Id: I5c584f4894caba47fccfa22ba95f8665990d516c
2012-08-21 22:27:41 -07:00
Brian Muramatsu
e572f5e2af am 8318cf99: am a5d5d608: Merge "add wireless charger support" into jb-mr1-dev
* commit '8318cf99697c2911e31fb9b59ae8462637cb06bb':
  add wireless charger support
2012-08-20 17:02:54 -07:00
Brian Muramatsu
a5d5d608cc Merge "add wireless charger support" into jb-mr1-dev 2012-08-20 16:57:14 -07:00
Iliyan Malchev
904de8e4a9 am c456bf13: am 8756bd1d: Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev
* commit 'c456bf13acbc4c0e7660705c1ab2b5acc5bc254c':
  Revert "Revert "Add timestamp in scan results""
2012-08-20 15:01:44 -07:00
Iliyan Malchev
8756bd1d6b Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev 2012-08-20 14:57:14 -07:00
rich cannings
4d0b152482 am 8916311d: am a811e084: Merge "Pass URLs to package verifiers" into jb-mr1-dev
* commit '8916311dba4b980c98583ce6ca3333105a286523':
  Pass URLs to package verifiers
2012-08-20 14:28:40 -07:00
rich cannings
a811e0848d Merge "Pass URLs to package verifiers" into jb-mr1-dev 2012-08-20 14:24:49 -07:00
George Mount
eb9b2c095d am 00d2eba5: am 9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev
* commit '00d2eba50172a6763f3414c092be05a3b283b851':
  Add getDefaultUserAgent to WebSettings.
2012-08-20 13:43:14 -07:00
George Mount
9af67e8f6c Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 2012-08-20 13:37:55 -07:00
rich cannings
706e8ba26b Pass URLs to package verifiers
This change passes the originating URL and accompanied referrer to
package verifiers, when available.

Bug: 6544677
Change-Id: I9ebc71bc13f549bd88267e444816151a99bda000
2012-08-20 13:20:14 -07:00
Victoria Lease
df8ef4b139 DO NOT MERGE LocaleSpan makes Han disambiguation easy!
Cherry-pick of I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668 from master.

I've also provided TextView.setTextLocale() for use in single-language
TextViews.

Change-Id: I5692859bfd2aafc284172454d943afc250b22535
2012-08-20 13:17:58 -07:00
Iliyan Malchev
06c43d575c Revert "Revert "Add timestamp in scan results""
With b/6979211 fixed, we can reinstate timestamps.

This reverts commit 578531082b

Change-Id: I5dffc8d9701004f7c6325f21e1e33d1cdd2d05c0
2012-08-20 12:52:35 -07:00
Brian Muramatsu
37a37f445c add wireless charger support
bug: 6879638

- add new enum value BATTERY_PLUGGED_WIRELESS
- check for sys online file with contents "Wireless"

Change-Id: I22dc3c40f50573c98643e7b5cbcb237d0216530d
2012-08-20 10:04:12 -07:00
Jeff Brown
ae56520b36 am aa32f5f0: am 98365d76: Refactor for multi-display support.
* commit 'aa32f5f0db25a1553a353d93274f12432e5d07fc':
  Refactor for multi-display support.
2012-08-19 23:12:23 -07:00
Jeff Brown
98365d7663 Refactor for multi-display support.
Split WindowManagerImpl into two parts, the WindowManager
interface implementation remains where it is but the global
communications with the window manager are now handled by
the WindowManagerGlobal class.  This change greatly simplifies
the challenge of having separate WindowManager instances
for each Context.

Removed WindowManagerImpl.getDefault().  This represents the
bulk of this change.  Most of the usages of this method were
either to perform global functions (now handled by WindowManagerGlobal)
or to obtain the default display (now handled by DisplayManager).

Explicitly associate each new window with a display and make
the Display object available to the View hierarchy.

Add stubs for some new display manager API features.

Start to split apart the concepts of display id and layer stack.
since they operate at different layers of abstraction.
While it's true that each logical display uniquely corresponds to a
surface flinger layer stack, it is not necessarily the case that
they must use the same ids.  Added Display.getLayerStack()
and started using it in places where it was relatively easy to do.

Change-Id: I29ed909114dec86807c4d3a5059c3fa0358bea61
2012-08-19 22:42:08 -07:00
Dianne Hackborn
7ebc491aa4 am fabff0a0: am f337a89b: Merge "More view hierarchy, fragment debugging." into jb-mr1-dev
* commit 'fabff0a081079a4311c9b8f2d50527005d67c796':
  More view hierarchy, fragment debugging.
2012-08-17 17:42:36 -07:00
Dianne Hackborn
4702a85697 More view hierarchy, fragment debugging.
Add a View.toString() method.

Rename all of the View private flags to have a PFLAG prefix to
avoid going insane trying to figure out which constant goes with
which flag.

Activity.dump() now includes a summary of the activity's view
hierarchy, using the View.toString() method.

All exceptions thrown by FragmentManager now perform a dump of
the owning activity state, where appropriate.

Change-Id: I6482e397e10cb5a0612ab02ce6ed5131823437a6
2012-08-17 17:35:00 -07:00
Victoria Lease
ec97b4ddb4 LocaleSpan makes Han disambiguation easy!
I've also provided TextView.setTextLocale() for use in single-language
TextViews.

Change-Id: I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668
2012-08-17 16:12:46 -07:00
George Mount
9f410c540a Add getDefaultUserAgent to WebSettings.
Bug 6329117
 Add ability to get the default user-agent without creating
 a WebView. The method is implemented for WebSettingsClassic.

Change-Id: Id15fb57f65875752ccf644481a22b88644635f5d
2012-08-17 15:53:13 -07:00
Dianne Hackborn
7066aafa13 am 73c4e53f: am 79af1dd5: Switch public APIs to use new UserHandle class for identifying users.
* commit '73c4e53f0febb7ac0b454a15180ad0810950d6fe':
  Switch public APIs to use new UserHandle class for identifying users.
2012-08-17 11:47:38 -07:00
Dianne Hackborn
79af1dd54c Switch public APIs to use new UserHandle class for identifying users.
Gets rid of "yet another integer" confusion.

Change-Id: Id07ea7307aea7c62f0087c6663a1f1c08e2e5dee
2012-08-17 10:36:08 -07:00
Amith Yamasani
91413e745d am 745ec38b: am 9c38d6e5: Merge "UserHandle to UserSerialNo mapping" into jb-mr1-dev
* commit '745ec38bdca1e86dd0093ade4a382880fda7743a':
  UserHandle to UserSerialNo mapping
2012-08-17 09:24:34 -07:00
Amith Yamasani
2a00329c6d UserHandle to UserSerialNo mapping
Use AtomicFile for usermanager files.

Added a MANAGE_USERS permission that apps (signature permission) can use
to create/query/modify/remove users.

Change-Id: I5cf232232d0539e7508df8ec9b216e29c2351cd9
2012-08-17 09:06:10 -07:00
Nick Pelly
f34eae6d23 am 78e9ea9c: am 1f3f128a: Merge "Add javadoc for new location API\'s." into jb-mr1-dev
* commit '78e9ea9c7b4cce2317a24f57cd67d74c53bd1eaf':
  Add javadoc for new location API's.
2012-08-16 18:10:35 -07:00
Nick Pelly
1f3f128ad1 Merge "Add javadoc for new location API's." into jb-mr1-dev 2012-08-16 18:05:32 -07:00
Nick Pelly
4e31c4fffb Add javadoc for new location API's.
Change-Id: If15024ee88421c07ba3a174747774fc451fd002e
2012-08-16 17:59:34 -07:00
Jeff Brown
23e3ba534c am 778a616f: am 7c964e78: Merge changes I39804ee6,I6a5a7ea2 into jb-mr1-dev
* commit '778a616febe81517dc149bc4adc72a3e27bbc49e':
  Use spline interpolation for auto-brightness.
  Add FloatMath.hypot.
2012-08-16 02:11:25 -07:00