summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-devMarco Nelissen2013-06-111-0/+1
|\
| * Unhide MediaExtractor.getPsshInfo()Marco Nelissen2013-06-101-0/+1
* | add ViewGroup's layoutMode attribute to public resourcesScott Main2013-06-101-0/+1
|/
* Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-devJeff Brown2013-05-311-1/+1
|\
| * Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.Jeff Brown2013-05-301-1/+1
* | Merge "Unhide action to launch Daydream settings." into jb-mr2-devDaniel Sandler2013-05-301-0/+1
|\ \ | |/ |/|
| * Unhide action to launch Daydream settings.Daniel Sandler2013-05-291-0/+1
* | Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-devLajos Molnar2013-05-291-1/+0
|\ \
| * | android.media.MediaMuxer: remove SAMPLE_SYNC_FLAGLajos Molnar2013-05-291-1/+0
* | | Revert "Revert "Change GATT_FAILURE from 0 to 0x101""Matthew Xie2013-05-281-1/+1
| |/ |/|
* | Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-devMatthew Xie2013-05-261-1/+1
|\ \
| * | Revert "Change GATT_FAILURE from 0 to 0x101"Matthew Xie2013-05-261-1/+1
* | | Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-devMatthew Xie2013-05-261-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Change GATT_FAILURE from 0 to 0x101Matthew Xie2013-05-231-1/+1
* | Add route description API.Jeff Brown2013-05-161-0/+2
* | Merge "Add an API to determine if a route is connecting." into jb-mr2-devJeff Brown2013-05-101-0/+1
|\ \
| * | Add an API to determine if a route is connecting.Jeff Brown2013-05-091-0/+1
| |/
* | Merge "Add VideoView.getAudioSessionId()" into jb-mr2-devMarco Nelissen2013-05-101-0/+2
|\ \ | |/ |/|
| * Add VideoView.getAudioSessionId()Marco Nelissen2013-05-091-0/+2
* | Add an API to allow a callback to request active scans.Jeff Brown2013-05-091-0/+3
|/
* Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-devJesse Hall2013-05-041-1/+9
|\
| * Add android.opengl.EGLExt class for EGL extensionsJesse Hall2013-05-011-1/+9
* | Idle maintenance scheduling broken.Svetoslav2013-05-031-2/+0
* | Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into ...Jeff Tinker2013-05-011-6/+18
|\ \ | |/ |/|
| * MediaDrm API: Add two exceptions to handle error path scenariosJeff Tinker2013-04-301-6/+18
* | Merge "Hide isLinkedUser()" into jb-mr2-devAmith Yamasani2013-04-261-1/+0
|\ \
| * | Hide isLinkedUser()Amith Yamasani2013-04-251-1/+0
* | | Merge "Fix build." into jb-mr2-devDaniel Sandler2013-04-251-1/+1
|\ \ \
| * | | Fix build.Daniel Sandler2013-04-251-1/+1
* | | | Merge "API cleanup: NotificationListener" into jb-mr2-devDaniel Sandler2013-04-251-8/+7
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | API cleanup: NotificationListenerDaniel Sandler2013-04-251-8/+7
* | | Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-devDaniel Sandler2013-04-251-0/+1
|\ \ \ | |/ /
| * | New NotificationListener API: getActiveNotifications()Daniel Sandler2013-04-241-0/+1
* | | Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.Amith Yamasani2013-04-241-1/+0
|/ /
* | Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-devMatthew Xie2013-04-231-0/+1
|\ \
| * | Add hardware feature android.hardware.bluetooth.leMatthew Xie2013-04-231-0/+1
* | | Adding matching @deprecated.Ian Rogers2013-04-231-1/+1
| |/ |/|
* | Merge "Making new node id APIs return strings." into jb-mr2-devSvetoslav2013-04-231-2/+2
|\ \
| * | Making new node id APIs return strings.Svetoslav2013-04-221-2/+2
* | | JB MR2 == API 18.Dianne Hackborn2013-04-221-1/+1
|/ /
* | Fix bug #8656546 API REVIEW: android.text.bidi / android.textFabrice Di Meglio2013-04-191-43/+22
* | Merge "Correct algorithm property name and clarify javadoc description of dev...Jeff Tinker2013-04-191-1/+1
|\ \
| * | Correct algorithm property name and clarify javadoc description ofJeff Tinker2013-04-191-1/+1
* | | Merge "Updating API based on feedback" into jb-mr2-devJason Sams2013-04-191-12/+0
|\ \ \
| * | | Updating API based on feedbackJason Sams2013-04-191-12/+0
* | | | Merge "Improve API and documentation" into jb-mr2-devAmith Yamasani2013-04-191-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Improve API and documentationAmith Yamasani2013-04-191-1/+2
* | | | Merge "Deprecate StatFs methods returning small values." into jb-mr2-devJeff Sharkey2013-04-191-4/+5
|\ \ \ \
| * | | | Deprecate StatFs methods returning small values.Jeff Sharkey2013-04-191-4/+5
| | |/ / | |/| |
* | | | Merge "Rename API AndroidKey* -> Key*" into jb-mr2-devKenny Root2013-04-191-31/+31
|\ \ \ \