summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 73e243c4: Merge "Fix logging typos in GpsLocationProvider"Victoria Lease2013-01-021-3/+3
|\ | | | | | | | | * commit '73e243c4d271907d10f10b301b2d6854e1f63fe4': Fix logging typos in GpsLocationProvider
| * Merge "Fix logging typos in GpsLocationProvider"Victoria Lease2013-01-021-3/+3
| |\
| | * Fix logging typos in GpsLocationProviderMagnus Eriksson2012-12-211-3/+3
| | | | | | | | | | | | | | | Change-Id: Ibf12947f3758defee990fbf685323334b8d1eeda Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
* | | am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation"Amith Yamasani2013-01-021-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '554ed0f0347acc568ab1e73621789423c953f693': Fixed typo in Recreating an Activity documentation
| * | Merge "Fixed typo in Recreating an Activity documentation"Amith Yamasani2013-01-021-1/+1
| |\ \
| | * | Fixed typo in Recreating an Activity documentationGulshan Singh2012-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The word although was spelled as althought. This is now fixed. Signed-off-by: Gulshan Singh <gsingh2011@gmail.com> Change-Id: Ia28a081bf9d8ab8be831c685cbfa4ddad3618a87
* | | | am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak"Elliott Hughes2012-12-211-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5cb0f2184656642160e9ac032d0646f766058a5b': StringBlock_nativeCreate: Possible Leak
| * | | Merge "StringBlock_nativeCreate: Possible Leak"Elliott Hughes2012-12-211-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | StringBlock_nativeCreate: Possible LeakYou Kim2012-12-211-0/+1
| | |/ | | | | | | | | | | | | | | | osb can be leaked when osb->getError() != NO_ERROR Change-Id: Icbeb8eb3fb78849c043fe032cc8f7050da041042
* | | am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" ↵Scott Main2012-12-2110-14/+718
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '96f0e00825cf1bf0f14c358b87394b426020a77b': docs: add class on keyboards
| * \ \ am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-devScott Main2012-12-2110-14/+718
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '481102eed6d8eaff07489717bde7fc59a5dea5bf': docs: add class on keyboards
| | * \ \ am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-devScott Main2012-12-2110-14/+718
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '0dae634b06f5dc6039a5aaa9c0f00250e10c6547': docs: add class on keyboards
| | | * \ \ Merge "docs: add class on keyboards" into jb-mr1-devScott Main2012-12-2110-14/+718
| | | |\ \ \
| | | | * | | docs: add class on keyboardsScott Main2012-12-2110-14/+718
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3fb179457af50eec9d111f84eb9fabf49bc7ab1b
* | | | | | | am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of default ↵Scott Main2012-12-212-2/+30
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 * commit '8c8fd247a6a7f49031251ba11036779a41d9a2bf': docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
| * | | | | | am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to ↵Scott Main2012-12-212-2/+30
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permission guide and fix code snippet error in WebView guide. external issue:41441 * commit 'cee5267b766ce44ddf2faa1f32f2b79d49f088ac': docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
| | * | | | | am dc2c1a0f: docs: add explanation of default permissions to Permission ↵Scott Main2012-12-212-2/+30
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guide and fix code snippet error in WebView guide. external issue:41441 * commit 'dc2c1a0f80042c42768fd868791e21412c3839b9': docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
| | | * | | | docs: add explanation of default permissions to Permission guideScott Main2012-12-212-2/+30
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and fix code snippet error in WebView guide. external issue:41441 Change-Id: I5d021e4f04245385b62e992baebd702814fff930
* | | | | | am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects"James Dong2012-12-211-2/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '5d5526aa86888cb0891f535823dc93e154f38b2e': Handle errors from AudioEffect::queryNumberEffects
| * | | | | Merge "Handle errors from AudioEffect::queryNumberEffects"James Dong2012-12-211-2/+5
| |\ \ \ \ \
| | * | | | | Handle errors from AudioEffect::queryNumberEffectsPeter Karlsson2012-11-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There may be cases where queryNumberEffects fails leading to the usage of the uninitialized numEffects. Change-Id: If6d46987021ff6f0c9a2123d8714ff5fdf9ced45
* | | | | | | am c8db3b8a: Merge "Set "isdrm" info in Mediastore"James Dong2012-12-211-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c8db3b8ae34c76430e8e97418e485dedc44d0954': Set "isdrm" info in Mediastore
| * | | | | | Merge "Set "isdrm" info in Mediastore"James Dong2012-12-211-1/+2
| |\ \ \ \ \ \
| | * | | | | | Set "isdrm" info in MediastoreErik Almqvist2012-12-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mediascanner member mIsDrm was never set according to the drmframework canHandle call. This subsequently caused that the isdrm column in mediastore was never set, and was defaulted to false for all files. mIsDrm is now set according to drmframework canHandle result for each files that is scanned. Change-Id: Id557d921c4e3e3dfc35da56b69471f4bd6b3c8bf
* | | | | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-210-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb842a678a67174de54e4174345379e67bc7bf8d
| * \ \ \ \ \ \ \ merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-210-0/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: ↵kmccormick@google.com2012-12-218-1/+1502
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev * commit '87d852a84de0d691bce127f65bc7c4ba75883e2e': cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
| * | | | | | | | am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class ↵kmccormick@google.com2012-12-218-1/+1502
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev * commit 'ec6d08475ee1a2020556b43b4698b60dcb56a9c6': cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
| | * | | | | | | am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: ↵kmccormick@google.com2012-12-218-1/+1502
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev * commit '5b03460fcb69394b984fad1a63e244f9aa798886': cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
| | | * | | | | | Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: ↵&& repo sync -j82012-12-218-1/+1502
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev
| | | | * | | | | | cherrypick from jb-dev-docs: Gestures Class Change-Id: ↵&& repo sync -j82012-12-208-1/+1502
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I9abebf58a9607c8f52f72ef2ce46308304386596 Change-Id: I72c2621dcc674a2f486ec2a49e0eb409d8c9b5bd
* | | | | | | | | | am 88fe4ebc: Merge "NsdService: Clear client info after resolution request ↵Irfan Sheriff2012-12-211-123/+129
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is serviced." * commit '88fe4ebc0b6e0499f247b5d896778dd72304bf9f': NsdService: Clear client info after resolution request is serviced.
| * | | | | | | | | Merge "NsdService: Clear client info after resolution request is serviced."Irfan Sheriff2012-12-201-123/+129
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | NsdService: Clear client info after resolution request is serviced.Vairavan Srinivasan2012-08-231-123/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the client requests tracked in mClientIds for resolution requests isn't cleared at all and causes failues of additional registration and discovery requests once the number of requests reaches MAX_LIMIT. In addition, bubble up unhandled native events to default state of nsd state machine. Change-Id: Ief14e0fff644aa2698fcddd71f538820f802be58
* | | | | | | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-200-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | Change-Id: I47c257db0d5a21fe4f6592924ebd47bd8578d5ea
| * | | | | | | | | merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-200-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance"Victoria Lease2012-12-201-9/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc56015bd3d86e470fdf3ac8449776809124875e': Possible leak in android_emoji_EmojiFactory_newInstance
| * | | | | | | | | Merge "Possible leak in android_emoji_EmojiFactory_newInstance"Victoria Lease2012-12-201-9/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Possible leak in android_emoji_EmojiFactory_newInstanceYou Kim2012-12-121-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jchars is not released correctly if factory is NULL. In addition, unnecessary string conversion removed. Change-Id: I3ea58391dfe7a96ea6d6ae61bb0867a2d8d49fb0
* | | | | | | | | | | am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer ↵Dirk Dougherty2012-12-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | landing page featured content to blog post." into jb-mr1-dev * commit 'f6c71644dce2a93c386a1803a46ca7d99a9ae543': Doc change: point developer landing page featured content to blog post.
| * | | | | | | | | | am e487e537: am 0402b653: Merge "Doc change: point developer landing page ↵Dirk Dougherty2012-12-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | featured content to blog post." into jb-mr1-dev * commit 'e487e537b0fcc5b9f972c1e247fd1b019150fa05': Doc change: point developer landing page featured content to blog post.
| | * | | | | | | | | am 0402b653: Merge "Doc change: point developer landing page featured ↵Dirk Dougherty2012-12-201-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content to blog post." into jb-mr1-dev * commit '0402b65327aa568c7ea706879d9ddb222436aa87': Doc change: point developer landing page featured content to blog post.
| | | * | | | | | | | Merge "Doc change: point developer landing page featured content to blog ↵Dirk Dougherty2012-12-201-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | post." into jb-mr1-dev
| | | | * | | | | | | | Doc change: point developer landing page featured content to blog post.Dirk Dougherty2012-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8201d223b4b2c28227c7aac3499a81d29c3ec9e3
* | | | | | | | | | | | am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release ↵Scott Main2012-12-204-29/+251
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes" into jb-mr1-dev * commit '15423b204d1dfc6ef5632f26166d445bf9cef2f5': docs: SDK r21.0.1 Release Notes
| * | | | | | | | | | | am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into ↵Scott Main2012-12-204-29/+251
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '226e973f3946778078840db46274a2c34b30a6b0': docs: SDK r21.0.1 Release Notes
| | * | | | | | | | | | am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-devScott Main2012-12-204-29/+251
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8afb3ba4dac2f3e42884cb40f8fa407e072382e3': docs: SDK r21.0.1 Release Notes
| | | * | | | | | | | | Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-devScott Main2012-12-204-29/+251
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | docs: SDK r21.0.1 Release NotesJoe Fernandez2012-12-174-37/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d3a5d29fd38d085b13b424ff6ab071925a5a261
* | | | | | | | | | | | | am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" ↵Scott Main2012-12-201-10/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'c3261bd8402b13c4c4ac8842ff7eaa51a9c8c33e': docs: NDK r8d Release Notes
generated by cgit v1.1 at 2025-02-04 04:35:39 +0000