summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* am 73e243c4: Merge "Fix logging typos in GpsLocationProvider"Victoria Lease2013-01-021-3/+3
|\ | | | | | | | | * commit '73e243c4d271907d10f10b301b2d6854e1f63fe4': Fix logging typos in GpsLocationProvider
| * Merge "Fix logging typos in GpsLocationProvider"Victoria Lease2013-01-021-3/+3
| |\
| | * Fix logging typos in GpsLocationProviderMagnus Eriksson2012-12-211-3/+3
| | | | | | | | | | | | | | | Change-Id: Ibf12947f3758defee990fbf685323334b8d1eeda Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
* | | am 88fe4ebc: Merge "NsdService: Clear client info after resolution request ↵Irfan Sheriff2012-12-211-123/+129
|\ \ \ | |/ / | | | | | | | | | | | | | | | is serviced." * commit '88fe4ebc0b6e0499f247b5d896778dd72304bf9f': NsdService: Clear client info after resolution request is serviced.
| * | Merge "NsdService: Clear client info after resolution request is serviced."Irfan Sheriff2012-12-201-123/+129
| |\ \ | | |/ | |/|
| | * NsdService: Clear client info after resolution request is serviced.Vairavan Srinivasan2012-08-231-123/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the client requests tracked in mClientIds for resolution requests isn't cleared at all and causes failues of additional registration and discovery requests once the number of requests reaches MAX_LIMIT. In addition, bubble up unhandled native events to default state of nsd state machine. Change-Id: Ief14e0fff644aa2698fcddd71f538820f802be58
* | | am 7ad7b2c4: am 32b81205: Fix a bug where disabled auxilialy IME is ↵satok2012-12-191-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | unexpectedly re-enabled * commit '7ad7b2c437d10fb8e7221e6e28aa247217f93681': Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
| * \ \ am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '32b812054cce27d1c70b53ba8ac729c7186b105e': Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
| | * | | Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7872918 This is a serious issue which the disabled system auxilialy IME is unexpectedly re-enabled by re-building internal IMI cache. Change-Id: I0727cc973dfaea9823194021ce94af8665b98373
* | | | | Merge from AOSP staging branchJean-Baptiste Queru2012-12-181-2/+5
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
| * | | | Merge "Return error upon attempt to use non-existent APN"Robert Greenwalt2012-12-181-2/+5
| |\ \ \ \
| | * | | | Return error upon attempt to use non-existent APNMikael Hedegren2012-12-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | startUsingNetworkFeature will ignore errors from reconnect - causing ConnectivityService to send faulty information back to requester. Change-Id: I4e0fcc1addd84da409cdc1eed1a95d25d925e020
* | | | | | am 81e3c9ed: am d2a21d7f: Merge "Fade recents thumbnail to transparent ↵Jamie Gennis2012-12-171-3/+17
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | earlier." into jb-mr1.1-dev * commit '81e3c9ed66ce6968a331c4eafb969f66234d6e8a': Fade recents thumbnail to transparent earlier.
| * | | | | am d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into ↵Jamie Gennis2012-12-171-3/+17
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit 'd2a21d7fee7ba3c9596baf16cadc76dd607a5cb1': Fade recents thumbnail to transparent earlier.
| | * | | | Fade recents thumbnail to transparent earlier.Craig Mautner2012-12-171-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the gpu load by fading the recents thumbnail to an alpha of 0.0 before the remaining animations are completed. When alpha hits 0 the gpu treats the layer as hidden and can merge the remaining layers in time. This is a partial fix for 7729214. Change-Id: I9761bbd0554db6454c7eec0485be798b11672ff5
* | | | | | am 7739a5ca: am f5df689a: Fix NPE inside DreamManagerService.John Spurlock2012-12-141-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '7739a5ca673ba2264295641466569b2a1c788fe9': Fix NPE inside DreamManagerService.
| * | | | | am f5df689a: Fix NPE inside DreamManagerService.John Spurlock2012-12-141-0/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f5df689aa65682ce9217405e4a6b686e94129e8f': Fix NPE inside DreamManagerService.
| | * | | | Fix NPE inside DreamManagerService.John Spurlock2012-12-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:7741911 Change-Id: Icfc39b2d89f57bba79866030df85b822e3f73ae2
* | | | | | am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts."Jeff Sharkey2012-12-121-5/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit 'bf8de6a349e19b32a1577080a9d8bb7f92b2301f': Remove unnecessary locking for screen broadcasts.
| * | | | | Merge "Remove unnecessary locking for screen broadcasts."Jeff Sharkey2012-12-121-5/+3
| |\ \ \ \ \
| | * | | | | Remove unnecessary locking for screen broadcasts.Jeff Sharkey2012-12-041-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual handling occurs in updateScreenOn() on the other side of a handler, which acquires the lock correctly. Change-Id: Ibd359446dba8e88f81d34f1e10a6b5e150348f89
* | | | | | | am 79e0e3fd: Merge "return value of String.replace() is ignored."Robert Greenwalt2012-12-111-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '79e0e3fd69ba6426da6575e0c778eff205318172': return value of String.replace() is ignored.
| * | | | | | Merge "return value of String.replace() is ignored."Robert Greenwalt2012-12-111-2/+2
| |\ \ \ \ \ \
| | * | | | | | return value of String.replace() is ignored.You Kim2012-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id7330e1ffc9f429b22f153d8e644fa7c64354173 Signed-off-by: You Kim <you.kim72@gmail.com>
* | | | | | | | am 534de491: Merge "Make immersive mode public & imply update locking" into ↵Christopher Tate2012-12-111-1/+44
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-aah-dev * commit '534de491e6522465a7ad12d7cba9b2f80deab364': Make immersive mode public & imply update locking
| * | | | | | | Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-devChristopher Tate2012-12-111-1/+44
| |\ \ \ \ \ \ \
| | * | | | | | | Make immersive mode public & imply update lockingChristopher Tate2012-12-101-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activity.setImmersive(boolean) / android:immersive="bool" are now public. In addition, if the foreground activity is immersive then an update lock will be held on its behalf. This lets applications such as movie players suppress the display of intrusive notifications, OTA-availability dialogs, and the like while they are displaying content that ought not to be rudely interrupted. The update lock aspect of this mode is *advisory*, not binding -- the update mechanism is not actually constrained; it simply uses this information in deciding whether/when to prompt the user. It's more a guideline than a rule. Bug 7681380 Change-Id: I3c412a84cbf3933e3bf0168f2c71c54a86e4b7e5
* | | | | | | | | am ae5cc868: am 2735795f: Merge "If freeCache deletes APK, give out of space ↵Kenny Root2012-12-111-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error" into jb-mr1.1-dev * commit 'ae5cc8687b4fde98449cbec1fd9a610557ff1b5d': If freeCache deletes APK, give out of space error
| * | | | | | | | am 2735795f: Merge "If freeCache deletes APK, give out of space error" into ↵Kenny Root2012-12-111-0/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit '2735795f5aa906fbfd885dbacee1de0b41b80bf0': If freeCache deletes APK, give out of space error
| | * | | | | | | Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-devKenny Root2012-12-111-0/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | If freeCache deletes APK, give out of space errorKenny Root2012-12-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After DownloadManager has downloaded an application to cache to install during low memory condition, we try to free cache to fit the new application. The free cache function deletes older files first, but it will also delete the downloaded application (since it's in cache) as a last resort since installd has no context about it. This just changes the error code returned in this case so that we'll give something more meaningful to the user. A later fix should actually make this more sane. For instance: know which file to avoid deleting, not even trying to delete anything if it won't arrive at the desired free space. Bug: 7684538 Change-Id: Ide77320fc51a4f692ef8042cb0eafe17b5cd279d
* | | | | | | | | | am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." ↵Jeff Brown2012-12-112-0/+51
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1.1-dev * commit '3781523becbb2d576761c2701763ff3588294a97': Play a tone when wireless charging begins.
| * | | | | | | | | am eaae7d97: Merge "Play a tone when wireless charging begins." into ↵Jeff Brown2012-12-112-0/+51
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit 'eaae7d976a5629e064af06f0e2c10f97f1a8c462': Play a tone when wireless charging begins.
| | * | | | | | | | Merge "Play a tone when wireless charging begins." into jb-mr1.1-devJeff Brown2012-12-112-0/+51
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Play a tone when wireless charging begins.Jeff Brown2012-12-112-0/+51
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only plays a tone if the battery level is below 95% which is the same heuristic used when determining whether to turn the screen on. Use new low battery and wireless charging sounds on Mako. Bug: 7371658 Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
* | | | | | | | | | am 49cc9cb8: am 5def50da: Merge "Fallback to default dream if the current ↵John Spurlock2012-12-111-1/+34
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dream is removed." into jb-mr1.1-dev * commit '49cc9cb85376bad11611966fcdbe58dae1ab7a56': Fallback to default dream if the current dream is removed.
| * | | | | | | | | am 5def50da: Merge "Fallback to default dream if the current dream is ↵John Spurlock2012-12-111-1/+34
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed." into jb-mr1.1-dev * commit '5def50da0de624abeafafe71dc72b4baf423b985': Fallback to default dream if the current dream is removed.
| | * | | | | | | | Fallback to default dream if the current dream is removed.John Spurlock2012-12-101-1/+34
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To minimize fix size, return only valid dreams from the service api. Settings will "just work" with no changes. Bug:7699398 Change-Id: I3eb88237a8ccc421fdb68d1de19820614b13d7b8
* | | | | | | | | am a98cd512: Merge "Use asynchronous messages for input method events." into ↵Mita Yun2012-12-101-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-aah-dev * commit 'a98cd5122be643a51f563d02069e8f9409d44394': Use asynchronous messages for input method events.
| * | | | | | | | Merge "Use asynchronous messages for input method events." into jb-mr1-aah-devMita Yun2012-12-101-2/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Use asynchronous messages for input method events.Mita Yun2012-12-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves the throughput of IME event handling by ensuring that input events do not get serialized behind UI traversal and drawing messages such as when the UI is animating. Added support for creating an asynchronous Handler as part of a HandlerCaller. It turns out we should be using an asynchronous Handler not only in IME dispatch but also in accessibility and wallpaper events where HandlerCaller is used. So fixed those services to also use an asynchronous Handler. Change-Id: I0b19140c9d5ca6ee300c1a150c48312fd55ed8eb
* | | | | | | | | am 2588648b: am 203f69f0: Merge "Call setSize to sync Surface to ↵Sascha Prueter2012-12-072-39/+53
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev * commit '2588648b5268526bdc9ed7fb4e9eac36c8c693dc': Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
| * | | | | | | | am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT ↵Sascha Prueter2012-12-072-39/+53
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into jb-mr1.1-dev * commit '203f69f0998d982205b1c9f550576024654e6bc3': Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
| | * | | | | | Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGECraig Mautner2012-12-072-39/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecentsActivity screenshots are called for very quickly after WindowStateAnimator prepareSurface(). Without enough delay the Surface.setLayer call does not propagate to the SurfaceFlinger and the screenshot is incorrect (black) because it stops sampling the layers too early. This fix calls Surface.setSize() for each sampled Surface in screenshots. setSize forces the SurfaceFlinger to process all transactions queued before returning from closeTransaction. Bug 7552304 fixed. Change-Id: I1911dfa0b09cab713c55f5ba0c612496337a77df Conflicts: services/java/com/android/server/wm/WindowManagerService.java
* | | | | | | | am ff411ddb: Merge "Framework: Use holo alert drawables"Adam Powell2012-12-071-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'ff411ddb40d250f075bfe8c4940931b27079f5cb': Framework: Use holo alert drawables
| * | | | | | | Merge "Framework: Use holo alert drawables"Adam Powell2012-12-071-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Framework: Use holo alert drawablesBjörn Lundén2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the current usage of the GB alert drawable with theme-consistent holo ones. Change-Id: I8594ef8276db5bb0e192f3a541937d7281321043
* | | | | | | | | am 5b6069ce: Merge "Wrong parameter in LocationManagerService"Victoria Lease2012-12-071-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b6069ce3a87d30960e9ef5870299db90090776b': Wrong parameter in LocationManagerService
| * | | | | | | | Merge "Wrong parameter in LocationManagerService"Victoria Lease2012-12-061-2/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Wrong parameter in LocationManagerServiceYou Kim2012-12-071-2/+1
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong parameter in removeTestProvider Change-Id: Ibf93833697c865904f29821e5778853127e5fb00 Signed-off-by: You Kim <you.kim72@gmail.com>