summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix API review bugs." into jb-mr1-devDianne Hackborn2012-09-171-1/+1
|\
| * Fix API review bugs.Dianne Hackborn2012-09-171-1/+1
| | | | | | | | | | | | | | | | | | 7173152 API REVIEW: android.content.pm.PackageUserState 7172969 API REVIEW: android.app.PendingIntent 7172730 API REVIEW: android.content.Context 7172726 API REVIEW: android.manifest.permission Change-Id: Iad470256d3b5ca5596487f6a699ec1871457c3b5
* | Merge "Specify max go intent for wifi display" into jb-mr1-devIrfan Sheriff2012-09-171-0/+2
|\ \
| * | Specify max go intent for wifi displayIrfan Sheriff2012-09-171-0/+2
| | | | | | | | | | | | | | | | | | | | | For p2p and sta single channel concurrency, we need the device to be a GO Change-Id: I8c3f180b8fc450238e24dace478f03cdf4e370a7
* | | Merge "Try again to fix issue #6912004:tap on gmail notification sends me to ↵Dianne Hackborn2012-09-172-20/+40
|\ \ \ | | | | | | | | | | | | home screen" into jb-mr1-dev
| * | | Try again to fix issue #6912004:tap on gmail notification sends me to home ↵Dianne Hackborn2012-09-172-20/+40
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen Add a new call to the activity manager to tell it when the activity is resumed, so it can mark its state as dirty then instead of when it first tries to create it. Also tweak things to update the LRU list for the upcoming activity at the point we start pausing the current activity, to avoid an inefficiency where we may decide to kill the process of the upcoming activity if it is at the end of the LRU list. Change-Id: Ia6dc8c34dc6d4b085a1efbe3a5d5f47721d55078
* | | Merge "Add error information to event logs." into jb-mr1-devGeremy Condra2012-09-171-5/+12
|\ \ \
| * | | Add error information to event logs.Geremy Condra2012-09-171-5/+12
| | | | | | | | | | | | | | | | Change-Id: Ie4bbb888f4fac4db42a60b9fdd6818af24b834bd
* | | | Merge "Use shared app gid for dalvik cache" into jb-mr1-devKenny Root2012-09-171-2/+2
|\ \ \ \
| * | | | Use shared app gid for dalvik cacheKenny Root2012-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For forward-locked apps, we need to be able to read the optimized dex file from a common place. Make it owned by the shared app GID as well. Bug: 7178231 Change-Id: Ib36d79e8df69d58e8e1e0f167659df995dc84b84
* | | | | Merge "Start userId from 10, reserving 1-9 for special use in the future." ↵Amith Yamasani2012-09-171-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | into jb-mr1-dev
| * | | | Start userId from 10, reserving 1-9 for special use in the future.Amith Yamasani2012-09-171-1/+1
| | |/ / | |/| | | | | | | | | | Change-Id: I3d0c1717d8b3add75ba43ed98e53ba02e6682c34
* | | | Merge "Swap remote submix initialization order." into jb-mr1-devJeff Brown2012-09-171-6/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Swap remote submix initialization order.Jeff Brown2012-09-171-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to turn the submix on before connecting and off after disconnecting. Change-Id: I53389c3b61e6d663855accd0461eed42a67d9d2b
* | | | Merge "Add UserManager.getUserIcon()" into jb-mr1-devAmith Yamasani2012-09-171-4/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Add UserManager.getUserIcon()Amith Yamasani2012-09-171-4/+17
| |/ / | | | | | | | | | | | | | | | | | | So that we don't abuse the setUserIcon() for reading. So the new method won't try to create the file, only return it if it exists. Change-Id: I7a81d3f1b29d14d37e71f531744ce39f21d827ac
* | | Add debug to help with b/7135184.Craig Mautner2012-09-172-16/+29
|/ / | | | | | | | | | | | | | | Change-Id: I0d3b60b3e123d35bd557d47e3344ebea1964380b Conflicts: services/java/com/android/server/wm/WindowAnimator.java
* | Merge "Add restoreCallingIdentity under finally" into jb-mr1-devIrfan Sheriff2012-09-161-8/+14
|\ \
| * | Add restoreCallingIdentity under finallyIrfan Sheriff2012-09-161-8/+14
| | | | | | | | | | | | Change-Id: I068b1a2fc93300aa9bd17da6933bc8c5f0a6b5e4
* | | Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on ↵Dianne Hackborn2012-09-161-2/+2
|\ \ \ | |/ / |/| | | | | secondary user" into jb-mr1-dev
| * | Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary userDianne Hackborn2012-09-161-2/+2
| |/ | | | | | | Change-Id: I0ab372978f8599d0fe8d5da8aeb73965ab85797f
* | Fix permission accessing getCurrentUserIrfan Sheriff2012-09-161-1/+5
|/ | | | | Bug: 7174737 Change-Id: I0a6a9a46f4115743d16ada401cd67e3cf30fb380
* Merge "Enable package verification" into jb-mr1-devrich cannings2012-09-161-1/+1
|\
| * Enable package verificationrich cannings2012-09-161-1/+1
| | | | | | | | | | | | | | Turn on package verification, if a verifier exists. Play app is a verifier. Bug: 7064853 Change-Id: Id7d478a216d10b0a612678d6a9b0ee7f2037204a
* | Merge "Set backlight brightness in correct order." into jb-mr1-devIliyan Malchev2012-09-162-7/+20
|\ \ | |/ |/|
| * Set backlight brightness in correct order.Jeff Brown2012-09-162-7/+20
| | | | | | | | | | | | | | | | Disable backlight before turning off the screen. Enable backlight after turning on the screen. Bug: 7016215 Change-Id: Idb763f85f7a40e852483c57e0a0d1b27eb943f08
* | Merge "Return empty scan results for background user" into jb-mr1-devIrfan Sheriff2012-09-161-1/+7
|\ \
| * | Return empty scan results for background userIrfan Sheriff2012-09-161-1/+7
| | | | | | | | | | | | | | | Bug: 7087342 Change-Id: I62493e5004111311b7ac9b7610c85e6784e2c7e4
* | | Make more items per-Display.Craig Mautner2012-09-166-169/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | Moving DimSurfaces, DimBackgrounds and Rotation surfaces into per-display class. Fixes bug 7167028. Change-Id: I7408b3a27b5a7a8d0d59e9d6109c002fc627e536
* | | Merge "More multi-user stuff." into jb-mr1-devDianne Hackborn2012-09-165-182/+459
|\ \ \
| * | | More multi-user stuff.Dianne Hackborn2012-09-155-182/+459
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New public APIs to find out when a user goes to the foreground, background, and is first initializing. - New activity manager callback to be involved in the user switch process, allowing other services to let it know when it is safe to stop freezing the screen. - Wallpaper service now implements this to handle its user switch, telling the activity manager when it is done. (Currently this is only handling the old wallpaper going away, we need a little more work to correctly wait for the new wallpaper to get added.) - Lock screen now implements the callback to do its user switch. It also now locks itself when this happens, instead of relying on some other entity making sure it is locked. - Pre-boot broadcasts now go to all users. - WallpaperManager now has an API to find out if a named wallpaper is in use by any users. Change-Id: I27877aef1d82126c0a1428c3d1861619ee5f8653
* | | | Merge "Fix debug log." into jb-mr1-devDianne Hackborn2012-09-161-1/+3
|\ \ \ \
| * | | | Fix debug log.Dianne Hackborn2012-09-141-1/+3
| |/ / / | | | | | | | | | | | | Change-Id: If65abf43ee7a455b12d49b5800657dbf4489e5b9
* | | | Move NetworkPolicy from apps to UID.Jeff Sharkey2012-09-141-80/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For multi-user devices, switch to storing policy per-user instead of per-app. Also watch for user added/removed broadcasts to clean up policies and apply global restrictions. Bug: 7121279 Change-Id: Ia7326bd0ebe0586fa4ec6d3a62f6313dc8814007
* | | | Merge "Fix default population of wifi settings" into jb-mr1-devChristopher Tate2012-09-141-17/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix default population of wifi settingsChristopher Tate2012-09-141-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various wifi settings that are explicitly defaulted did not get their default code properly converted to refer to the correct settings database table. A collection of moved-to-Global settings that had not yet been marked @deprecated in the Secure.* namespace are now so marked. Also updated the namespace used to refer to wifi settings from the Wifi Service. These changes are cosmetic, but they do eliminate a number of runtime log messages. Bug 7153671 Change-Id: I9e5b6464d025cfb480ef97373996e38e82f90593
* | | | Merge "Send more information to verifiers" into jb-mr1-devrich cannings2012-09-141-0/+12
|\ \ \ \
| * | | | Send more information to verifiersrich cannings2012-09-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send package name, version code and the uid of the application requesting the install to package verifiers. Bug: 7164155 Change-Id: I2464dc5d4551f60b4f38f7982495a8920c83e1cd
* | | | | Some formatting missed in the previous patchSvetoslav Ganov2012-09-141-27/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I299090ca67b1d90cf75a46dc85b13970d32511e5
* | | | | Merge "Adding accessibility events for touch and gesture detection states." ↵Svetoslav Ganov2012-09-142-56/+115
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into jb-mr1-dev
| * | | | Adding accessibility events for touch and gesture detection states.Svetoslav Ganov2012-09-142-56/+115
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Currently the system fires accessibility events to announce the start and end of a touch exploration gesture. However, such a gesture starts after we have decided that the user is not performing a gesture which is achieved by measuring speed of movement during a threshold distance. This allows an accessibility service to provide some feedback to the user so he knows that he is touch exploring. This change adds event types for the first and last touches of the user. Note that the first touch does not conincide with the start of a touch exploration gesture since we need a time or distance to pass before we know whether the user explores or gestures. However, it is very useful for an accessibility service to know when the user starts to interact with the touch screen so it can turn the speech off, to name one compelling use case. This change also provides event types for the start and end of gesture detection. If the user has moved over the threshold with a speed greater than X, then the system detects gestures. It is useful for an accessibility service to know the begin and end of gesture detection so it can provide given feedback type for such a gesture, say it may produce haptic feedback or sound that differs for the one for touch exploration. The main benefit of announcing these new events is that an accessibility service can provide feedback for each touch state allowing the user to always know what he is doing. bug:7166935 Change-Id: I26270d774cc059cb921d6a4254bc0aab0530c1dd
* | | | Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-devBen Gruver2012-09-141-2/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | DEFAULT_VERIFY_ENABLE turns verification offrich cannings2012-09-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When DEFAULT_VERIFY_ENABLE == false, package verification must be completely off. Bug: 7132197 Change-Id: Icc0dbb4a3f4f5f00ddadecda6cc42976618c4332
* | | | Merge "Actually move to Global settings." into jb-mr1-devJeff Sharkey2012-09-142-23/+38
|\ \ \ \
| * | | | Actually move to Global settings.Jeff Sharkey2012-09-142-23/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add better ConnectivityService logging. Bug: 7157464 Change-Id: Ia235a7e62ed809240913c4782920c1410c7d597d
* | | | | Merge "Get correct user's package info during clip processing" into jb-mr1-devChristopher Tate2012-09-141-5/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Get correct user's package info during clip processingChristopher Tate2012-09-141-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clear the binder identity correctly for purposes of doing that query. Bug 7162477 Change-Id: Ie9e43a2d8fc964d1be649887905244dcceaa3c80
* | | | | Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-devJeff Sharkey2012-09-141-17/+17
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Move to Global.NETSTATS and Global.NTP constants.Jeff Sharkey2012-09-141-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7157464 Change-Id: Ief10fd37940f62420f5684940994c9f93802e0be
* | | | | Add support for settings for lock widgetsJim Miller2012-09-141-1/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: Iade094c6f32a7653bdbbd4921d345d68f2443ff4