summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add onStylusButtonPress listener to View" into mnc-devMady Mellor2015-04-307-8/+251
|\
| * Add onStylusButtonPress listener to ViewMady Mellor2015-04-307-8/+251
* | Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-devEino-Ville Talvala2015-04-302-2/+17
|\ \
| * | Camera2: LEGACY: Support prepare(), sort of.Eino-Ville Talvala2015-04-292-2/+17
* | | Merge "Add use fingerprint app op - framework" into mnc-devSvetoslav2015-04-303-18/+30
|\ \ \
| * | | Add use fingerprint app op - frameworkSvetoslav2015-04-293-18/+30
* | | | Merge "Add process outgoing calls app op - framework" into mnc-devSvetoslav2015-04-301-6/+16
|\ \ \ \ | |/ / /
| * | | Add process outgoing calls app op - frameworkSvetoslav2015-04-291-6/+16
* | | | Merge "Add SIP app op - framework." into mnc-devSvetoslav2015-04-301-6/+16
|\ \ \ \ | |/ / /
| * | | Add SIP app op - framework.Svetoslav2015-04-291-6/+16
* | | | Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-...Andreas Gampe2015-04-303-1/+8
|\ \ \ \
| * | | | am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aospAndreas Gampe2015-04-283-1/+8
* | | | | Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc...Alex Klyubin2015-04-301-2/+1
|\ \ \ \ \
| * | | | | AndroidKeyStore keys should not be handled by Bouncy Castle.Alex Klyubin2015-04-291-2/+1
* | | | | | Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo"...Alan Viverette2015-04-303-44/+52
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | ActionBar SearchView's default hint shouldn't override SearchableInfoAlan Viverette2015-04-293-44/+52
* | | | | | Merge "Zen: New event condition data model." into mnc-devJohn Spurlock2015-04-303-26/+118
|\ \ \ \ \ \
| * | | | | | Zen: New event condition data model.John Spurlock2015-04-303-26/+118
* | | | | | | Fix incorrect javadoc for Uri.getQueryParameter.Narayan Kamath2015-04-301-1/+1
* | | | | | | Merge "Temp workaround to track max beacons." into mnc-devWei Wang2015-04-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Temp workaround to track max beacons.Wei Wang2015-04-301-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Add missing error codes from keymaster_defs.h." into mnc-devShawn Willden2015-04-301-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Add missing error codes from keymaster_defs.h.Shawn Willden2015-04-291-0/+3
* | | | | | | | Merge "New "frozen" state during app move/upgrade." into mnc-devJeff Sharkey2015-04-302-3/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | New "frozen" state during app move/upgrade.Jeff Sharkey2015-04-292-3/+1
* | | | | | | | Add javax.crypto.Mac as a supported CryptoObject to FingerprintJim Miller2015-04-301-3/+21
* | | | | | | | Merge "Add permission to ap op mappings for all runtime permissions." into mn...Svet Ganov2015-04-301-3/+71
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add permission to ap op mappings for all runtime permissions.Svet Ganov2015-04-291-3/+71
* | | | | | | | Returning to wizard, split move events.Jeff Sharkey2015-04-299-43/+133
* | | | | | | | Merge "MidiFramer: Support realtime messages contained within SysEx messages....Mike Lockwood2015-04-301-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | MidiFramer: Support realtime messages contained within SysEx messages.Mike Lockwood2015-04-281-2/+7
* | | | | | | | | Merge "Update use of procstate for services." into mnc-devDianne Hackborn2015-04-301-0/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update use of procstate for services.Dianne Hackborn2015-04-291-0/+15
* | | | | | | | | | Merge "Stash modulation alpha until ColorStateList has resolved base color" i...Alan Viverette2015-04-291-4/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Stash modulation alpha until ColorStateList has resolved base colorAlan Viverette2015-04-291-4/+23
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Add KeyPermanentlyInvalidatedException." into mnc-devAlex Klyubin2015-04-291-0/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add KeyPermanentlyInvalidatedException.Alex Klyubin2015-04-291-0/+22
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticate...Simranjit Singh Kohli2015-04-291-6/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | [Update API]:Simranjit Singh Kohli2015-04-281-6/+5
* | | | | | | | | | Merge "Remove network access for idle apps" into mnc-devAmith Yamasani2015-04-292-2/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove network access for idle appsAmith Yamasani2015-04-292-2/+12
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Properly unparcel the PFDs passed to android.content.ContentProviderPr...Ben Kwa2015-04-291-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Properly unparcel the PFDs passed toBen Kwa2015-04-291-1/+2
* | | | | | | | | | | Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-devAdrian Roos2015-04-291-11/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clarify javadoc of isKeyguardSecure and isDeviceSecureAdrian Roos2015-04-291-11/+9
* | | | | | | | | | | | Merge "Add API to get app op for a permission" into mnc-devSvet Ganov2015-04-291-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Add API to get app op for a permissionSvet Ganov2015-04-291-0/+25
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge "Implement user-settable power save whitelist." into mnc-devDianne Hackborn2015-04-295-11/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement user-settable power save whitelist.Dianne Hackborn2015-04-295-11/+34
* | | | | | | | | | | Merge "UsbDevice: Add support for retrieving version string for a USB device"...Mike Lockwood2015-04-291-3/+16
|\ \ \ \ \ \ \ \ \ \ \