| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge "MediaSync: address API review." into mnc-dev | Wei Jia | 2015-05-08 | 12 | -283/+277 |
| |\ | |||||
| | * | MediaSync: address API review. | Wei Jia | 2015-05-08 | 12 | -283/+277 |
| * | | Merge "media: merge CodecException's getErrorCode and getReason." into mnc-dev | Ronghua Wu | 2015-05-08 | 2 | -37/+35 |
| |\ \ | |||||
| | * | | media: merge CodecException's getErrorCode and getReason. | Ronghua Wu | 2015-05-08 | 2 | -37/+35 |
| * | | | Merge "BluetoothMidiDevice: Cleanup and error handling improvements" into mnc... | Mike Lockwood | 2015-05-08 | 1 | -15/+19 |
| |\ \ \ | |||||
| | * | | | BluetoothMidiDevice: Cleanup and error handling improvements | Mike Lockwood | 2015-05-07 | 1 | -15/+19 |
| * | | | | Merge "AudioManager: add previous AudioPort list" into mnc-dev | Eric Laurent | 2015-05-08 | 2 | -11/+53 |
| |\ \ \ \ | |_|/ / |/| | | | |||||
| | * | | | AudioManager: add previous AudioPort list | Eric Laurent | 2015-05-08 | 2 | -11/+53 |
| | | |/ | |/| | |||||
| * | | | MediaPlayer: pause media time when buffering | Chong Zhang | 2015-05-07 | 1 | -1/+20 |
| * | | | Merge "MidiManager: Improve output of "dumpsys midi"" into mnc-dev | Mike Lockwood | 2015-05-07 | 2 | -2/+4 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | MidiManager: Improve output of "dumpsys midi" | Mike Lockwood | 2015-05-07 | 2 | -2/+4 |
| | |/ | |||||
| * | | Fix clang warnings on unused variable, mismatched tag, print format. | Chih-Hung Hsieh | 2015-05-07 | 1 | -1/+1 |
| |/ | |||||
| * | Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. | Jeff Brown | 2015-05-06 | 1 | -1/+1 |
| * | Revert "Initial draft of new MediaRouter APIs." | Jeff Brown | 2015-05-06 | 20 | -3748/+0 |
| * | Merge "Implement audio routing callbacks" into mnc-dev | Eric Laurent | 2015-05-06 | 8 | -37/+146 |
| |\ | |||||
| | * | Implement audio routing callbacks | Eric Laurent | 2015-05-06 | 8 | -37/+146 |
| * | | Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev | Jeff Tinker | 2015-05-06 | 1 | -3/+3 |
| |\ \ | |||||
| | * | | Clarify wording of MediaCrypto exception "ERROR_NO_KEY" | Jeff Tinker | 2015-05-05 | 1 | -3/+3 |
| * | | | TIF: Make all the parameters for UNRATED null | Jae Seo | 2015-05-05 | 3 | -10/+17 |
| * | | | media: Added MPEG2 profile/levels and tests | Harish Mahendrakar | 2015-05-05 | 4 | -5/+101 |
| * | | | Merge changes from topic 'mwd-merge-050415' into mnc-dev | Prerepa Viswanadham | 2015-05-05 | 2 | -28/+135 |
| |\ \ \ | |||||
| | * \ \ | am 4816ebe8: am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type ... | Robert Shih | 2015-05-01 | 1 | -10/+5 |
| | |\ \ \ | |||||
| | | * \ \ | am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track... | Robert Shih | 2015-05-01 | 1 | -10/+5 |
| | | |\ \ \ | |||||
| | * | \ \ \ | am 0486d03d: am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSy... | Lajos Molnar | 2015-05-01 | 6 | -133/+283 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSync to new set... | Lajos Molnar | 2015-05-01 | 6 | -133/+283 |
| | | |\ \ \ \ | |||||
| | * | \ \ \ \ | am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are acc... | John Reck | 2015-05-01 | 1 | -4/+5 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a fe... | John Reck | 2015-04-30 | 1 | -4/+5 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | am f7de1bc8: am 2757fed2: Merge "Clarifying which receiver method to call." i... | Glenn Kasten | 2015-04-30 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ | Merge "Clarifying which receiver method to call." | Peter Brinkmann | 2015-04-30 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Clarifying which receiver method to call. | Peter Brinkmann | 2015-04-30 | 1 | -0/+4 |
| | * | | | | | | | | | am c8efc449: am 3d42d238: am f764d219: Merge "AudioService receives callback ... | Jean-Michel Trivi | 2015-04-30 | 5 | -4/+113 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | | am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic p... | Jean-Michel Trivi | 2015-04-30 | 5 | -4/+113 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ | am 5054f906: am c98070a4: am 1b12db9e: Merge "media: set codec exception reas... | Ronghua Wu | 2015-04-30 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | am c98070a4: am 1b12db9e: Merge "media: set codec exception reason." into mnc... | Ronghua Wu | 2015-04-30 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ | am 426a0c33: am f388c9e6: am f3d3856f: Merge "Check for null codec from AMedi... | Andy Hung | 2015-04-30 | 1 | -4/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | am f388c9e6: am f3d3856f: Merge "Check for null codec from AMediaCodec_create... | Andy Hung | 2015-04-30 | 1 | -4/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ | am edcf5e1e: am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class ... | Andy Hung | 2015-04-30 | 1 | -30/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class object for Au... | Andy Hung | 2015-04-30 | 1 | -30/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ \ | am 62b4cbce: am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version str... | Mike Lockwood | 2015-04-29 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property"... | Mike Lockwood | 2015-04-29 | 1 | -0/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ \ \ | am 0dbaba6c: am 5e47c802: am 56867804: Merge "Respect the record audio app op... | Svet Ganov | 2015-04-29 | 8 | -22/+92 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework"... | Svet Ganov | 2015-04-29 | 8 | -22/+92 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ | am 23e46a4e: am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, D... | John Spurlock | 2015-04-29 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick s... | John Spurlock | 2015-04-29 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d3fad391: am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an o... | Dongwon Kang | 2015-04-29 | 1 | -5/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation take... | Dongwon Kang | 2015-04-29 | 1 | -5/+10 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Merge "TIF: Put comments for the newly added US and Canadian rating strings" | Jae Seo | 2015-04-29 | 1 | -0/+87 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | TIF: Put comments for the newly added US and Canadian rating strings | Jae Seo | 2015-03-17 | 1 | -0/+87 |
| | * | | | | | | | | | | | | | | | | resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aosp | Marco Nelissen | 2015-04-28 | 1 | -28/+48 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Sometimes the application context is null" | Marco Nelissen | 2015-04-28 | 1 | -35/+55 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |