summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Improve the reboot-to-recovery dialogs" into mnc-devTao Bao2015-06-091-51/+99
|\
| * Improve the reboot-to-recovery dialogsTao Bao2015-06-081-51/+99
| | | | | | | | | | | | | | | | | | To address the UX comments, this CL modifies the dialogs when the device is rebooted to install an update or to perform factory data reset. Bug: 20949086 Change-Id: Icc1cdec7e0336ae37c17fffde7dae7ff882e5470
* | Merge "UsbMidiDevice: Only keep ALSA devices open when device is in use" ↵Mike Lockwood2015-06-092-63/+196
|\ \ | | | | | | | | | into mnc-dev
| * | UsbMidiDevice: Only keep ALSA devices open when device is in useMike Lockwood2015-06-082-63/+196
| | | | | | | | | | | | | | | | | | | | | | | | This should fix contention problems for apps using USB APIs to implement MIDI support Bug: 20949468 Bug: 21630625 Change-Id: I32b44330ca0310a4693fd56a4b01ad399f82c1c9
* | | Remove the ability to set a preferred setup activity.Julia Reynolds2015-06-092-91/+6
| | | | | | | | | | | | | | | Bug: 21557327 Change-Id: I8c1809d25c5f5fcd186dfc0636d8ac47ed5fc903
* | | Move linking and directory creation logic to installd.Narayan Kamath2015-06-092-66/+56
| | | | | | | | | | | | | | | | | | bug: 20889739 Change-Id: I1763376a2fbb25f3a3d55f60c1940cdbddcded07
* | | Merge "Format volumes with "auto" filesystem type." into mnc-devJeff Sharkey2015-06-091-1/+1
|\ \ \
| * | | Format volumes with "auto" filesystem type.Jeff Sharkey2015-06-081-1/+1
| |/ / | | | | | | | | | | | | Bug: 20275581 Change-Id: Id4c7e1ad83f28110a77fecf563e1bcb8ca4d4d9a
* | | Fix lockscreen launch animationsJorim Jaggi2015-06-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix the case in WindowAnimator where the real window was ready to draw while the starting window was playing the unlock animation. - Always delay Keyguard done when clicking on a notification. Some notifications started services/broadcasts instead and thus we didn't wait, making it a jarring transition. In case the notification click doesn't result in an activity start at all, we still have the timeout that saves us from freezing (3s), but most notifications should start an activity. Bug: 19412725 Change-Id: I78f6839f59986f8f7ecdff70227d5690a504f475
* | | Merge "Update and cleanup FingerprintManager API to new spec" into mnc-devJim Miller2015-06-092-23/+40
|\ \ \
| * | | Update and cleanup FingerprintManager API to new specJim Miller2015-06-082-23/+40
| |/ / | | | | | | | | | | | | | | | Fixes bug 21040383 Change-Id: Ib97d486535869814d5b449cccb31670e8f412552
* | | Close assist when launching intents from notification shadeJorim Jaggi2015-06-092-4/+25
| | | | | | | | | | | | | | | Bug: 21035363 Change-Id: I51a6dbe5f0d93aaf81a38d1f1afacaaeaf7732e2
* | | Merge "Ignore carrier apps when checking for idleness" into mnc-devZach Johnson2015-06-091-0/+11
|\ \ \ | |/ / |/| |
| * | Ignore carrier apps when checking for idlenessZach Johnson2015-06-081-0/+11
| | | | | | | | | | | | | | | | | | | | | Also introduce a way to check if a package has carrier privileges for any active phone. Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
* | | resolved conflicts for merge of 17ba2e6c to mnc-devFilip Gruszczynski2015-06-081-10/+10
|\ \ \ | |/ / |/| | | | | Change-Id: I9177f0e994e1e8fba02faf5a13f2dcec950ec5e0
| * | am aaf1811d: Calculate outsets before window frame adjustment.Filip Gruszczynski2015-06-051-9/+10
| |\ \ | | | | | | | | | | | | | | | | * commit 'aaf1811dda607f10ab0f0ae80fd2b2b7cf9d0069': Calculate outsets before window frame adjustment.
| | * | Calculate outsets before window frame adjustment.Filip Gruszczynski2015-06-051-9/+10
| | | | | | | | | | | | | | | | | | | | Bug: 21635628 Change-Id: I2d818e6d543c885dca2d19553bad5ce1adda95a6
* | | | Merge "apply force hiding of window only when it is main display" into mnc-devkeunyoung2015-06-081-1/+1
|\ \ \ \
| * | | | apply force hiding of window only when it is main displaykeunyoung2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - force hiding window for non-main display leads into stopping rendering of windows in non-main display. - change the logic to skip force hiding if it is not main display. bug: 21665476 Change-Id: I2e23f3a2d6e3cbf6819ade1798360efe2986e80e
* | | | | Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" ↵Dianne Hackborn2015-06-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | Fix issue #21572679: API Review: ActivityOptions, usage time reportDianne Hackborn2015-06-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I62751e93e39f90d5d2ec725586880724f3edbbc7
* | | | | | Merge "MidiManager: proxy all requests to open devices through MidiService" ↵Mike Lockwood2015-06-081-65/+369
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | MidiManager: proxy all requests to open devices through MidiServiceMike Lockwood2015-06-041-65/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when a MidiManager client opened a virtual or Bluetooth device, the client bound directly to the virtual device's MidiDeviceService or BluetoothMidiDevice's IMidiDeviceServer for the given BluetoothDevice. Only USB devices were opened in MidiService. Now opening any type of MIDI device is done via IMidiManager.openDevice() or IMidiManager.openBluetoothDevice(). MidiService tracks all connnections between clients and devices. Services that implement virtual devices must now require android.permission.BIND_MIDI_DEVICE_SERVICE so only MidiService can bind to these services. Bug: 21044677 Change-Id: I7172f7b1e0cbfe4a2a87dff376c32dc9b41aa563
* | | | | | | Merge "Add SYSTEM_DIR check to upgrade-key-set verification." into mnc-devdcashman2015-06-081-3/+10
|\ \ \ \ \ \ \
| * | | | | | | Add SYSTEM_DIR check to upgrade-key-set verification.dcashman2015-06-081-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21697139 Change-Id: I7e6ce3d7f231e0ca5da1f501c80342a04f6c2a1e
* | | | | | | | Merge "Include launched packageName in systrace." into mnc-devWale Ogunwale2015-06-082-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Include launched packageName in systrace.Narayan Kamath2015-06-082-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to tell which package the activity manager is launching. The downside here is that each launch shows up in a separate row in the systrace, but this matches up with the "Start proc:" label, which contains the package name as well and makes it easier to inspect both simultaneously. bug: 21632700 Change-Id: I20ebc2f2a2cf0dc74c6d7daa4bafa381ae4c4060
* | | | | | | | | Merge "Wait for wakeup_reasons on first init" into mnc-devAdam Lesinski2015-06-081-19/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Wait for wakeup_reasons on first initAdam Lesinski2015-06-051-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if we were initializing the wakeup callback for the first time, we would read the wakeup_reason file and ignore the contents, sending a wakeup_reason of "unknown" up to BatteryStats. Now we initialize the callback and wait on it immediately. Wakeup reasons are reset when we go into sleep, so when we wakeup, we will always have fresh wakeup reasons. Bug:21665793 Change-Id: I20832d8a143fc2715915fcecf4bb71980f279440
* | | | | | | | | | Merge "Revert "Print exception stacktrace on failed scanPackageLI"" into mnc-devDimitry Ivanov2015-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Print exception stacktrace on failed scanPackageLI"Dimitry Ivanov2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 95b7d50ce1a1ae879bbb1b8b8262172744c28d0e. Bug: 8076853 Change-Id: Ia19e6638a97b7b49561932752a204990e3a486d4
* | | | | | | | | | | Merge "Release voice wake lock at end of voice interaction session" into mnc-devWale Ogunwale2015-06-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Release voice wake lock at end of voice interaction sessionWale Ogunwale2015-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21615776 Bug: 21615761 Change-Id: I75d568474d4df5f21ea5b616887c6187e54f69e7
* | | | | | | | | | | | Merge "Hold service lock when AMS.setProcessMemoryTrimLevel() is called" ↵Wale Ogunwale2015-06-081-13/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | Hold service lock when AMS.setProcessMemoryTrimLevel() is calledWale Ogunwale2015-06-081-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21633189 Change-Id: I7203807466593ced6ec3dd328c1a03532caf3a31
* | | | | | | | | | | | | Merge "Pass an args bundle to launchAssistAction." into mnc-devTim Kilbourn2015-06-083-27/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Pass an args bundle to launchAssistAction.Tim Kilbourn2015-06-053-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to track the input device that was used to trigger assist, the input device id is sent as an extra in the assist intent whenever it is available. This is particularly useful on TVs, when an app may want to know whether the input device has a microphone. Bug: 21666123 Change-Id: I0f8c09e2f617606bef481bdff924cb6b9b47dd12
* | | | | | | | | | | | | | Merge "Zen: New user flow for requesting DND access." into mnc-devJohn Spurlock2015-06-081-37/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Zen: New user flow for requesting DND access.John Spurlock2015-06-081-37/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - User flow is now similar to requesting access to notification content, namely prompting the user to visit a settings page for enabling/disabling apps access. - New ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED intent for apps to listen to this state change. - Removed obsolete request method and associated internal callback aidl. - Added new android.permission.ACCESS_NOTIFICATION_POLICY permission for apps to include as a signal that they want to request this access (and therefore appear in the list on the settings page). - Improve javadocs, outline the user flow in NotificationManager#isNotificationPolicyAccessGranted and link to this method elsewhere. - NoManService now persists the user-enabled package list across reboots and does so per-user. - Rename public settings intent to correspond with the noman api. Bug: 21621663 Change-Id: I72cbc21cd736e6a157b6be5d1d0ba0b4a8e7ef4e
* | | | | | | | | | | | | | Merge "Change stylus button press to context click in View - API review ↵Mady Mellor2015-06-081-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feedback" into mnc-dev
| * | | | | | | | | | | | | | Change stylus button press to context click in View - API review feedbackMady Mellor2015-06-051-6/+6
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates all references in View's onStylusButtonPress to onContextClick as per API review feedback. Additionally listens for mouse right clicks and calls the onContextClick method for these as well for the stylus button press. Bug: 21572278 Change-Id: I5c1ee8c8f23a77d7c677b86356e89d0e4fc40056
* | | | | | | | | | | | | | Merge "Correctly time out CMD_START_DHCP." into mnc-devLorenzo Colitti2015-06-081-18/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Correctly time out CMD_START_DHCP.Lorenzo Colitti2015-06-081-18/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WifiStateMachine expects CMD_START_DHCP to time out after 30-40 seconds. Currently, DhcpClient imposes timeouts on DhcpInitState and on DhcpRequestState, but not on the time it takes to get to from CMD_START_DHCP to DhcpBoundState. So in theory the client could oscillate between DhcpInitState and DhcpRequestState and never time out. Fix this by introducing a new oneshot timer that is set when DHCP starts and is cancelled when it succeeds. CMD_RENEW_DHCP does not need this because it's implemented using only one state, so the oneshot timeout can be implemented using the state timeout. Bug: 19704592 Change-Id: I6a5847a3dee23a2692237b8f3b3b0f8049da5140
* | | | | | | | | | | | | | Merge "Delete code that checks for the simulator, it's long gone." into mnc-devLorenzo Colitti2015-06-081-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Delete code that checks for the simulator, it's long gone.Lorenzo Colitti2015-06-051-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exhibit A: http://b/5010576 Bug: 19316303 Change-Id: I093e4320f12459adaa51c6a14350e7a60e02937d
* | | | | | | | | | | | | | | am 6715ef75: am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge ↵Justin Harrison2015-06-061-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev * commit '6715ef754a72fdc2477257051e539c38aae6afcd': Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
| * | | | | | | | | | | | | | am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert ↵Justin Harrison2015-06-041-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev * commit '4f2927d22415b9a38f34645ae7909592d574c170': Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
| | * | | | | | | | | | | | | am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early ↵Justin Harrison2015-06-041-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev * commit '0eeb3bb8eb211af642b25bc494931bcc47786be7': Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send ↵Justin Harrison2015-06-031-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev * commit '33aa55b1cecea2dcecd5e72450dab8cff85c2943': Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED ↵Justin Harrison2015-06-031-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only to registered receivers""" into lmp-mr1-dev * commit '127d0b8065cb87fafddd0cf65a33e42afac69672': Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""