Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Add onStylusButtonPress listener to View" into mnc-dev | Mady Mellor | 2015-04-30 | 7 | -8/+251 |
|\ | |||||
| * | Add onStylusButtonPress listener to View | Mady Mellor | 2015-04-30 | 7 | -8/+251 |
* | | Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev | Eino-Ville Talvala | 2015-04-30 | 2 | -2/+17 |
|\ \ | |||||
| * | | Camera2: LEGACY: Support prepare(), sort of. | Eino-Ville Talvala | 2015-04-29 | 2 | -2/+17 |
* | | | Merge "Add use fingerprint app op - framework" into mnc-dev | Svetoslav | 2015-04-30 | 3 | -18/+30 |
|\ \ \ | |||||
| * | | | Add use fingerprint app op - framework | Svetoslav | 2015-04-29 | 3 | -18/+30 |
* | | | | Merge "Add process outgoing calls app op - framework" into mnc-dev | Svetoslav | 2015-04-30 | 1 | -6/+16 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add process outgoing calls app op - framework | Svetoslav | 2015-04-29 | 1 | -6/+16 |
* | | | | Merge "Add SIP app op - framework." into mnc-dev | Svetoslav | 2015-04-30 | 1 | -6/+16 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add SIP app op - framework. | Svetoslav | 2015-04-29 | 1 | -6/+16 |
* | | | | Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-... | Andreas Gampe | 2015-04-30 | 3 | -1/+8 |
|\ \ \ \ | |||||
| * | | | | am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp | Andreas Gampe | 2015-04-28 | 3 | -1/+8 |
* | | | | | Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc... | Alex Klyubin | 2015-04-30 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | AndroidKeyStore keys should not be handled by Bouncy Castle. | Alex Klyubin | 2015-04-29 | 1 | -2/+1 |
* | | | | | | Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo"... | Alan Viverette | 2015-04-30 | 3 | -44/+52 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | ActionBar SearchView's default hint shouldn't override SearchableInfo | Alan Viverette | 2015-04-29 | 3 | -44/+52 |
* | | | | | | Merge "Zen: New event condition data model." into mnc-dev | John Spurlock | 2015-04-30 | 3 | -26/+118 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Zen: New event condition data model. | John Spurlock | 2015-04-30 | 3 | -26/+118 |
* | | | | | | | Fix incorrect javadoc for Uri.getQueryParameter. | Narayan Kamath | 2015-04-30 | 1 | -1/+1 |
* | | | | | | | Merge "Temp workaround to track max beacons." into mnc-dev | Wei Wang | 2015-04-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Temp workaround to track max beacons. | Wei Wang | 2015-04-30 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge "Add missing error codes from keymaster_defs.h." into mnc-dev | Shawn Willden | 2015-04-30 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add missing error codes from keymaster_defs.h. | Shawn Willden | 2015-04-29 | 1 | -0/+3 |
* | | | | | | | | Merge "New "frozen" state during app move/upgrade." into mnc-dev | Jeff Sharkey | 2015-04-30 | 2 | -3/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | New "frozen" state during app move/upgrade. | Jeff Sharkey | 2015-04-29 | 2 | -3/+1 |
* | | | | | | | | Add javax.crypto.Mac as a supported CryptoObject to Fingerprint | Jim Miller | 2015-04-30 | 1 | -3/+21 |
* | | | | | | | | Merge "Add permission to ap op mappings for all runtime permissions." into mn... | Svet Ganov | 2015-04-30 | 1 | -3/+71 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add permission to ap op mappings for all runtime permissions. | Svet Ganov | 2015-04-29 | 1 | -3/+71 |
* | | | | | | | | Returning to wizard, split move events. | Jeff Sharkey | 2015-04-29 | 9 | -43/+133 |
* | | | | | | | | Merge "MidiFramer: Support realtime messages contained within SysEx messages.... | Mike Lockwood | 2015-04-30 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | MidiFramer: Support realtime messages contained within SysEx messages. | Mike Lockwood | 2015-04-28 | 1 | -2/+7 |
* | | | | | | | | | Merge "Update use of procstate for services." into mnc-dev | Dianne Hackborn | 2015-04-30 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update use of procstate for services. | Dianne Hackborn | 2015-04-29 | 1 | -0/+15 |
* | | | | | | | | | | Merge "Stash modulation alpha until ColorStateList has resolved base color" i... | Alan Viverette | 2015-04-29 | 1 | -4/+23 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Stash modulation alpha until ColorStateList has resolved base color | Alan Viverette | 2015-04-29 | 1 | -4/+23 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev | Alex Klyubin | 2015-04-29 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add KeyPermanentlyInvalidatedException. | Alex Klyubin | 2015-04-29 | 1 | -0/+22 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticate... | Simranjit Singh Kohli | 2015-04-29 | 1 | -6/+5 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | [Update API]: | Simranjit Singh Kohli | 2015-04-28 | 1 | -6/+5 |
* | | | | | | | | | | Merge "Remove network access for idle apps" into mnc-dev | Amith Yamasani | 2015-04-29 | 2 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove network access for idle apps | Amith Yamasani | 2015-04-29 | 2 | -2/+12 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge "Properly unparcel the PFDs passed to android.content.ContentProviderPr... | Ben Kwa | 2015-04-29 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Properly unparcel the PFDs passed to | Ben Kwa | 2015-04-29 | 1 | -1/+2 |
* | | | | | | | | | | | Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev | Adrian Roos | 2015-04-29 | 1 | -11/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Clarify javadoc of isKeyguardSecure and isDeviceSecure | Adrian Roos | 2015-04-29 | 1 | -11/+9 |
* | | | | | | | | | | | | Merge "Add API to get app op for a permission" into mnc-dev | Svet Ganov | 2015-04-29 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Add API to get app op for a permission | Svet Ganov | 2015-04-29 | 1 | -0/+25 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge "Implement user-settable power save whitelist." into mnc-dev | Dianne Hackborn | 2015-04-29 | 5 | -11/+34 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Implement user-settable power save whitelist. | Dianne Hackborn | 2015-04-29 | 5 | -11/+34 |
* | | | | | | | | | | | Merge "UsbDevice: Add support for retrieving version string for a USB device"... | Mike Lockwood | 2015-04-29 | 1 | -3/+16 |
|\ \ \ \ \ \ \ \ \ \ \ |