)]}' { "log": [ { "commit": "e414608cb3dae5271104623ec52fe5a04305942a", "tree": "f16d7a233d32e59b9d9b60a0bad15a76d57f0ceb", "parents": [ "78802575ac2daf73c0869b1ef799f1dfceb49e59" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Tue Jun 10 08:20:03 2014 -0700" }, "committer": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Tue Jun 10 22:16:41 2014 +0000" }, "message": "CamcorderProfiles: Add 4K video constants\n\nBug: 15287656\nChange-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65\n" }, { "commit": "e252909394921b65bce0e1910098b7c32c82232f", "tree": "2800a3faca8295d093ed28864464f9b1100ab087", "parents": [ "03df2c51532a7fcc8d2443cdf7be94a86a20d63a", "a3d81885566f79b0e21438bd69634cc53a80918b" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Mon Jun 09 19:29:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 19:29:58 2014 +0000" }, "message": "am 6580a31d: Merge \"Adds listeners for changes to the list of active sessions\" into lmp-preview-dev\n\n* commit \u00276580a31db0727dfffba99069f4866ad01fc88cfb\u0027:\n Adds listeners for changes to the list of active sessions\n" }, { "commit": "03df2c51532a7fcc8d2443cdf7be94a86a20d63a", "tree": "9cf750cffcba9b672966e7b382ceab5efda00633", "parents": [ "58af2199a53d56a57e1bfbe497d774e09d3665c2", "55f6ab4c813b6d355ba1ba72e4e2d98b9583f6f3" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Mon Jun 09 19:29:53 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 19:29:53 2014 +0000" }, "message": "am 91ead28f: Merge \"b/15388389 Add volume handling support to MediaRouter\" into lmp-preview-dev\n\n* commit \u002791ead28f8e0d22df8c4eaed4295e8c0e1e21e35f\u0027:\n b/15388389 Add volume handling support to MediaRouter\n" }, { "commit": "58af2199a53d56a57e1bfbe497d774e09d3665c2", "tree": "81a93c02145bdda2eda299ef4b0ae43387797145", "parents": [ "5f670bd65c3562436bf87b368bccca0dfeb9f301", "20685929a4b3995d75f72059ac60a4770389a36f" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Mon Jun 09 19:29:48 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 19:29:48 2014 +0000" }, "message": "am ddbdcd09: Merge \"Add a way to get the package/pid of the session\" into lmp-preview-dev\n\n* commit \u0027ddbdcd092d1b71b987d680a8b1a5140832625410\u0027:\n Add a way to get the package/pid of the session\n" }, { "commit": "879917963810418b23f197eafea2b8a0d3b9c393", "tree": "12c5a51aaf4ab50b521484d3ad1772993c07754c", "parents": [ "7fc1e221509864b2d1014a9ad804f71ec15d9a49", "085eefd1842005e388629fdcaca6832e8766ee2c" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Mon Jun 09 19:29:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 19:29:28 2014 +0000" }, "message": "am a6b44fe7: Merge \"Fix a typo in TvContract\" into lmp-preview-dev\n\n* commit \u0027a6b44fe7d3ab727de2b82d73209efdc9bdb57b41\u0027:\n Fix a typo in TvContract\n" }, { "commit": "9aea9c93c531e0649e40f60692f775d45cc01f69", "tree": "00e46eb102a3d97bb578a43db052f0b7355105e3", "parents": [ "0d99a507b22056233a280545270198aa4a7a3d6a", "182dc33e9efcbfa80d6b277666c427c1b4afc3bf" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Mon Jun 09 19:29:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 19:29:17 2014 +0000" }, "message": "am 73fe04a4: Merge \"TIF: Address the feedback from the API review - 3/3\" into lmp-preview-dev\n\n* commit \u002773fe04a41f88eb9e4a9da8e229351ce8458d0e0d\u0027:\n TIF: Address the feedback from the API review - 3/3\n" }, { "commit": "a3d81885566f79b0e21438bd69634cc53a80918b", "tree": "c22e883695efce7fd7454b7cced8fd1c24f055bd", "parents": [ "55f6ab4c813b6d355ba1ba72e4e2d98b9583f6f3", "2e7a9167aeefeb451f8d8c769175b9a0163744f3" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Mon Jun 09 19:07:48 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 09 19:07:49 2014 +0000" }, "message": "Merge \"Adds listeners for changes to the list of active sessions\" into lmp-preview-dev" }, { "commit": "55f6ab4c813b6d355ba1ba72e4e2d98b9583f6f3", "tree": "4bc977c88361c8615f12c3314f036113b19ab60f", "parents": [ "20685929a4b3995d75f72059ac60a4770389a36f", "5d3114b64a88ac1f72becd8d46f148c666f64aa3" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Mon Jun 09 19:07:34 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 09 19:07:34 2014 +0000" }, "message": "Merge \"b/15388389 Add volume handling support to MediaRouter\" into lmp-preview-dev" }, { "commit": "20685929a4b3995d75f72059ac60a4770389a36f", "tree": "dad111e1cb6d92301c225d6b57ab37582955ff1b", "parents": [ "b6b31f2741acb8c0e45c34e92addada63ed9f915", "fb442b03840245c7e52cf2a540a77c5fc6c54587" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Mon Jun 09 19:07:20 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 09 19:07:20 2014 +0000" }, "message": "Merge \"Add a way to get the package/pid of the session\" into lmp-preview-dev" }, { "commit": "085eefd1842005e388629fdcaca6832e8766ee2c", "tree": "d1d40fa7bd96477690e9007619f518f31b9d3424", "parents": [ "cbe8e35bdae44e406476550e7c478b46931696d1", "f30ea53306f6f581a454e12eb71be2d8c54bd366" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Mon Jun 09 18:43:27 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 09 18:43:27 2014 +0000" }, "message": "Merge \"Fix a typo in TvContract\" into lmp-preview-dev" }, { "commit": "182dc33e9efcbfa80d6b277666c427c1b4afc3bf", "tree": "220f6e96d0830e9598c49288390782db2882e9f7", "parents": [ "19dba9a37d5885503ab08be873d1e3e3e8f93c9c", "1bfce9fb9bffe8bd620fd1683572ae620f91772f" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Mon Jun 09 18:38:42 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 09 18:38:43 2014 +0000" }, "message": "Merge \"TIF: Address the feedback from the API review - 3/3\" into lmp-preview-dev" }, { "commit": "dc920984f257d7cd5f89f3a4c4ba0f3baf53b790", "tree": "96d128871feedf3b18a3bd8d42ef5924b5604ba2", "parents": [ "f914a89073ac4fe2086e158c472e1e40cd4906e3", "4a21b25fad62e4f19d13ba814263841c931f56ef" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Mon Jun 09 18:25:05 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 09 18:25:06 2014 +0000" }, "message": "Merge \"Allow profile and device owners to change and get the master volume mute state.\"" }, { "commit": "4a21b25fad62e4f19d13ba814263841c931f56ef", "tree": "99ae4989ab944facd6427dc1a109d57cef292ffd", "parents": [ "f89fa8337466be97e40c3ae3cc37704e3f666b5e" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Wed Jun 04 11:11:43 2014 -0400" }, "committer": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Mon Jun 09 14:18:01 2014 -0400" }, "message": "Allow profile and device owners to change and get the master volume mute state.\n\nAlso protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.\nBug: 13585918\nChange-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a\n" }, { "commit": "f30ea53306f6f581a454e12eb71be2d8c54bd366", "tree": "b9fd6f4119ee8bb4dcb531518c9d8d86fdcd2eed", "parents": [ "89b3b4a0b214eea12a5f48b61a021103cdc5c10e" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Mon Jun 09 10:47:15 2014 -0700" }, "committer": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Mon Jun 09 17:50:07 2014 +0000" }, "message": "Fix a typo in TvContract\n\nAssigned a new value to TYPE_ATSC_M_H so that it differs from TYPE_ATSC_C.\n\nChange-Id: I65494fdf625a3b4840c9e8cfa4b728214d63e6df" }, { "commit": "32c67ee1193040d1af0a9bcf47610d128f99403e", "tree": "0cab96c65c8b3c81b71ab8954f24f97d50fb8d73", "parents": [ "4d93ea5bb39a47fa5da1abb33ff371f3d69aa139", "55f933f7157c4ce3f7ae7aa03c1695bec2f707b4" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Jun 09 17:44:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 17:44:37 2014 +0000" }, "message": "am 8be96a6f: Merge \"Make TvInputs aware of whether it\\\u0027s hardware-based or not\" into lmp-preview-dev\n\n* commit \u00278be96a6ffa5ce1783310fe490f615ff323d1d5ed\u0027:\n Make TvInputs aware of whether it\u0027s hardware-based or not\n" }, { "commit": "f928103269c948b78e93478284cc565c0ba2b040", "tree": "c8fa31ce84fdfa932b7a233ebec04bdb0b31e221", "parents": [ "0a5b7784958c9c0b2afe9aa82ce640bfa50f8dc7", "ef00c16d62cf2217c44658ad9894810322551d28" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Jun 09 16:37:31 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 16:37:31 2014 +0000" }, "message": "am ef00c16d: am de1f0023: am 2a1ed46d: Merge \"Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.\"\n\n* commit \u0027ef00c16d62cf2217c44658ad9894810322551d28\u0027:\n Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.\n" }, { "commit": "ef00c16d62cf2217c44658ad9894810322551d28", "tree": "bf90efd84e78ba1d981948ad87d1b8f3a34206aa", "parents": [ "0b889cd66fdb739a8078fb50212501849e35eb1e", "de1f00231f23937de41e671be987475fbdf9afc9" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Jun 09 16:33:39 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 16:33:39 2014 +0000" }, "message": "am de1f0023: am 2a1ed46d: Merge \"Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.\"\n\n* commit \u0027de1f00231f23937de41e671be987475fbdf9afc9\u0027:\n Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.\n" }, { "commit": "e0f2fa33d79c7351d6dd1f0738d548b6f4a62f87", "tree": "eea005e04c20ac221aada2f383ea31f3faceacfe", "parents": [ "01c07a856de163dc9a6fd31ea4b42293d221ee63" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Jun 09 09:22:58 2014 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Jun 09 09:22:58 2014 -0700" }, "message": "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.\n\nChange-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5\n" }, { "commit": "0a5b7784958c9c0b2afe9aa82ce640bfa50f8dc7", "tree": "6fbe9e429cd9fcc02c93f2738d0b559d8310af56", "parents": [ "aa00ae0a67059c305323d234cf9ffb0cf9a15961", "ba4b43228628ac0c61187621ee3abdf5e730b627" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Mon Jun 09 15:55:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 15:55:56 2014 +0000" }, "message": "am c523b768: Merge \"Make TvView keep the volume value and set later once the connecation is made.\" into lmp-preview-dev\n\n* commit \u0027c523b768331f8e3e1d355dd688f47946702cb425\u0027:\n Make TvView keep the volume value and set later once the connecation is made.\n" }, { "commit": "55f933f7157c4ce3f7ae7aa03c1695bec2f707b4", "tree": "2f5dadf78d0c324b1e7144d7a2470a09e33d96d7", "parents": [ "f43cea009447cb2d3741de94c93c28e2fd413a43", "af743eeaec43cdcb4e17fa4fa80cc29a59a1d245" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Jun 09 06:07:20 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 09 06:07:21 2014 +0000" }, "message": "Merge \"Make TvInputs aware of whether it\u0027s hardware-based or not\" into lmp-preview-dev" }, { "commit": "fb442b03840245c7e52cf2a540a77c5fc6c54587", "tree": "616c9f9660f52fb1a86cdd7a78bef71a24e471ba", "parents": [ "0791e1713be3df6acfc9e3dfa0dd8be55cf1a165" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Sun Jun 08 11:15:01 2014 -0700" }, "committer": { "name": "RoboErik", "email": "epastern@google.com", "time": "Sun Jun 08 13:20:43 2014 -0700" }, "message": "Add a way to get the package/pid of the session\n\nWe need a package/pid to connect a session to a notification. This\nadds a way to get those from the controller of a session.\n\nChange-Id: I7700a341beebd46116dfb7dc82f1a667c718e728\n" }, { "commit": "2e7a9167aeefeb451f8d8c769175b9a0163744f3", "tree": "2b3cd4aae6b41616375eae5f09e7eed0a13911b8", "parents": [ "5d3114b64a88ac1f72becd8d46f148c666f64aa3" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Wed Jun 04 16:53:45 2014 -0700" }, "committer": { "name": "RoboErik", "email": "epastern@google.com", "time": "Sun Jun 08 12:21:32 2014 -0700" }, "message": "Adds listeners for changes to the list of active sessions\n\nThe listeners get notified when sessions are added, removed, or\nreprioritized.\n\nChange-Id: I7f3bfc84049719c3b9c19016c6bac92e1a5c3179\n" }, { "commit": "5d3114b64a88ac1f72becd8d46f148c666f64aa3", "tree": "d450bb5c980612e4517a05fab22359d559bd9095", "parents": [ "2386bd5de40849bd312482e33105070cf438011d" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Tue Jun 03 16:49:49 2014 -0700" }, "committer": { "name": "RoboErik", "email": "epastern@google.com", "time": "Sun Jun 08 12:18:25 2014 -0700" }, "message": "b/15388389 Add volume handling support to MediaRouter\n\nThis makes MediaRouter work with sessions to handle volume\nrequests. Should work with all existing custom volume handling.\n\nChange-Id: I5dfde26a6203a1072b7fc700978b4ca852ebe7d0\n" }, { "commit": "1bfce9fb9bffe8bd620fd1683572ae620f91772f", "tree": "9b2931df0f11a53929dbe9b3bc31e6d77e03370b", "parents": [ "acb119f0a257e4e542a4450f60405b21a53f3545" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Tue Jun 03 23:58:49 2014 -0700" }, "committer": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Sun Jun 08 21:42:39 2014 +0900" }, "message": "TIF: Address the feedback from the API review - 3/3\n\n- Change TvView to be a generic ViewGroup with a single SurfaceView child\n\nBug: 15345342\nChange-Id: I86ed94b7020aabb6e093e391ab9477c1f801919a\n" }, { "commit": "336cdf20dd44ee93b5173be73e26e966a2609eb0", "tree": "9a67754077badffad5b254ab5afbbcaff3c8848a", "parents": [ "acb119f0a257e4e542a4450f60405b21a53f3545" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Sun Jun 08 18:20:55 2014 +0900" }, "committer": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Sun Jun 08 18:20:55 2014 +0900" }, "message": "Make TvView keep the volume value and set later once the connecation is made.\n\nBug: 15483740\nChange-Id: Id4272bffb556587707b641ec8296bc5a9e57807e\n" }, { "commit": "09c0d2618c0873dba636266f0abe1f561bd0c02d", "tree": "a1fea658839598021eed89bce5fb0ed3b0a36078", "parents": [ "bc0fbaebec174e9058fb57e77466ca8481a889de", "2f98a26bbf24fdc40ef53a653bb152c7f5a5d0dd" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Sat Jun 07 12:26:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jun 07 12:26:23 2014 +0000" }, "message": "am f6c66902: Merge \"util: Make Rational a Number/Comparable; add Range#inRange\" into lmp-preview-dev\n\n* commit \u0027f6c66902392ae7fcfd44fe90fc43b08b21db2e10\u0027:\n util: Make Rational a Number/Comparable; add Range#inRange\n" }, { "commit": "af743eeaec43cdcb4e17fa4fa80cc29a59a1d245", "tree": "c418daf3828a16a7038ebeb6c7e47057e1936de6", "parents": [ "ceb997bae0a93e7844276f2c8566951a8c7b1105" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri May 30 02:22:15 2014 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Sat Jun 07 13:36:19 2014 +0900" }, "message": "Make TvInputs aware of whether it\u0027s hardware-based or not\n\nBug: 15326724\nChange-Id: I1f418150ba29ee50afc50a811198115fdc6f9c42\n" }, { "commit": "2f98a26bbf24fdc40ef53a653bb152c7f5a5d0dd", "tree": "4222bc88e7e9c5314fa5cd9454cd62cba1ed60c9", "parents": [ "e6a4613cf3cfbcca14736cd97b9f8ba7bc01d1f0", "007bfb14d2d720cdd699cfbb36ce206246901cef" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Sat Jun 07 00:35:36 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jun 07 00:35:36 2014 +0000" }, "message": "Merge \"util: Make Rational a Number/Comparable; add Range#inRange\" into lmp-preview-dev" }, { "commit": "007bfb14d2d720cdd699cfbb36ce206246901cef", "tree": "cb7838e0d1417e554566040b0284b53148b5c23e", "parents": [ "21547d66a9ce591ff30a3ad4102f7f30a4764d80" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Jun 05 18:02:22 2014 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Jun 06 16:38:09 2014 -0700" }, "message": "util: Make Rational a Number/Comparable; add Range#inRange\n\n* Also changes Rational to reduce the numerator/denominator by\nits greatest common divisor at construction time (e.g. (2/4 -\u003e 1/2)).\n\nBug: 15432042\nChange-Id: Ib827abccf44a040667e5931cf9442afc86b57e2d\n" }, { "commit": "4ba840f18349094912ac6dd0ef054e04681b05c3", "tree": "b276f92667794ab5bc35fae9da336ccac200bc88", "parents": [ "929c6912a8310719b22571e24a0b83ad113b4b5b", "7012db741c508396ec42e731b6f77c372e0a9ed7" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Fri Jun 06 12:36:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 06 12:36:19 2014 +0000" }, "message": "am 1a4d3d02: Merge \"TIF: Address the feedback from the API review - 2/3\" into lmp-preview-dev\n\n* commit \u00271a4d3d02f32ba5e50f2b0da9058dedfbd6342ef9\u0027:\n TIF: Address the feedback from the API review - 2/3\n" }, { "commit": "929c6912a8310719b22571e24a0b83ad113b4b5b", "tree": "53e344c53ff8483cd8340681d2fdbcf036f75902", "parents": [ "c09722dc554a27b472c6f6264f9479d6d0639a28", "2750d21d8ba9cce5eec5010889a33a2b15dc99f2" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Fri Jun 06 12:36:13 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 06 12:36:13 2014 +0000" }, "message": "am 77b29f1f: Merge \"TIF: Address the feedback from the API review - 1/3\" into lmp-preview-dev\n\n* commit \u002777b29f1f7a0dfc7305ed49d2b68bb35b9cc11f4c\u0027:\n TIF: Address the feedback from the API review - 1/3\n" }, { "commit": "7012db741c508396ec42e731b6f77c372e0a9ed7", "tree": "562d53002eac6170493c83b451a04dedc4176f7d", "parents": [ "2750d21d8ba9cce5eec5010889a33a2b15dc99f2", "b8a64416e5e7cf39fd899fa600a940b0ef3c15fd" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Fri Jun 06 06:59:16 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 06 06:59:17 2014 +0000" }, "message": "Merge \"TIF: Address the feedback from the API review - 2/3\" into lmp-preview-dev" }, { "commit": "2750d21d8ba9cce5eec5010889a33a2b15dc99f2", "tree": "810a560847225e1b13511de67864780cef44d013", "parents": [ "7e984a953eadb690dbe32462c8860a0b1306e11d", "782f7345471072b630e58c7abd3579b0015273b1" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Fri Jun 06 06:58:01 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 06 06:58:02 2014 +0000" }, "message": "Merge \"TIF: Address the feedback from the API review - 1/3\" into lmp-preview-dev" }, { "commit": "b8a64416e5e7cf39fd899fa600a940b0ef3c15fd", "tree": "c50bf062c1929e415c02ae78061de792bc58dbd9", "parents": [ "782f7345471072b630e58c7abd3579b0015273b1" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Tue Jun 03 15:34:50 2014 -0700" }, "committer": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Fri Jun 06 09:13:28 2014 +0900" }, "message": "TIF: Address the feedback from the API review - 2/3\n\nThis change addresses the following comments from the council:\n- Change the TvView API to be tune(String inputId, Uri channelUri) and\n reset()\n- @hide TvInputSession class, including createSession() and\n SessionCallback\n- Define a listener interface specific to TvView, allowing you to hide\n the session details and keep the API simpler. Add\n setTvInputListener().\n\nBug: 15345342\nChange-Id: I931662841b41d862ebc4a700ccb245889a5f87a5\n" }, { "commit": "4a2e599b5a48a5d348b5846baba387405596b7f1", "tree": "6a3a9bc75d29236709e88e2bc5f61420e8fd7170", "parents": [ "f537259ec420052cae342c213579aec26c488055", "cc15afbe12a92e1b0db7c2f8e97c5c0c9b089f16" ], "author": { "name": "Ji-Hwan Lee", "email": "jihwan@google.com", "time": "Thu Jun 05 22:23:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 05 22:23:11 2014 +0000" }, "message": "am b3412adf: Merge \"TvContract: Add channel logo and program thumbnail\" into lmp-preview-dev\n\n* commit \u0027b3412adf92b9d932b600acf44c4463cf06387a8e\u0027:\n TvContract: Add channel logo and program thumbnail\n" }, { "commit": "cc15afbe12a92e1b0db7c2f8e97c5c0c9b089f16", "tree": "1e7a4e75f9a5d19fccfe26a951bc59109bd30351", "parents": [ "66c11e1f8478a3f436e31e315f9bbb43d6d5f021", "4c1959cc45e944a083d84b5326b30faa14e3d13f" ], "author": { "name": "Ji-Hwan Lee", "email": "jihwan@google.com", "time": "Thu Jun 05 22:12:05 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 05 22:12:08 2014 +0000" }, "message": "Merge \"TvContract: Add channel logo and program thumbnail\" into lmp-preview-dev" }, { "commit": "c954e61cd73875e74115c778cb5e35eab9695a59", "tree": "ab3065d28516570d2847d6bc9206b67e97cdb576", "parents": [ "70dbeacadcd2a8469ff7d451c570d8236cb96370", "4586b0da631758e2753c3f0936f410ff3a6c3bda" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Jun 05 21:00:32 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 05 21:00:32 2014 +0000" }, "message": "am 3966c960: Merge \"Add defaults for caption colors and edge type\" into lmp-preview-dev\n\n* commit \u00273966c9604e55c9183a6d1ba8b3540add3be4434f\u0027:\n Add defaults for caption colors and edge type\n" }, { "commit": "4586b0da631758e2753c3f0936f410ff3a6c3bda", "tree": "92cbb9d3d322db8586389a60648c8509979f7372", "parents": [ "1494f8671ef6d9e6f14fb18b2248eecc37d0dcfc", "e88aee8ad85b01229b12dbc0c3cc2f0b8b490192" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Jun 05 20:37:21 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 05 20:37:22 2014 +0000" }, "message": "Merge \"Add defaults for caption colors and edge type\" into lmp-preview-dev" }, { "commit": "4c1959cc45e944a083d84b5326b30faa14e3d13f", "tree": "eb4a8ef90913b191a3277727376b755f650ddd1f", "parents": [ "a335e14b6bcb71920f34a968ebc88a40ba116002" ], "author": { "name": "Ji-Hwan Lee", "email": "jihwan@google.com", "time": "Fri Jun 06 00:30:16 2014 +0900" }, "committer": { "name": "Ji-Hwan Lee", "email": "jihwan@google.com", "time": "Fri Jun 06 05:12:12 2014 +0900" }, "message": "TvContract: Add channel logo and program thumbnail\n\nChannel logo is exposed via its own content URI,\n\"content://android.media.tv/channel/#/logo\".\n\nProgram thumbnail is added as an URI column in existing program table.\n\nChange-Id: I8dd636bbea9d3fa991ad42ccc03a198e8c1d051d\n" }, { "commit": "2432912b356dfafd72f8be7b45286a9bc979029e", "tree": "9bf6b4fe6800f2807e4dff1243a079229486adb5", "parents": [ "29dee1bbba40976f4bb1122d134a0444b0ecb953", "f8272896686cbb3b88dbbd7338a418f72ed2347b" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jun 05 11:35:53 2014 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jun 05 11:35:53 2014 -0700" }, "message": "resolved conflicts for merge of f8272896 to master\n\nChange-Id: I34a156bceb5dacd90c399c56c6f07d2a8e5c0c85\n" }, { "commit": "f8272896686cbb3b88dbbd7338a418f72ed2347b", "tree": "3364cda46837edc3ef6ffa749ca848cd966a3d11", "parents": [ "2304bf4cd4e377994d80f55871fd31f82bb4f646", "bd1949a4fbd6eb61e7a0a0f81d654a8df50999bf" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jun 05 18:29:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 05 18:29:24 2014 +0000" }, "message": "am bd1949a4: am b2842e72: Merge \"[LP64] Fix access to MediaAlbumArt.\"\n\n* commit \u0027bd1949a4fbd6eb61e7a0a0f81d654a8df50999bf\u0027:\n [LP64] Fix access to MediaAlbumArt.\n" }, { "commit": "9f47b84c042b563ac88941424db606dcf9c16267", "tree": "aebc2a40d4da883d959a2f91be744c7d352ac3c6", "parents": [ "38f650818a6a0d2e4f87c6d67c0f57b2720fcb82", "b45c27303339e5baa9fe40e4f8ecd211e382982f" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 05 18:06:06 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 05 18:06:06 2014 +0000" }, "message": "Merge \"AudioAttributes: parcelable, hide support for tags\"" }, { "commit": "9fa803be109339e8ebfa7f338bf18858f49af709", "tree": "b9152d087c70a33733f3b5d70521e519b970e56d", "parents": [ "759a89782d38ddf6ab7f4a2c22c8911ea206b275" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jun 05 10:38:30 2014 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jun 05 10:38:30 2014 -0700" }, "message": "[LP64] Fix access to MediaAlbumArt.\n\nThe mSize field is a uint32_t, not a long.\n\nChange-Id: Id3b9e6049e8998840d33fa886b676db2a8022064\n" }, { "commit": "42cdf48b2f1a00aac98b8192aef8ace39a891b29", "tree": "ec4fe1a8790fe7b8f895439ee8f566deb711d1fe", "parents": [ "585fc71ea71e594b179bf53522f6201b3858f91c", "a335e14b6bcb71920f34a968ebc88a40ba116002" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Jun 05 16:47:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 05 16:47:45 2014 +0000" }, "message": "am e637e614: Merge \"remove debug log in AudioPortEventHandler.\" into lmp-preview-dev\n\n* commit \u0027e637e614b95eb8bb5b4d69ad5ab89ce92e4b5a29\u0027:\n remove debug log in AudioPortEventHandler.\n" }, { "commit": "a335e14b6bcb71920f34a968ebc88a40ba116002", "tree": "05d887827ca980d23fd2dd361bc91f85e7578b2b", "parents": [ "8089ce7cbc6ddae54c7a9623fd2692704d0bcdb2", "e94379beba4648c0a527ce3be32216276a55c7f7" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Jun 05 15:18:35 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 05 15:18:35 2014 +0000" }, "message": "Merge \"remove debug log in AudioPortEventHandler.\" into lmp-preview-dev" }, { "commit": "782f7345471072b630e58c7abd3579b0015273b1", "tree": "6d1b1e1452759ccecfbbd4a7547765a889de1da0", "parents": [ "8224ad4f70a66316a77e9aafbdfe495aba8a8680" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Tue Jun 03 12:51:21 2014 -0700" }, "committer": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Thu Jun 05 19:22:18 2014 +0900" }, "message": "TIF: Address the feedback from the API review - 1/3\n\nThis change addresses the following comments from the council:\n- Change TvView.setVolume() --\u003e setStreamVolume()\n- Surface only TvInputInfo.getServiceInfo() instead of the separate\n getPackage/getService/getComponent calls. However, keep loadLabel()\n at the top level.\n- @hide register/unregisterListener() for the preview, since it binds\n out to each service.\n- TvInputService should document which permission it should protect\n itself with.\n- Remove TvInputService.setAvailable() for third-party developers.\n- Change class name TvInputSessionImpl --\u003e Session\n- Change callback name to onSetStreamVolume() to match earlier change\n\nBug: 15345342\nChange-Id: I3ce5cba7dad2622b78d16c408f81c4b0eba837a4\n" }, { "commit": "e94379beba4648c0a527ce3be32216276a55c7f7", "tree": "2b8ded6166eee903228957fcb6ab1098137f5ebb", "parents": [ "e205192c722e4fa1b37ee1b31dced21cf89ffbb4" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jun 04 20:09:13 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jun 04 20:09:13 2014 -0700" }, "message": "remove debug log in AudioPortEventHandler.\n\nBug: 14815883.\nChange-Id: Ib5076fcfe8a36d1dd772b072fdf3400e57acc61c\n" }, { "commit": "e88aee8ad85b01229b12dbc0c3cc2f0b8b490192", "tree": "ea03bb3ae8e88df6b776b8dd0411a187e4a8fcb7", "parents": [ "648a309d9badc405bc969bcb4461369bf89fe7ef" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Jun 04 18:35:42 2014 -0700" }, "committer": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Jun 04 18:35:42 2014 -0700" }, "message": "Add defaults for caption colors and edge type\n\nBUG: 8151470\nChange-Id: I4d7b75bf647aeded77b4000cdcd37e9ace46a374\n" }, { "commit": "b45c27303339e5baa9fe40e4f8ecd211e382982f", "tree": "9587e5ea36d572671d967867950d808bebc06cca", "parents": [ "676f92e9a77a547b80a3a22bb3d4e4d0d2aa0bed" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Jun 03 16:06:48 2014 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Jun 04 17:22:16 2014 -0700" }, "message": "AudioAttributes: parcelable, hide support for tags\n\nMake the AudioAttributes class parcelable.\n\nHide support for adding and querying tags, there is no SDK-backed\n use case for this feature.\n\nBug 15306334\n\nChange-Id: Idb67a735778e687d73020ed0120643f31fc230a6\n" }, { "commit": "7d10873c5c75baedfeafed63c9111c8785b3cd17", "tree": "fbdd74551d235fccdf02f56bbfbcd50159d2488a", "parents": [ "f3f8a73a57a34b405e73c83af8f4d42e9592079c", "8da213917ec58debffd91bbc64451b38361af428" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jun 04 18:44:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 04 18:44:26 2014 +0000" }, "message": "am dd76759d: Merge \"AudioManager: fix AudioPort gain query\" into lmp-preview-dev\n\n* commit \u0027dd76759d3e279cd56d6b1ce16a0b9488af35e0ab\u0027:\n AudioManager: fix AudioPort gain query\n" }, { "commit": "450758a55cc625cc12bf818390cc1899ad0a74bc", "tree": "f9714d8a91a75868b3b07874908f8f9c90e6bd67", "parents": [ "78b13b219f385646c80ef72035989e08330d533a", "7b2ae34b97943a4dfe3fa6b5c1c74f415b468993" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Wed Jun 04 17:01:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 04 17:01:47 2014 +0000" }, "message": "am 65d95bfa: Merge \"Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.\" into lmp-preview-dev\n\n* commit \u002765d95bfa011fa50e50403f41e08afa2af5d9746e\u0027:\n Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.\n" }, { "commit": "8da213917ec58debffd91bbc64451b38361af428", "tree": "2249dce6cf6991ea4973f99e8e680bf996f5369f", "parents": [ "4021b3ba74471b35e510543b765a2265eff9912a", "b4e0909fc4fb08f513cb2b39a919b189621be87c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jun 04 00:27:50 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 04 00:27:50 2014 +0000" }, "message": "Merge \"AudioManager: fix AudioPort gain query\" into lmp-preview-dev" }, { "commit": "6dd6a3dfa0c3b0e938abb52c8b453a5cf2dcd364", "tree": "c526792c4ff51bbe8930b08196aeb6b1df6b835a", "parents": [ "47da909503dace6ecae400301654ca1499aeef1e", "c52f4e25e21719d5d637a588e3200be941b9fe4d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Jun 03 20:38:08 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 03 20:38:08 2014 +0000" }, "message": "Merge \"Update android.media.AudioTrack.getTimestamp API documentation\"" }, { "commit": "39f5300ebc6f0508b4c59ca509061ae94bc3f0c6", "tree": "975e3f7a2025e10a24d0e7b6ddc2e34398330a0c", "parents": [ "4af26e7c98ccfe51c6c17ab292875441c6039131", "f723f8e9cf5b4a00ce84c8b1b4b9256cf7745e2c" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Jun 03 20:17:38 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 03 20:17:38 2014 +0000" }, "message": "Merge \"AudioFormat class\"" }, { "commit": "2e0bacc2a363a6cb304c926f513705af17699821", "tree": "d0e6a94391cef4b63b6b845874fda46eddef37e3", "parents": [ "8d2d5c8d5caaf27ffe78841f42d958c8c9db1167", "6fbe3982b035c200543454bb29b9f3e33b5e347a" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Tue Jun 03 17:17:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 03 17:17:00 2014 +0000" }, "message": "am 594ac157: Merge \"TvContract: Address the feedback from the API review\" into lmp-preview-dev\n\n* commit \u0027594ac1575f8301023d37c329f8c676ba9bda396c\u0027:\n TvContract: Address the feedback from the API review\n" }, { "commit": "f573765bf1a70d3af7d6149fb01dbe0f74f95834", "tree": "2dc58cc3fce22310a6f18ecc0b2955f316d467cd", "parents": [ "02a078d088cabe694a07e6f916fe8a0eda58f74c", "6abd0d801b6772bb9d0fe6cd4c007dace2f38570" ], "author": { "name": "Chulwoo Lee", "email": "chulwoo@google.com", "time": "Tue Jun 03 17:16:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 03 17:16:33 2014 +0000" }, "message": "am b9c0a8ae: Merge \"Add a way to get the class name of SetupActivity and SettingsActivity\" into lmp-preview-dev\n\n* commit \u0027b9c0a8ae7b0e69829a663fa2ca6bbdededa02d93\u0027:\n Add a way to get the class name of SetupActivity and SettingsActivity\n" }, { "commit": "4c9e57f156d3cbd86b38e9897dfdab81964efe90", "tree": "55cb749043c9dd147d3bdacb981f935cc0e2fe62", "parents": [ "5e9a42588e986a7a2ab12de5d70adff5f2db9c5a", "3c784d6359f15a5451b670a18384e9ae3c9aa276" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Tue Jun 03 10:03:46 2014 -0700" }, "committer": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Tue Jun 03 17:06:58 2014 +0000" }, "message": "resolved conflicts for merge of ebe661c4 to master\n\nChange-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4" }, { "commit": "7b2ae34b97943a4dfe3fa6b5c1c74f415b468993", "tree": "4ae0b6f46fb294600e72c121e06a4565092a9179", "parents": [ "0aa5420504d0414fdcfd54f7352ac8009707717f", "a3be12a236aef0d9c4ff1274075f1e7899d29153" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Tue Jun 03 02:31:28 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 03 02:31:28 2014 +0000" }, "message": "Merge \"Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.\" into lmp-preview-dev" }, { "commit": "f723f8e9cf5b4a00ce84c8b1b4b9256cf7745e2c", "tree": "4c8b22dd4e42c61aa2e1998e4f67fa99edefdc1f", "parents": [ "26e8f040ba383dc44c25013692748cc27e50799d" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu May 29 20:48:55 2014 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Jun 02 19:31:05 2014 -0700" }, "message": "AudioFormat class\n\nChange-Id: I425c80c6caed98f6fa31e8cad8f15435c99ebc20\n" }, { "commit": "b4e0909fc4fb08f513cb2b39a919b189621be87c", "tree": "6b9c5f6bdd831c2a72f4c4cbf81bd7cc6cd8c1b6", "parents": [ "e205192c722e4fa1b37ee1b31dced21cf89ffbb4" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Jun 02 19:18:43 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Jun 02 19:22:48 2014 -0700" }, "message": "AudioManager: fix AudioPort gain query\n\nFix bug causing AudioPort.gain(int) to always return null.\n\nAlso removed debug log from AudioManager.\n\nBug: 14815883.\nChange-Id: Ie65bab233ec8b4d974061e11ec5b8f0de18275d9\n" }, { "commit": "a3be12a236aef0d9c4ff1274075f1e7899d29153", "tree": "4effaecc291597c4b9d65ad039bbe49161377288", "parents": [ "6abd0d801b6772bb9d0fe6cd4c007dace2f38570" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Mon Jun 02 13:33:55 2014 +0900" }, "committer": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Tue Jun 03 09:53:05 2014 +0900" }, "message": "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.\n\nBug: 14628404\nChange-Id: I40abf647e9d608c2c793d007fd2fe0d511535bdd\n" }, { "commit": "6fbe3982b035c200543454bb29b9f3e33b5e347a", "tree": "d39c6b570dd0bff67c4fec22d47e024cc4d9db36", "parents": [ "5a26f00c846f62e5c5039923d7d6de2ac04c4436", "bd23fa0ba1460a8d5194fd7c700030bf9c3f6fcb" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Tue Jun 03 00:26:05 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 03 00:26:05 2014 +0000" }, "message": "Merge \"TvContract: Address the feedback from the API review\" into lmp-preview-dev" }, { "commit": "e7bb7d6bb2257c24076f5a4b9f536f90a6637f58", "tree": "7d4aa3140b0fd1a3510b74075968d2a62c77f3c4", "parents": [ "0bec638839b0a07502ff27c9dcf4419b3c47a0d2" ], "author": { "name": "Chulwoo Lee", "email": "chulwoo@google.com", "time": "Tue May 27 14:10:37 2014 +0900" }, "committer": { "name": "Chulwoo Lee", "email": "chulwoo@google.com", "time": "Tue Jun 03 08:56:35 2014 +0900" }, "message": "Add a way to get the class name of SetupActivity and SettingsActivity\n\nNow, there can be only one SetupActivity and one SettingsActivity for\none TIS apk though one TIS apk can contain several services. Each TIS\nneed to be able to have its own SetupActivity and SettingsActivity.\n\nBUG: 15177340\nChange-Id: I2d944e3ef35c3a981483ba643fd27b15925bab16\n" }, { "commit": "bd23fa0ba1460a8d5194fd7c700030bf9c3f6fcb", "tree": "874c23a4a50dc29bb83145535ec1effe7fe47dd0", "parents": [ "0bec638839b0a07502ff27c9dcf4419b3c47a0d2" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Sat May 31 17:20:01 2014 -0700" }, "committer": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Mon Jun 02 16:44:37 2014 -0700" }, "message": "TvContract: Address the feedback from the API review\n\nThis change addresses the following comments from the council:\n- Provider authority should be \"android.media.tv\"\n- Rename COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA and add comment to\n indicate data is internal to the provider that inserted it, and should\n not be decoded by other apps. It would be nice to restrict read access\n to this column, but not essential.\n- Hide COLUMN_LOCKED since implementation isn\u0027t defined yet, also\n questions about how it interacts with Unicorn.\n- Fix typo in ORIGINAL_NETWORK documentation.\n- All provider MIME types need to be changed to follow platform\n conventions: \"vnd.android.cursor.dir/channel\",\n \"vnd.android.cursor.dir/program\", etc. (Notice singular tense and no\n package prefixes since they\u0027re part of the platform API.)\n- Rename Programs.COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA, along\n with docs update, for the same reasons as above.\n- Rename COLUMN_DESCRIPTION to COLUMN_SHORT_DESCRIPTION and update docs\n to indicate it\u0027s a recommended maximum length, not a hard cap.\n- COLUMN_GENRE should be split into two columns: COLUMN_BROADCAST_GENRE\n (from broadcast standard) and COLUMN_CANONICAL_GENRE (from an Android\n standard). Define a subclass with the Android canonical genres, which\n are simple strings that are comma-separated when inserted into\n COLUMN_CANONICAL_GENRE.\n\nBug: 15345342\nChange-Id: I7f8e70aef617475a59d096fd73a551e7df8a1d3a\n" }, { "commit": "9dc96cf0fc6261606495e5e56c0be7bee77d8895", "tree": "8673e4ffebf02a196c1b61663f6afb66c710c2ab", "parents": [ "307a37c2afc30190151285eb96ebd6a6940a96ec", "a0183b02e4c6f53587519b445a546192b4a20146" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Jun 02 18:32:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 02 18:32:26 2014 +0000" }, "message": "am a0183b02: am 8868d129: am 1c725866: Merge \"MtpDatabase JNI: Fixed incorrect method name in ALOGE.\"\n\n* commit \u0027a0183b02e4c6f53587519b445a546192b4a20146\u0027:\n MtpDatabase JNI: Fixed incorrect method name in ALOGE.\n" }, { "commit": "307a37c2afc30190151285eb96ebd6a6940a96ec", "tree": "c43ec6fb0e1abbc5331eb8916307a798611c7aba", "parents": [ "776512d4b6a7c1b1b7893cde5bec1f3d65c0ea94", "1ac54ec69bfcda2638b05c7daa4300ec5749e7b8" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Jun 02 18:32:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 02 18:32:20 2014 +0000" }, "message": "am 1ac54ec6: am 750e78bb: am 27eb205e: Merge \"MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().\"\n\n* commit \u00271ac54ec69bfcda2638b05c7daa4300ec5749e7b8\u0027:\n MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().\n" }, { "commit": "a0183b02e4c6f53587519b445a546192b4a20146", "tree": "57f0c0cff39a55609265c7e0aca2590dab8d81cc", "parents": [ "1ac54ec69bfcda2638b05c7daa4300ec5749e7b8", "8868d1290afd96997fef671f4a7a4c7bbf94fa1a" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Jun 02 18:28:51 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 02 18:28:51 2014 +0000" }, "message": "am 8868d129: am 1c725866: Merge \"MtpDatabase JNI: Fixed incorrect method name in ALOGE.\"\n\n* commit \u00278868d1290afd96997fef671f4a7a4c7bbf94fa1a\u0027:\n MtpDatabase JNI: Fixed incorrect method name in ALOGE.\n" }, { "commit": "1ac54ec69bfcda2638b05c7daa4300ec5749e7b8", "tree": "33ff7238532f873a0542767e33cedeefdbdb3a31", "parents": [ "ec3ade5e8e7fffd439f25a53c74f67e63b86c4d2", "750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Jun 02 18:28:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 02 18:28:42 2014 +0000" }, "message": "am 750e78bb: am 27eb205e: Merge \"MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().\"\n\n* commit \u0027750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da\u0027:\n MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().\n" }, { "commit": "8868d1290afd96997fef671f4a7a4c7bbf94fa1a", "tree": "350b8642e2ae5917759579a20514a0c3a5b76003", "parents": [ "750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da", "1c725866da02c3e1f62fb416ea3450caed406f2a" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Jun 02 18:25:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 02 18:25:35 2014 +0000" }, "message": "am 1c725866: Merge \"MtpDatabase JNI: Fixed incorrect method name in ALOGE.\"\n\n* commit \u00271c725866da02c3e1f62fb416ea3450caed406f2a\u0027:\n MtpDatabase JNI: Fixed incorrect method name in ALOGE.\n" }, { "commit": "750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da", "tree": "7b9c575ad96bf745f7ed73a0aaa396b2d4045032", "parents": [ "daa0ee137d43850c834b1ead3f871ceaa49814a7", "27eb205e21e7715764084085f382d690e0406c63" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Jun 02 18:25:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 02 18:25:28 2014 +0000" }, "message": "am 27eb205e: Merge \"MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().\"\n\n* commit \u002727eb205e21e7715764084085f382d690e0406c63\u0027:\n MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().\n" }, { "commit": "d5cc4a281e7ce29d1e8687ff3394b57a3a549260", "tree": "a54c168980e6a2fc805892d1653236f7da6ebe5c", "parents": [ "e205192c722e4fa1b37ee1b31dced21cf89ffbb4" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Fri May 30 16:57:43 2014 -0700" }, "committer": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Mon Jun 02 11:02:52 2014 -0700" }, "message": "Put TV Input Framework under android.media.tv, including TvContract\n\nBug: 15345342\nChange-Id: I665ca23f0f074ce29cb2e047109b209178532107\n" }, { "commit": "830fd7036e7287df90d1889a43f6f8d3560c48bd", "tree": "afaab9155cd27ad3d6acedd3ff7bb278881a5a17", "parents": [ "e2c6327a38d1b3edcb39d8f96f4270ce8990cb44", "e78755e180c4f29ccc324112286dd81ab2016c40" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Mon Jun 02 17:15:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 02 17:15:14 2014 +0000" }, "message": "am c7ed6f69: Merge \"Minimum work to make volume handling work with sessions\" into lmp-preview-dev\n\n* commit \u0027c7ed6f69d474f23df89d36ed94ff0062daa8dcbc\u0027:\n Minimum work to make volume handling work with sessions\n" }, { "commit": "e78755e180c4f29ccc324112286dd81ab2016c40", "tree": "a414dfa20c73b816b375eb093e0d1f2e4cdbc54a", "parents": [ "ddc93ce3438618a15f30fc20d45634325f8ce84f", "b69ffd4dc2c8fa85e0064151141ebeee90de471e" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Mon Jun 02 17:10:07 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 02 17:10:07 2014 +0000" }, "message": "Merge \"Minimum work to make volume handling work with sessions\" into lmp-preview-dev" }, { "commit": "3a4398a76ceb8ba0679f4b4a585e47d398e05728", "tree": "ee61b23e648d302c36503e72d1d380e3a122f169", "parents": [ "f3bbf2b80167faa0091ad31511405283792408a9", "ddc93ce3438618a15f30fc20d45634325f8ce84f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Jun 02 16:49:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 02 16:49:15 2014 +0000" }, "message": "am 209fc1ae: AudioManager: do not mandate a looper\n\n* commit \u0027209fc1ae7abb6965cb4f18bf68ff8c350e9d40d9\u0027:\n AudioManager: do not mandate a looper\n" }, { "commit": "ddc93ce3438618a15f30fc20d45634325f8ce84f", "tree": "00c3d0c863b6f1890390acbc3feba31d21e6ba60", "parents": [ "58136d02113ae768dc2cdf871a773bd34cc71583" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Jun 02 09:16:02 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Jun 02 09:16:02 2014 -0700" }, "message": "AudioManager: do not mandate a looper\n\nHaving a listener for audio port updates is not mandatory.\ndo not throw an excepion when AudioManager is contructed\nfrom a thread without looper.\n\nBug: 15368707.\nChange-Id: If5ce54bf4efdff8b785098649fa1cd0564861e1e\n" }, { "commit": "41792644d911f88e48ee7a9e34e6ddfbf35b46ef", "tree": "87fdec555be7bdeb0afd73ea32874b921653dc0f", "parents": [ "c2e97779bcad16f4bb45633c8f2cd809c2e83e32", "a11b4affcad3d255aa723a89b768ea222506f2e8" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Sun Jun 01 15:59:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Jun 01 15:59:47 2014 +0000" }, "message": "am bfea31fd: VolumeZen: Prevent raising ringer volume in silent mode.\n\n* commit \u0027bfea31fd6dd88c94deae1122874b4e0737380d25\u0027:\n VolumeZen: Prevent raising ringer volume in silent mode.\n" }, { "commit": "a11b4affcad3d255aa723a89b768ea222506f2e8", "tree": "44b0ebdd49385b80937ce006cf7435e08c258bb6", "parents": [ "d1c86e2cb272f8b8be5b9b47aa4ec7084fe61c22" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Sun Jun 01 11:52:23 2014 -0400" }, "committer": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Sun Jun 01 11:52:23 2014 -0400" }, "message": "VolumeZen: Prevent raising ringer volume in silent mode.\n\nInstead of breaking out of silent mode when raising the volume\nusing the keys, prevent the change and display a visual hint up\nin the user interface.\n\nBug:15330217\nChange-Id: I74aae44319aadcd6db9841c7799967607f5a1617\n" }, { "commit": "986b46d17974f37b82a106094aa258fd707a4596", "tree": "c20da03c819a4269daf371802341e6d5faf28240", "parents": [ "17a24c58bb2e86719f003c80f682beb66803f24d" ], "author": { "name": "Martin Blumenstingl", "email": "martin.blumenstingl@googlemail.com", "time": "Sat May 31 15:53:00 2014 +0200" }, "committer": { "name": "Martin Blumenstingl", "email": "martin.blumenstingl@googlemail.com", "time": "Sat May 31 16:17:11 2014 +0200" }, "message": "MtpDatabase JNI: Fixed incorrect method name in ALOGE.\n\nChange-Id: I46688cf79f1e7554b28162df2347c4dcb571b8a9\n" }, { "commit": "17a24c58bb2e86719f003c80f682beb66803f24d", "tree": "0ed75f8f4ed1d31efd4df272715a82ac481f8190", "parents": [ "4f8785f28e6305d427cc3e483248828c9b9b06a2" ], "author": { "name": "Martin Blumenstingl", "email": "martin.blumenstingl@googlemail.com", "time": "Sat May 31 15:50:38 2014 +0200" }, "committer": { "name": "Martin Blumenstingl", "email": "martin.blumenstingl@googlemail.com", "time": "Sat May 31 16:17:11 2014 +0200" }, "message": "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().\n\nThe jstring \"stringValue\" was not never freed.\nIn the case where \"str\" was NULL the whole cleanup part (see \"goto out\")\nwas even skipped.\nThis patch makes getObjectPropertyValue() behave like\ngetObjectPropertyList().\n\nChange-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e\n" }, { "commit": "3ed851bd07867fe41c5c9c2a9421da0b92ae1c6e", "tree": "444c9b63a1c47aad7e993a81da4f28189058d317", "parents": [ "086995c6dae73f2fa30e647c90ca6247c7982ea5", "54b5e5bdf621449a1806ff2971b95df273069c44" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat May 31 01:56:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 31 01:56:09 2014 +0000" }, "message": "am f2e19a36: Merge \"AudioManager: add audio port gain control\" into lmp-preview-dev\n\n* commit \u0027f2e19a36973331bbc09284993f772bf6981c10da\u0027:\n AudioManager: add audio port gain control\n" }, { "commit": "086995c6dae73f2fa30e647c90ca6247c7982ea5", "tree": "4826352d3d8939dd23d630b742bb2df537805cf3", "parents": [ "ec2f4b0aece1583f3e3f5c449ca107d6f7e915e1", "8725859ee3a9fb7dd09641c2b13baa4f7a16ca99" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat May 31 01:56:03 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 31 01:56:03 2014 +0000" }, "message": "am b4499f84: Merge \"audio routing update listener\" into lmp-preview-dev\n\n* commit \u0027b4499f84605faf06479cbb793e945d0af50fdead\u0027:\n audio routing update listener\n" }, { "commit": "ec2f4b0aece1583f3e3f5c449ca107d6f7e915e1", "tree": "1ab1e3025ec78e0b282cb3e047d80841e7e5746b", "parents": [ "0d0aa78a05c6a932d3e20ec04a598f40e17b38dc", "a89eb2d8e550b511285ab3b4fb7dec1ed4ca5028" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat May 31 01:55:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 31 01:55:58 2014 +0000" }, "message": "am 47615317: Merge \"AudioSystem: added JNI for routing extensions\" into lmp-preview-dev\n\n* commit \u0027476153173b5a1b6b1fb5fc41af8b87d7e1ec36b3\u0027:\n AudioSystem: added JNI for routing extensions\n" }, { "commit": "54b5e5bdf621449a1806ff2971b95df273069c44", "tree": "86cbd3faf4cddfa699cbedde701b18107818b56e", "parents": [ "8725859ee3a9fb7dd09641c2b13baa4f7a16ca99", "3a24199a0fe9479802ff6096d82cb3745efa1f1f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat May 31 00:49:57 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat May 31 00:49:58 2014 +0000" }, "message": "Merge \"AudioManager: add audio port gain control\" into lmp-preview-dev" }, { "commit": "8725859ee3a9fb7dd09641c2b13baa4f7a16ca99", "tree": "3893300514607088109f32e74023fbb50965d46a", "parents": [ "a89eb2d8e550b511285ab3b4fb7dec1ed4ca5028", "700e73471d85348b52ecf213c36bb24b93997ec7" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat May 31 00:49:43 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat May 31 00:49:44 2014 +0000" }, "message": "Merge \"audio routing update listener\" into lmp-preview-dev" }, { "commit": "a89eb2d8e550b511285ab3b4fb7dec1ed4ca5028", "tree": "2d48237cd68700a09a2084e971eef1daa697202b", "parents": [ "ba23f6da6e40892202199a4b7c5672b92827828d", "b69681c894c663e84f2826d9b0c832ceb9b45047" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat May 31 00:49:26 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat May 31 00:49:27 2014 +0000" }, "message": "Merge \"AudioSystem: added JNI for routing extensions\" into lmp-preview-dev" }, { "commit": "3a24199a0fe9479802ff6096d82cb3745efa1f1f", "tree": "7409f76d1b7340abc58eb547bc031e7fec7c7fab", "parents": [ "700e73471d85348b52ecf213c36bb24b93997ec7" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon May 19 19:33:26 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 30 17:13:10 2014 -0700" }, "message": "AudioManager: add audio port gain control\n\nImplement AudioManager.setAudioPortGain() API.\n\nBug: 14815883.\n\nChange-Id: Ib54bd1fd1392c474f4767a00228b0a617c51ec5e\n" }, { "commit": "700e73471d85348b52ecf213c36bb24b93997ec7", "tree": "2d0490799e345f0e75a09248df44353bd9077447", "parents": [ "b69681c894c663e84f2826d9b0c832ceb9b45047" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 02 18:33:15 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 30 17:13:10 2014 -0700" }, "message": "audio routing update listener\n\nImplement audio port and audio patch\ncallback infrastructure for clients to receive\nnotifications when audio routing changes occur via the\nOnAudioPortUpdateListener interface.\n\nBug: 14815883.\n\nChange-Id: I32cbba64eca7369871aec235ff100de1f0c2d344\n" }, { "commit": "b69681c894c663e84f2826d9b0c832ceb9b45047", "tree": "ca8396318b56f53719b61d93847aed0f8f958c06", "parents": [ "575510c48f3cad55a4751db89dc44e330b0cc9df" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon May 19 19:02:51 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 30 17:12:48 2014 -0700" }, "message": "AudioSystem: added JNI for routing extensions\n\nBug: 14815883.\n\nChange-Id: Ia0c0d14a8e3051a4bc0ce502b6e979135b170c97\n" }, { "commit": "8f3ee7df068cf00957f6a96ee67e5a4d2b825d17", "tree": "603dc724ec6fd61e07c96ecea1fff0dbee3029f7", "parents": [ "00fcdc1236a8730d4c69c779a92b2c20cdb54be6", "948d08dcdd0ddaf7fc4122b6a54b451b77e26854" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sat May 31 00:08:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 31 00:08:28 2014 +0000" }, "message": "am d99ebf8b: Merge \"Fix name error in com.android.mediadrm.signer.xml\" into lmp-preview-dev\n\n* commit \u0027d99ebf8bc7aaadeb006bfd47e4adc05d9b4e4564\u0027:\n Fix name error in com.android.mediadrm.signer.xml\n" }, { "commit": "948d08dcdd0ddaf7fc4122b6a54b451b77e26854", "tree": "c55fcf39c82eebaa35945ee53a668269814c6027", "parents": [ "725010a83f1798e5ba6edb93ca2656a96c29fcae", "d6315a35bfe9c9b6f200abdeed5e711cbe0fe6e0" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sat May 31 00:02:58 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat May 31 00:02:59 2014 +0000" }, "message": "Merge \"Fix name error in com.android.mediadrm.signer.xml\" into lmp-preview-dev" }, { "commit": "2a48d422852aa6ab343cf68290320f390c7b5c65", "tree": "d0a1cb97c09f6aca24823bbc223c22b24b1702cc", "parents": [ "b9dfb12d2b5afb9959430e9709110f005db437f6", "a6716aade1d7bf0a60457d80da6aa85bc1006f57" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 30 23:21:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 30 23:21:09 2014 +0000" }, "message": "am 7c9ed471: Merge changes I1fd178b6,I5093672e into lmp-preview-dev\n\n* commit \u00277c9ed471c6f5e7d21b49be1105c973d3a8473d59\u0027:\n DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener\n media.MediaCodec: document and fix-up setNotificationCallback\n" }, { "commit": "a6716aade1d7bf0a60457d80da6aa85bc1006f57", "tree": "5b1277d72f70a5a4f6c4ef82b11257fd30ee0a4e", "parents": [ "283c907a6a84c5d9ffe38d3468e76131e6917105", "8c5d0f2120d2006aa2115105b7c6dbf0b86058ae" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 30 23:14:55 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 30 23:14:55 2014 +0000" }, "message": "Merge changes I1fd178b6,I5093672e into lmp-preview-dev\n\n* changes:\n DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener\n media.MediaCodec: document and fix-up setNotificationCallback\n" }, { "commit": "b69ffd4dc2c8fa85e0064151141ebeee90de471e", "tree": "da787f506e0ac8a23a268f199096cb27e87c4f8e", "parents": [ "283c907a6a84c5d9ffe38d3468e76131e6917105" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Fri May 30 14:57:59 2014 -0700" }, "committer": { "name": "RoboErik", "email": "epastern@google.com", "time": "Fri May 30 15:47:58 2014 -0700" }, "message": "Minimum work to make volume handling work with sessions\n\nThis is the minimum change to make adjusting volume work with\nMediaSessions. This only affects adjusting the volume and adjusting\nthe volume with a suggested stream. Adjusting a specific stream or\nsetting a specific stream will still use the same code.\n\nThis does not fix existing remote volume handling in RCC, which\nwill require a separate change to MediaController.\n\nChange-Id: I5b957ff4bece1ee11e2364e1f216e1c08343c983\n" }, { "commit": "4e4160cd5e55662b994d01ab51a6d90fe2472a3f", "tree": "0d2d39c01ddd8a23564fc87f1fd6f7392339eb5b", "parents": [ "1091f59e5dfc0c561171d829db4133e92de49ca4", "283c907a6a84c5d9ffe38d3468e76131e6917105" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Fri May 30 22:21:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 30 22:21:07 2014 +0000" }, "message": "am 80ec18a9: Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev\n\n* commit \u002780ec18a90a1ce3d1b68deba8bcf81abcca04e520\u0027:\n Refactor transport controls APIs\n API changes to sessions\n" }, { "commit": "283c907a6a84c5d9ffe38d3468e76131e6917105", "tree": "acdfdbf13f96f2bce65fa4618e59b630a910061e", "parents": [ "3da92d6df15fcbf9dbde7e3f58f778ab28abaa99", "c47fa84b0a6bda48c38ba8822481ce613bafd019" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Fri May 30 22:18:53 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 30 22:18:54 2014 +0000" }, "message": "Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev\n\n* changes:\n Refactor transport controls APIs\n API changes to sessions\n" }, { "commit": "dbce83bf20fb40898a91907135608b329dd99d67", "tree": "b807d98bd3ee57fb07e0f4bcad8da6000994fd80", "parents": [ "9e427694a590b920f5af20b565ee008c4a73f714", "1998daf1ee43712c3c9798f13792e03780c09bf8" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri May 30 21:39:30 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 30 21:39:30 2014 +0000" }, "message": "am 511b84d2: Merge \"camera2: Change android.lens.focusRange to Pair\u003cFloat,Float\u003e\" into lmp-preview-dev\n\n* commit \u0027511b84d26b3e4acfcee9ca2864588538b9801708\u0027:\n camera2: Change android.lens.focusRange to Pair\u003cFloat,Float\u003e\n" }, { "commit": "5743868e15c88d2886915163652a1571a218bf39", "tree": "96027c1ee45d748b7df92b55ae9d133dd8be32f5", "parents": [ "2d2e30eeac5b6799808c23b944f29d68ed0c205d" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri May 30 10:49:00 2014 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri May 30 11:28:49 2014 -0700" }, "message": "camera2: Change android.lens.focusRange to Pair\u003cFloat,Float\u003e\n\nSince the focus range is defined in diopters (1/distance), it just so\nhappens that in a range [near, far] near \u003e\u003d far which is against the\nandroid.util.Range contract.\n\nChange it to pair instead.\n\nAlso adds a marshaler for Pairs since they didn\u0027t have one before\n(and aren\u0027t parcelable).\n\nBug: 15335269\nChange-Id: If2f3259aeec072438a1c18c1b9728a4c81e92a40\n" }, { "commit": "a037bcebfa0afdf89e273b207f134e4c5d909a65", "tree": "721b978ab0a9502cc317f317a371fe1f7cd21f80", "parents": [ "b68f5f0932511fb9975b7e04eebe48707af59e0a", "a034dac7be0658e59c73a880e958cab3c723323b" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri May 30 18:05:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 30 18:05:35 2014 +0000" }, "message": "am a034dac7: android_media_MediaMuxer_setLocation: amended signature.\n\n* commit \u0027a034dac7be0658e59c73a880e958cab3c723323b\u0027:\n android_media_MediaMuxer_setLocation: amended signature.\n" }, { "commit": "c47fa84b0a6bda48c38ba8822481ce613bafd019", "tree": "b3f3e177e8cd1f27909e7c9ffad292a8dffe4a3f", "parents": [ "79fa4630bbca7c6c251eea99fe8997e4b45becee" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Wed May 28 17:36:42 2014 -0700" }, "committer": { "name": "RoboErik", "email": "epastern@google.com", "time": "Fri May 30 10:35:44 2014 -0700" }, "message": "Refactor transport controls APIs\n\nThis merges TransportPerformer into MediaSession + a\nTransportControlsCallback and makes TransportController into an\ninner class on MediaController called TransportControls. Also makes\nthe PlaybackState and Metadata part of the session APIs instead of\ntransport controls.\n\nChange-Id: I16ad392e6d318abe3119ad5d89656d253af25e16\n" }, { "commit": "7b587884baeb98ca13b37f3034bd4e26881252c8", "tree": "8c961fe04ab6f4dcc930a577b49550f3f4f4834f", "parents": [ "c0d1fc801d5ec66085888fab56adae0f7f3df786", "ae4506e9b5fc3e0c6d9862fbc05b9af7d6742a6e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 30 17:08:43 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 30 17:08:43 2014 +0000" }, "message": "Merge \"indicate in and out audio device connection separately\"" } ], "next": "d6315a35bfe9c9b6f200abdeed5e711cbe0fe6e0" }