summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" i...Dianne Hackborn2015-06-085-11/+11
|\
| * Fix issue #21572679: API Review: ActivityOptions, usage time reportDianne Hackborn2015-06-055-11/+11
* | Merge "MidiManager: proxy all requests to open devices through MidiService" i...Mike Lockwood2015-06-0816-174/+520
|\ \
| * | MidiManager: proxy all requests to open devices through MidiServiceMike Lockwood2015-06-0416-174/+520
* | | Improve string comment.Makoto Onuki2015-06-081-1/+1
* | | Hide top and bottom bar while dozingJorim Jaggi2015-06-081-0/+7
* | | 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
* | | | Merge "Remove deprecated android.security.KeyStore methods." into mnc-devAlex Klyubin2015-06-086-45/+45
|\ \ \ \
| * | | | Remove deprecated android.security.KeyStore methods.Alex Klyubin2015-06-086-45/+45
* | | | | Merge "RSA encrypt with private key in Android Keystore." into mnc-devAlex Klyubin2015-06-082-12/+85
|\ \ \ \ \
| * | | | | RSA encrypt with private key in Android Keystore.Alex Klyubin2015-06-042-12/+85
* | | | | | Merge "Disable -Werror on Clang" into mnc-devJohn Reck2015-06-081-1/+5
|\ \ \ \ \ \
| * | | | | | Disable -Werror on ClangJohn Reck2015-06-081-1/+5
* | | | | | | Merge "Fix clang warnings" into mnc-devJohn Reck2015-06-081-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix clang warningsJohn Reck2015-06-081-1/+0
* | | | | | | | 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
* | | | | | | | | 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
* | | | | | | | | | 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
* | | | | | | | | | | Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)."...Amit Mahajan2015-06-081-3/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adding temporary logging to debug CTS failure (for CellLocationTest).Amit Mahajan2015-06-031-3/+12
* | | | | | | | | | | | Merge "Changing getSimState to use slot idx instead of sub id." into mnc-devAmit Mahajan2015-06-083-14/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Changing getSimState to use slot idx instead of sub id.Amit Mahajan2015-06-083-14/+27
* | | | | | | | | | | | | Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-devAndrew Flynn2015-06-084-38/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | notifyCarrierNetworkChange:TelephonyManager->CarrierServiceAndrew Flynn2015-06-054-38/+47
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | API review: Update hasMic to hasMicrophone.Tim Kilbourn2015-06-084-11/+13
* | | | | | | | | | | | | Merge "Remove insertion action mode runnable on selection start" into mnc-devClara Bayarri2015-06-081-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove insertion action mode runnable on selection startClara Bayarri2015-06-081-4/+3
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Hold service lock when AMS.setProcessMemoryTrimLevel() is called" into...Wale Ogunwale2015-06-081-13/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Hold service lock when AMS.setProcessMemoryTrimLevel() is calledWale Ogunwale2015-06-081-13/+15
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Pass an args bundle to launchAssistAction." into mnc-devTim Kilbourn2015-06-0811-36/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Pass an args bundle to launchAssistAction.Tim Kilbourn2015-06-0511-38/+53
* | | | | | | | | | | | | | Merge "Zen: New user flow for requesting DND access." into mnc-devJohn Spurlock2015-06-0810-133/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Zen: New user flow for requesting DND access.John Spurlock2015-06-0810-133/+133
* | | | | | | | | | | | | | | Merge "API Council changes." into mnc-devGeorge Mount2015-06-084-20/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | API Council changes.George Mount2015-06-054-22/+27
* | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-0877-473/+449
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-473/+449
* | | | | | | | | | | | | | | | | Merge "Add telecom extra to specify handle for incoming call" into mnc-devYorke Lee2015-06-083-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add telecom extra to specify handle for incoming callYorke Lee2015-06-053-0/+9
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Change stylus button press to context click in View - API review feedb...Mady Mellor2015-06-0814-157/+155
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Change stylus button press to context click in View - API review feedbackMady Mellor2015-06-0514-157/+155
* | | | | | | | | | | | | | | | | Merge "Change stylus button press to context click in GD - API review feedbac...Mady Mellor2015-06-083-49/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Change stylus button press to context click in GD - API review feedbackMady Mellor2015-06-053-49/+45
* | | | | | | | | | | | | | | | | | Merge "instrument emergency call button" into mnc-devChris Wren2015-06-082-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \