summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "resolved conflicts for merge of b6d6c04a to master"Andreas Gampe2015-03-112-4/+6
|\
| * resolved conflicts for merge of b6d6c04a to masterAndreas Gampe2015-03-102-4/+6
| |\ | | | | | | | | | Change-Id: I5286b9fe2d9bde4b219496e593cf028cc4c75bc7
| | * am 174a4488: am 7f383873: Merge "Frameworks/base: Pass APK debugability to ↵Andreas Gampe2015-03-102-4/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | installd" * commit '174a44888ec56f688426c80d50b9e0021f47c16f': Frameworks/base: Pass APK debugability to installd
| | | * am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd"Andreas Gampe2015-03-102-4/+6
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '7f383873566024c7121cadae3bbdd2a7c47150bc': Frameworks/base: Pass APK debugability to installd
| | | | * Merge "Frameworks/base: Pass APK debugability to installd"Andreas Gampe2015-03-092-4/+6
| | | | |\
| | | | | * Frameworks/base: Pass APK debugability to installdAndreas Gampe2015-03-092-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id17ec72babe2ee88713a0d274eff86508de30666
* | | | | | Merge "Notify TrustAgentService when device policy configuration no longer ↵Adrian Roos2015-03-111-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | applies"
| * | | | | | Notify TrustAgentService when device policy configuration no longer appliesAdrian Roos2015-03-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updates the outdated javadoc to match the current API. Bug: 19500731 Change-Id: I7976bbcc815b84e168718672377a963ffea68c51
* | | | | | | Merge "Handle simultaneous connect of devices with the same "type" (as in USB)"Paul McLean2015-03-102-98/+141
|\ \ \ \ \ \ \
| * | | | | | | Handle simultaneous connect of devices with the same "type" (as in USB)Paul McLean2015-03-102-98/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I163bf8e33ccf5aacc7ba21775916727430327f18 Bug: 19563570
* | | | | | | | Merge "Revert "Remove activity and window stacks when last task is removed.""Wale Ogunwale2015-03-103-26/+13
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Revert "Remove activity and window stacks when last task is removed."Wale Ogunwale2015-03-103-26/+13
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0f95e3f0753508344b198c0a76afb892df514f52. Bug: 19644506 Bug: 19083170 Change-Id: I2eb2a0400be58fe2c5d48a4b68368725e98aaf6f
* | | | | | | Merge "ZenLog: Track changes to effect suppressorship."John Spurlock2015-03-102-0/+26
|\ \ \ \ \ \ \
| * | | | | | | ZenLog: Track changes to effect suppressorship.John Spurlock2015-03-092-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19656287 Change-Id: Ibbb42bef68f4588beac4ca971db73a19678c2b4c
* | | | | | | | Merge "Move more file handling into LockSettingsStorage"Robin Lee2015-03-101-4/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Move more file handling into LockSettingsStorageRobin Lee2015-03-101-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strengthens the guarantee of only one kind of lock type existing at one time by clearing all of the relevant files out closer to time of write. Change-Id: I141103dab5d7d4bc80b05a22b8566326d1c9e7e1
* | | | | | | | | Merge "MediaSession: Notify PlaybackInfo callbacks when playback type changes."John Spurlock2015-03-101-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MediaSession: Notify PlaybackInfo callbacks when playback type changes.John Spurlock2015-03-101-0/+2
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19665979 Change-Id: I506a71330ca04a678027f5969638fd1685326b2d
* | | | | | | | | Merge "Revert "Revert "Add a timeout state to frozen windows"""Craig Mautner2015-03-101-9/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Revert "Add a timeout state to frozen windows""Craig Mautner2015-03-101-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Insert correct bug id: Fixes bug 15664090. This reverts commit 1a07846d4d7f1665345a27da11d0f8d518b3b431. Change-Id: Id5fd52acc47cb6f50485c14e75a448511d806ae4
* | | | | | | | | | Merge "Revert "Add a timeout state to frozen windows""Craig Mautner2015-03-101-17/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Revert "Add a timeout state to frozen windows"Craig Mautner2015-03-101-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong bug listed on comment. Resubmitting with correct bug listed. This reverts commit a75e3e0b44e31ee5d042480d3da8d13cad56dc5a. Change-Id: I49cb364c44763fd2d0c120d6998281d38571050b
* | | | | | | | | | Merge "Add a timeout state to frozen windows"Craig Mautner2015-03-101-9/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add a timeout state to frozen windowsCraig Mautner2015-03-051-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an activity stops drawing following a rotation the rotation screenshot would become stuck on top of all the other windows. The timeout was being acknowledged but mWindowsFreezingScreen was set to true which kept stopFreezingDisplayLocked() from dismissing the screen rotation animation. By changing mWindowsFreezingScreen from a two state variable to a three state variable, including a timeout state we allow stopFreezingDisplayLocked() to continue and dismiss the screen rotation animtion. This change also reduces the APP_FREEZING_TIMOEOUT from 5 seconds to 2 seconds. Fixes bug 19595913. Change-Id: Ida5aca002a82ec8fe1ea99f0ced814c5c8f01a95
* | | | | | | | | Merge "Battery stats issues: fix jiffy handling, print scan counts."Dianne Hackborn2015-03-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Battery stats issues: fix jiffy handling, print scan counts.Dianne Hackborn2015-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #19431959: Framework incorrectly assumes that kernel clock_ticks are 10ms We now retrieve the time of a jiffy from the kernel, and all CPU times are now handled in milliseconds. Issue #19571810: Add per-app breakdown of number of WiFi scans in batterystats checkin data Added to the report (the information was already being tracked). Change-Id: If1702d6b9bcf851704129f1811471e68ed576a5d
* | | | | | | | | | Merge "AudioService: Fix device dump in dumpsys output."John Spurlock2015-03-091-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AudioService: Fix device dump in dumpsys output.John Spurlock2015-03-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19653026 Change-Id: Id09a502f1507477403c49be32ee0ed0f00ab288f
* | | | | | | | | | | resolved conflicts for merge of ca54b876 to masterWale Ogunwale2015-03-091-23/+20
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | Change-Id: I3148551b9809fb5c36007b26f26acf812b2f654d
| * | | | | | | | | | am edc3c893: am 14ccc26f: Merge "[ActivityManager] Skip receiver precisely."Olawale Ogunwale2015-03-091-16/+11
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'edc3c8939f3cde4ab9343e7654f5dac1122fb470': [ActivityManager] Skip receiver precisely.
| | * | | | | | | | | am 14ccc26f: Merge "[ActivityManager] Skip receiver precisely."Olawale Ogunwale2015-03-091-16/+11
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '14ccc26f1ce006963f1a0b7a917404aa6a0e9da1': [ActivityManager] Skip receiver precisely.
| | | * | | | | | | | Merge "[ActivityManager] Skip receiver precisely."Olawale Ogunwale2015-03-091-16/+11
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | | * | | | | | | [ActivityManager] Skip receiver precisely.riddle_hsu2015-03-041-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symptom: Report broadcast ANR on a dead process. Detail and sample: http://code.google.com/p/android/issues/detail?id=158329 Root cause: app.curReceiver can only remember the last running. If an application is both receiving FG and BG broadcast, only one of queue can discard, the remain one will still count as timeout. Solution: Select the skip-tartget-receiver by comparing the skipping app to the first record of mOrderedBroadcasts of each broadcast queues. Change-Id: Ic68d56f21b417a34f2d30d64ecfbed09c5e1764d
* | | | | | | | | | | Merge "Prevent receiver leak in TrustAgentWrapper"Adrian Roos2015-03-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Prevent receiver leak in TrustAgentWrapperAdrian Roos2015-03-051-0/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19601687 Change-Id: Idfe5429926e1c849dc2d908b4877d8410335391c
* | | | | | | | | | | am 1b8df04b: am 8aeab6c8: Allow the keyguard service to be configurable.Bryce Lee2015-03-091-5/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b8df04b8d754f68dc6bfa6caa9e0a2666d16933': Allow the keyguard service to be configurable.
* | | | | | | | | | | am 168d0ade: am 1e53b98c: Merge "Allow press and hold from non-interactive." ↵Bryce Lee2015-03-091-4/+19
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-modular-dev * commit '168d0ade0cb5a733c83d7dcfdf0a0efa3250cb16': Allow press and hold from non-interactive.
* | | | | | | | | | Block setting wallpapers from managed profiles.Benjamin Franz2015-03-093-8/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silently fail when a managed profile app tries to change the wallpaper and return default values for getters in that case. This is implemented through a new AppOp that is controlled by a new user restriction that will be set during provisioning. Bug: 18725052 Change-Id: I1601852617e738be86560f054daf3435dd9f5a9f
* | | | | | | | | | Merge changes Ib5cc22db,I93e0c449,I65cd4cfd,I1cef3bd4,I628c0468Mike Lockwood2015-03-071-4/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: MIDI Manager: Add explicit close mechanism for input and output ports MidiDeviceService: Add getDeviceInfo() accessor method Add MidiDevice.close() method so we can clean up our ServiceConnection Make MidiSender and MidiReceiver abstract classes, rename MidiReceiver.post() to receive() Eliminate MidiPort base class for MidiInputPort and MidiOutputPort
| * | | | | | | | | Make MidiSender and MidiReceiver abstract classes, rename ↵Mike Lockwood2015-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MidiReceiver.post() to receive() Change-Id: I1cef3bd48ca0acf2968c9de223f78445f3434404
| * | | | | | | | | Eliminate MidiPort base class for MidiInputPort and MidiOutputPortMike Lockwood2015-03-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I628c0468ac980eee909add53a4d6e55e9b358603
* | | | | | | | | | Add new debug feature to automatically create heap dumps.Dianne Hackborn2015-03-063-8/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not yet working, unless you turn off SELinux enforcing. We need to update SElinux to allow the system process to give apps access to /data/system/heapdump/javaheap.bin. Currently watching can only be enabled through the shell, such as: adb shell am set-watch-heap com.android.systemui 1024 The last number is the process pss size in bytes, so this is asking us to warn if it goes about 1K which will be all the time. Change-Id: I2089e5db2927afca0bf01a363c6247ee5dcb26e8
* | | | | | | | | | Merge "Don't enqueue allowBackup=false apps for full backup attempts"Christopher Tate2015-03-061-9/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't enqueue allowBackup=false apps for full backup attemptsChristopher Tate2015-03-051-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are correctly refusing to actually process apps for backup if they have declared android:allowBackup="false" in their manifests, but we're still wasting bookkeeping & a certain amount of work in tracking them as part of the full backup queue. Fix that; now we recognize that they shouldn't be in the queue in the first place. When reinflating the queue at boot time we also re-verify the participation of each mentioned app so that we properly drop ones that have been uninstalled or altered such that they are no longer full-data backup candidates. Finally, if an app previously implemented key/value backup, so we think we'll be running it in that mode in a future backup pass, but has been updated to use the full-data path instead, we don't want to go ahead and run a key/value pass on it. Added a backstop check and proceed gracefully in this situation. (Also add bit more debug-build logging to LocalTransport) Bug 19462310 Change-Id: I07ab4f2e68e92766d9e8f2595fa763c91193d743
* | | | | | | | | | | Merge "Cleanup Bitmap JNI attempt #2"John Reck2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cleanup Bitmap JNI attempt #2John Reck2015-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original version missed a spot This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
* | | | | | | | | | | | Merge "Allow device and profile owners to set a user icon."Julia Reynolds2015-03-051-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow device and profile owners to set a user icon.Julia Reynolds2015-03-041-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c2bafb85cff3fa063af7a2f27b76c69172f0525
* | | | | | | | | | | | | am 0fcfae88: am ecc20aaf: am 63ab6eb2: Merge "Frameworks/base: Use ArraySet ↵Andreas Gampe2015-03-051-10/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more explicitly" * commit '0fcfae88f2737b004cae83a77d590046e2b08ef3': Frameworks/base: Use ArraySet more explicitly
| * | | | | | | | | | | | am ecc20aaf: am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"Andreas Gampe2015-03-051-10/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecc20aafa6f3d272292e7b3577c99f2c127e590f': Frameworks/base: Use ArraySet more explicitly
generated by cgit v1.1 at 2025-01-07 05:55:04 +0000