summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | UsbDevice: Add support for retrieving version string for a USB deviceMike Lockwood2015-04-291-3/+16
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-devAbodunrinwa Toki2015-04-291-2/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | DO NOT MERGE: Minor fixes to FloatingToolbar.Abodunrinwa Toki2015-04-291-2/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "Respect the record audio app op - framework" into mnc-devSvet Ganov2015-04-291-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Respect the record audio app op - frameworkSvet Ganov2015-04-281-0/+1
* | | | | | | | | Merge "Unify View alpha implies clipping behavior" into mnc-devChris Craik2015-04-291-5/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Unify View alpha implies clipping behaviorChris Craik2015-04-281-5/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into...Abodunrinwa Toki2015-04-291-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | DO NOT MERGE: Update floatingtoolbar position when cursor moves.Abodunrinwa Toki2015-04-281-0/+4
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate w...Cedric Ho2015-04-291-0/+8
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicateCedric Ho2015-04-271-0/+8
* | | | | | | | Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and T...Andrei Stingaceanu2015-04-292-35/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.Andrei Stingaceanu2015-04-282-35/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Remove View:hasStaticLayer()" into mnc-devJohn Reck2015-04-293-16/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove View:hasStaticLayer()John Reck2015-04-283-16/+1
* | | | | | | | | Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-devJohn Spurlock2015-04-291-5/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Volume: Simple dialog footer, DND in quick settings.John Spurlock2015-04-291-5/+17
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge "Add status bar flag to disable quick settings" into mnc-devBenjamin Franz2015-04-291-2/+10
|\ \ \ \ \ \ \ \ \