summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-devAlan Viverette2015-06-1814-314/+90
|\ | | | | | | | | * commit 'f1da9a1401fe1304bee8a550a0141c79ecc3c0b3': DO NOT MERGE: Remove DayNight theme
| * Merge "DO NOT MERGE: Remove DayNight theme" into mnc-devAlan Viverette2015-06-1814-314/+90
| |\
| | * DO NOT MERGE: Remove DayNight themeAlan Viverette2015-06-1814-314/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not go gentle into that good night, Old age should burn and rave at close of day; Rage, rage against the dying of the light. Though wise men at their end know dark is right, Because their words had forked no lightning they Do not go gentle into that good night. Bug: 21854466 Change-Id: I0b7cd116c23f7df88e94f31b3aee7dd22a102804
* | | am 2d5f41e4: Merge "Better handling of 0-length format conversions in ↵Paul McLean2015-06-181-8/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | convertAudioPortFromNative()." into mnc-dev * commit '2d5f41e4c1733ff3e606390a433a6a52be6e862a': Better handling of 0-length format conversions in convertAudioPortFromNative().
| * | Merge "Better handling of 0-length format conversions in ↵Paul McLean2015-06-181-8/+12
| |\ \ | | | | | | | | | | | | convertAudioPortFromNative()." into mnc-dev
| | * | Better handling of 0-length format conversions in convertAudioPortFromNative().Paul McLean2015-06-181-8/+12
| | | | | | | | | | | | | | | | | | | | Bug: 21915588 Change-Id: I8eb3da2bfa94722a11cf47ba6fc5359d5e8e4916
* | | | am b0ff3a6c: Merge "Ensure ResolverDrawerLayout is visible to accessibility ↵Alan Viverette2015-06-181-5/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | services" into mnc-dev * commit 'b0ff3a6cb37aa45add4b0c5135bd978442fcc441': Ensure ResolverDrawerLayout is visible to accessibility services
| * | | Merge "Ensure ResolverDrawerLayout is visible to accessibility services" ↵Alan Viverette2015-06-181-5/+2
| |\ \ \ | | | | | | | | | | | | | | | into mnc-dev
| | * | | Ensure ResolverDrawerLayout is visible to accessibility servicesAlan Viverette2015-06-181-5/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Also removes the class name since it's not helpful to expose framework internal class names to accessibility services that can't access them. Bug: 18864087 Change-Id: If9b29d3929970bd893168444584a5dd1ba593c5b
* | | | am 3c525c15: Merge "Fix MidiDevice.MidiConnection lifecycle" into mnc-devMike Lockwood2015-06-183-14/+59
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3c525c15cb14483aa17825ca92d100fba398f1a0': Fix MidiDevice.MidiConnection lifecycle
| * | | Merge "Fix MidiDevice.MidiConnection lifecycle" into mnc-devMike Lockwood2015-06-183-14/+59
| |\ \ \
| | * | | Fix MidiDevice.MidiConnection lifecycleMike Lockwood2015-06-183-14/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update device server's MidiDeviceStatus when a connection is made to one of its output ports. After connecting an input port to an output port using MidiDevice.connectPorts(), do not call IMidiDeviceServer.closePort() until MidiDevice.MidiConnection.close() is called. While I was in there, added missing CloseGuard support to the MidiDevice.MidiConnection class. This fixes a problem resulting in UsbMidiDevice closing the device's ALSA driver too soon. Bug: 21850709 Change-Id: I0c120f76b42eec8a143161e46dba73fbec5e4f31
* | | | | am 76ac3238: Merge "AudioService: Send the right stream to the volume UI on ↵John Spurlock2015-06-181-5/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | tablet changes." into mnc-dev * commit '76ac32389360695ede23a9403aeb19bd3746e74d': AudioService: Send the right stream to the volume UI on tablet changes.
| * | | | Merge "AudioService: Send the right stream to the volume UI on tablet ↵John Spurlock2015-06-181-5/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | changes." into mnc-dev
| | * | | | AudioService: Send the right stream to the volume UI on tablet changes.John Spurlock2015-06-181-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21798314 Change-Id: Idd49eb9e1253a94e567866a38b664035aea3715b
* | | | | | am 728b7500: Merge "Document possible null returns in PackageManager" into ↵Christopher Tate2015-06-181-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '728b7500b3d34cd89f7aff0bad1bb7fe3e097f11': Document possible null returns in PackageManager
| * | | | | Merge "Document possible null returns in PackageManager" into mnc-devChristopher Tate2015-06-181-4/+4
| |\ \ \ \ \
| | * | | | | Document possible null returns in PackageManagerChristopher Tate2015-06-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular queryIntentServices() but also a few others. Bug 19127758 Change-Id: I590605ce4870b2ab300385678df8917cfade60f9
* | | | | | | am aca98de4: Merge "ImageWriter: Remove exception for closing twice" into ↵Chien-Yu Chen2015-06-181-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit 'aca98de43368a68d1d47c205d8ec8395d4b81376': ImageWriter: Remove exception for closing twice
| * | | | | | Merge "ImageWriter: Remove exception for closing twice" into mnc-devChien-Yu Chen2015-06-181-2/+1
| |\ \ \ \ \ \
| | * | | | | | ImageWriter: Remove exception for closing twiceChien-Yu Chen2015-06-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because close() will be called again when GC kicks in. Bug: 20945169 Change-Id: If3c5a13be241977ccf4692d5301c423b7ff38918
* | | | | | | | am 50ec9b1b: Merge "Patch up certain kinds of broken notifications." into ↵Dan Sandler2015-06-187-27/+94
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '50ec9b1bd97a04a001dd394885db0cc6f13bea39': Patch up certain kinds of broken notifications.
| * | | | | | | Merge "Patch up certain kinds of broken notifications." into mnc-devDan Sandler2015-06-187-27/+94
| |\ \ \ \ \ \ \
| | * | | | | | | Patch up certain kinds of broken notifications.Dan Sandler2015-06-187-27/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications in which the icon resource ID is changed after Builder.build() is called (even, and particularly, as the last step in the current implementation of setLatestEventInfo()) were not having their icons properly parceled. In these cases we now attempt to catch this at parcel time and construct the necessary Icon object. But wait! Parceling does not require a Context. So we don't actually know which package to load the resource from. Therefore we now allow an Icon to be constructed with an empty ("") package name, which allows us to complete this parceling task despite the fact that a Notification does not know its own package name. (In case you attempt to load a drawable for such an Icon, loadDrawable will spot the "" package and instead substitute the Context from its parameters to try to load the resource.) As it happens, even though the Notification does not know its own package name, BaseStatusBar does, because it was provided at NM.notify() time and is therefore included in the StatusBarNotification structure. So we can actually patch up the Icon (if it is TYPE_RESOURCE) and be sure to get the icon loaded out of the correct package. While we've got the hood open, this change fixes a couple of related problems: • Foreground service notifications synthetically constructed for naughty icon==0 notifications (which we are still allowing...FOR NOW) were losing the FLAG_FOREGROUND_SERVICE flag (because we're re-build()-ing them from scratch rather than rewriting the provided Notification object). Now we set the flag and hang onto the new notification for next time setForeground() is called. • We now allow media notifications to avoid getting bumped to the top of the notification list if they're PRIORITY_MIN. You might want to do that, I guess? Bug: 21333763 Change-Id: Ia5d1f1acb594c7677bcc75ee3d624da4ffca671f
* | | | | | | | | am 71b44259: Merge "GetInstalledProvidersForProfiles should never return ↵Hyunyoung Song2015-06-181-4/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null object." into mnc-dev * commit '71b44259829cbc0f6480a1cda68fb9183a0d0ad9': GetInstalledProvidersForProfiles should never return null object.
| * | | | | | | | Merge "GetInstalledProvidersForProfiles should never return null object." ↵Hyunyoung Song2015-06-181-4/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| | * | | | | | | | GetInstalledProvidersForProfiles should never return null object.Hyunyoung Song2015-06-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/21916365 b/19904873 Change-Id: I296cafd15a185ad91cb7491bd6d2466ac03cdfb7
* | | | | | | | | | am 7105fd43: Merge "Add config_tether_apndata for Canada MVNO" into mnc-devVineeta Srivastava2015-06-182-1/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7105fd43d288eaa834f2f8cc054cddc6b54af7c4': Add config_tether_apndata for Canada MVNO
| * | | | | | | | | Merge "Add config_tether_apndata for Canada MVNO" into mnc-devVineeta Srivastava2015-06-182-1/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add config_tether_apndata for Canada MVNOSungmin Choi2015-06-042-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19149024 Change-Id: I98c7097a9920cb79505b9c9d66ae1acfdeff4175
* | | | | | | | | | | am 3358eb08: Merge "Add way to get the network location provider package" ↵Jason Monk2015-06-182-0/+22
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '3358eb084eb445e30d80e4a64d19af901059c399': Add way to get the network location provider package
| * | | | | | | | | | Merge "Add way to get the network location provider package" into mnc-devJason Monk2015-06-182-0/+22
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add way to get the network location provider packageJason Monk2015-06-172-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21805447 Change-Id: Ie9fd35a69d8808ae4346927b30b77e9fd733b569
* | | | | | | | | | | | am 0925136b: Merge "Fixing voice panel centering issues in landscape on ↵Stefan Kuhne2015-06-182-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phone" into mnc-dev * commit '0925136b22d4fcc69ed8b13675861e2386f3a341': Fixing voice panel centering issues in landscape on phone
| * | | | | | | | | | | Merge "Fixing voice panel centering issues in landscape on phone" into mnc-devStefan Kuhne2015-06-182-6/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixing voice panel centering issues in landscape on phoneStefan Kuhne2015-06-182-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new assist panel (long press on home) was not centered in landscape mode on phones. This was caused by ignoring the stable insets in the PhoneWindowManager. bug: 21708971 Change-Id: I97a968a41c2966b09eba496fbe57c840affdf9ec
* | | | | | | | | | | | | am 5e275f9f: Merge "instrument volume controls" into mnc-devChris Wren2015-06-184-19/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e275f9fc0e655a273fc62ce297c9d5a069d7ed7': instrument volume controls
| * | | | | | | | | | | | Merge "instrument volume controls" into mnc-devChris Wren2015-06-184-19/+56
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | instrument volume controlsChris Wren2015-06-174-19/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21474639 Change-Id: I48641ae778f4e274c0f67ca6491102d978d3cd5f
* | | | | | | | | | | | | | am 3fa285f9: Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" ↵Sanket Padawe2015-06-181-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '3fa285f93e2810cbd31a71490b364be2b6636d9d': SubscriptionManager: Fix NPE in getSimStateForSlotIdx
| * | | | | | | | | | | | | Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-devSanket Padawe2015-06-181-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | SubscriptionManager: Fix NPE in getSimStateForSlotIdxSanket Padawe2015-06-181-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21915589 Change-Id: If703baff6408a0d7ba7c8b02bfd2427b64cda963
* | | | | | | | | | | | | | | am aa2a1966: Merge "Fix some demo mode issues" into mnc-devJason Monk2015-06-183-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa2a19661de088278819fb5b5670ebcada5733f9': Fix some demo mode issues
| * | | | | | | | | | | | | | Merge "Fix some demo mode issues" into mnc-devJason Monk2015-06-183-6/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix some demo mode issuesJason Monk2015-06-183-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21919885 Change-Id: If79d76a2954b62e290691b1c2338d175fdbbffc5
* | | | | | | | | | | | | | | | am 7f274f0e: Merge "Fix opening secured networks from QS" into mnc-devJason Monk2015-06-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f274f0e1d11e5e70cd55ed93aa467389445636a': Fix opening secured networks from QS
| * | | | | | | | | | | | | | | Merge "Fix opening secured networks from QS" into mnc-devJason Monk2015-06-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix opening secured networks from QSJason Monk2015-06-181-1/+1
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21908788 Change-Id: I8d1957cc4e0c259b737c5a4d0633edbb1ff57c03
* | | | | | | | | | | | | | | | am b0a8d2c4: Merge "Fixed a potential bug where the keyguard could become ↵Selim Cinek2015-06-182-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | empty" into mnc-dev * commit 'b0a8d2c4aecb6dfe5f7a95f56ca739fbea6301e5': Fixed a potential bug where the keyguard could become empty
| * | | | | | | | | | | | | | | Merge "Fixed a potential bug where the keyguard could become empty" into mnc-devSelim Cinek2015-06-182-6/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \