)]}' { "log": [ { "commit": "c1cd21f4bc7778250b650d9a19e64302861bd618", "tree": "099dbf20e83c0636c0705f8ac48d79622080b823", "parents": [ "51e0bc344dcce39dce750412d830a2c7753203ae", "97e4792736a913967e94f5742545d1e3843f7033" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 16 00:23:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 16 00:23:31 2020 +0000" }, "message": "Merge \"libstagefright: Do not use max/min luminance if it\u0027s 0\" am: c9643eeae5 am: f40667acd4 am: 7fcaf93af8 am: 97e4792736\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1427069\n\nChange-Id: I14e904eae30a5df8711f54ebe6be1e3cffb70ea3\n" }, { "commit": "51e0bc344dcce39dce750412d830a2c7753203ae", "tree": "3933c1253fdd3fd7c472c8f53240e4f63cecfb61", "parents": [ "72f95739413e5304d56f88c8057e7090763b38bc", "375283dd6031a71e44fc17efad05b741302c78e5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 16 00:12:00 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 16 00:12:00 2020 +0000" }, "message": "Merge \"Add package name when creating AudioTrack.\" into rvc-qpr-dev-plus-aosp" }, { "commit": "97e4792736a913967e94f5742545d1e3843f7033", "tree": "033eae33c27f4f24ccbb3e31f91bd978a38f1753", "parents": [ "9075cc516f90effb0b57bcd6675d4283ca0adc40", "7fcaf93af82ae190718d82450f500aeadbaad260" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 16 00:00:23 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 16 00:00:23 2020 +0000" }, "message": "Merge \"libstagefright: Do not use max/min luminance if it\u0027s 0\" am: c9643eeae5 am: f40667acd4 am: 7fcaf93af8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1427069\n\nChange-Id: Ia1fec9d43402a2e7a8a703884296e188018560d2\n" }, { "commit": "7fcaf93af82ae190718d82450f500aeadbaad260", "tree": "6e83d829e646d83780fbf4df73b3eb782abc6cf7", "parents": [ "89a54f7088c6b032c35ae7c2cb8159f9dbc74275", "f40667acd48754695dc1f6e83bc5427978f52c55" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 15 23:05:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 15 23:05:59 2020 +0000" }, "message": "Merge \"libstagefright: Do not use max/min luminance if it\u0027s 0\" am: c9643eeae5 am: f40667acd4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1427069\n\nChange-Id: I3ce02391d0e123324c11baa86a28a53f4b15db50\n" }, { "commit": "f40667acd48754695dc1f6e83bc5427978f52c55", "tree": "0777979f5256f0e0223a4e1691294e2dd833762f", "parents": [ "6329a8a0d10926f14df907391c9bbf76416d897a", "c9643eeae501ab813934c9d03fb33430be48732c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 15 22:41:23 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 15 22:41:23 2020 +0000" }, "message": "Merge \"libstagefright: Do not use max/min luminance if it\u0027s 0\" am: c9643eeae5\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1427069\n\nChange-Id: I08f602045ca08e34ecafa6f982c54cf4f58856d4\n" }, { "commit": "c9643eeae501ab813934c9d03fb33430be48732c", "tree": "7b8ef44215d7403e92dad13911c624f2c20beefc", "parents": [ "313207359a3d0e9c827d6535d15e255048755164", "227fd47a03ed1f6ef133ba7a966a1d976b466f8d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 15 22:07:56 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 15 22:07:56 2020 +0000" }, "message": "Merge \"libstagefright: Do not use max/min luminance if it\u0027s 0\"" }, { "commit": "72f95739413e5304d56f88c8057e7090763b38bc", "tree": "7e5db9210a81ca90e044593feba0f390c26c6255", "parents": [ "b77e219423638bd958a5673dba017ea72aaa2e39", "9075cc516f90effb0b57bcd6675d4283ca0adc40" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Sep 15 20:07:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 15 20:07:33 2020 +0000" }, "message": "Merge \"libeffects: SUPPORT_MC macro clean up\" am: 313207359a am: 6329a8a0d1 am: 89a54f7088 am: 9075cc516f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1396510\n\nChange-Id: Ia94f7442d9652e39e77a4697dafd1eb9b68e1c9d\n" }, { "commit": "9075cc516f90effb0b57bcd6675d4283ca0adc40", "tree": "2c7ea470a40eb24f9c766b1536d88cd15416b72b", "parents": [ "0ddf4d6f34676084638a75a2a92321281d1f31bc", "89a54f7088c6b032c35ae7c2cb8159f9dbc74275" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Sep 15 19:44:14 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 15 19:44:14 2020 +0000" }, "message": "Merge \"libeffects: SUPPORT_MC macro clean up\" am: 313207359a am: 6329a8a0d1 am: 89a54f7088\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1396510\n\nChange-Id: Iced65c93f2aa5a80e82460036108dc4b8919205e\n" }, { "commit": "89a54f7088c6b032c35ae7c2cb8159f9dbc74275", "tree": "fc38720929f7eb016d703f425f8390ae8dba542c", "parents": [ "5d0ca1cb0a7781f1aedf95a61411f4eb5230c666", "6329a8a0d10926f14df907391c9bbf76416d897a" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Sep 15 19:14:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 15 19:14:49 2020 +0000" }, "message": "Merge \"libeffects: SUPPORT_MC macro clean up\" am: 313207359a am: 6329a8a0d1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1396510\n\nChange-Id: If23728cb61127e9a0e97bbf8dd831ffecefed1fb\n" }, { "commit": "6329a8a0d10926f14df907391c9bbf76416d897a", "tree": "6f7292092a52f619f6dfde60df83ac998bbc71cd", "parents": [ "ebaa8872f9482565185382a693aa644ea6f2db1f", "313207359a3d0e9c827d6535d15e255048755164" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Sep 15 18:45:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 15 18:45:15 2020 +0000" }, "message": "Merge \"libeffects: SUPPORT_MC macro clean up\" am: 313207359a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1396510\n\nChange-Id: I6a0cad126d70cc11af8e5e4c5172ca6d42762e63\n" }, { "commit": "375283dd6031a71e44fc17efad05b741302c78e5", "tree": "da9cbab41fb7a3610201cfe17d09d7a5e9d3a37e", "parents": [ "b77e219423638bd958a5673dba017ea72aaa2e39" ], "author": { "name": "jiabin", "email": "jiabin@google.com", "time": "Fri Aug 21 18:14:43 2020 -0700" }, "committer": { "name": "Jiabin Huang", "email": "jiabin@google.com", "time": "Tue Sep 15 18:02:58 2020 +0000" }, "message": "Add package name when creating AudioTrack.\n\nThe package name can be used when starting an external vibration, which\nis used by vibrator service to check if the application has the\npermission to start vibration.\n\nBug: 165910728\nBug: 162343845\nTest: atest AudioTrackTest MediaPlayerTest\nTest: start audio-coupled-haptic playback\nChange-Id: I6d12c4e141c037ee94ee79cbb9bf537421ec9507\nMerged-In: I6d12c4e141c037ee94ee79cbb9bf537421ec9507\n" }, { "commit": "313207359a3d0e9c827d6535d15e255048755164", "tree": "f01019641309055f0b50108ec212afd583cd8884", "parents": [ "9900ec1c37a07511c4043187d0d607b7b681edaa", "b5bfadf6490d6fa4bc9a1cdaaa2ebe785808ccec" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Sep 15 17:53:23 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 15 17:53:23 2020 +0000" }, "message": "Merge \"libeffects: SUPPORT_MC macro clean up\"" }, { "commit": "b77e219423638bd958a5673dba017ea72aaa2e39", "tree": "69aea4a808fbb041006420d592fc17a7240a1568", "parents": [ "e626fb3c47f8a756f013a018791bd862594a8363", "0ddf4d6f34676084638a75a2a92321281d1f31bc" ], "author": { "name": "Kiyoung Kim", "email": "kiyoungkim@google.com", "time": "Tue Sep 15 11:49:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 15 11:49:02 2020 +0000" }, "message": "[automerger skipped] Add required sphal back to swcodec APEX - DO NOT MERGE am: ebaa8872f9 -s ours am: 5d0ca1cb0a -s ours am: 0ddf4d6f34 -s ours\n\nam skip reason: Change-Id Ibc0e0eee46762dac2825f2ff4c2cf6dcbeaea320 with SHA-1 b1d46ad9c7 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12593384\n\nChange-Id: Ibe266f5196c2d25959f8161096d93e55b8c12f14\n" }, { "commit": "0ddf4d6f34676084638a75a2a92321281d1f31bc", "tree": "11d15b6ebbd04587d1277ea33f7c62c11b40e1c6", "parents": [ "60642703efad178590abc5a86b0edf661b5c5f62", "5d0ca1cb0a7781f1aedf95a61411f4eb5230c666" ], "author": { "name": "Kiyoung Kim", "email": "kiyoungkim@google.com", "time": "Tue Sep 15 10:56:06 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 15 10:56:06 2020 +0000" }, "message": "[automerger skipped] Add required sphal back to swcodec APEX - DO NOT MERGE am: ebaa8872f9 -s ours am: 5d0ca1cb0a -s ours\n\nam skip reason: Change-Id Ibc0e0eee46762dac2825f2ff4c2cf6dcbeaea320 with SHA-1 b1d46ad9c7 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12593384\n\nChange-Id: Ie473f041ff50f0c118557bc8a644d0e0684b63bd\n" }, { "commit": "5d0ca1cb0a7781f1aedf95a61411f4eb5230c666", "tree": "544ad1197786e6459ec9f5c6db64927f76067264", "parents": [ "63855397320a7da593c5fe81d6903f77ce0eec8e", "ebaa8872f9482565185382a693aa644ea6f2db1f" ], "author": { "name": "Kiyoung Kim", "email": "kiyoungkim@google.com", "time": "Tue Sep 15 10:21:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 15 10:21:02 2020 +0000" }, "message": "[automerger skipped] Add required sphal back to swcodec APEX - DO NOT MERGE am: ebaa8872f9 -s ours\n\nam skip reason: Change-Id Ibc0e0eee46762dac2825f2ff4c2cf6dcbeaea320 with SHA-1 b1d46ad9c7 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12593384\n\nChange-Id: I05b7bfb04f6811975544a256857cd1264a2237f5\n" }, { "commit": "ebaa8872f9482565185382a693aa644ea6f2db1f", "tree": "294a8409c23b15e22e8cc49f50e3f2753fdc929b", "parents": [ "ef53e1edb8f965175a50ebaac28bca0fd1ac5bd7" ], "author": { "name": "Kiyoung Kim", "email": "kiyoungkim@google.com", "time": "Tue Sep 15 10:35:07 2020 +0900" }, "committer": { "name": "Kiyoung Kim", "email": "kiyoungkim@google.com", "time": "Tue Sep 15 12:32:25 2020 +0900" }, "message": "Add required sphal back to swcodec APEX - DO NOT MERGE\n\nSPHAL namespace is required as visible namespace in swcodec APEX, but\nthe description was removed from the manifest during mainline release\nupdate. Adding sphal back to swcodec APEX so swcodec service can load\nlibraries in SPHAL namespace.\n\nBug: 168446433\nTest: sphal namespace found from cuttlefish\u0027s swcodec ld.config.txt\nMerged-In: Ibc0e0eee46762dac2825f2ff4c2cf6dcbeaea320\nChange-Id: I43341348694e33d88663c6d6f8658a03abed0382\n" }, { "commit": "e626fb3c47f8a756f013a018791bd862594a8363", "tree": "69aea4a808fbb041006420d592fc17a7240a1568", "parents": [ "2d74954fd8d7b943c62eb49d1d49b56628b89a24", "60642703efad178590abc5a86b0edf661b5c5f62" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 14 22:41:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 14 22:41:28 2020 +0000" }, "message": "Merge \"Temporarily disable media.log post-crash logging\" am: 9900ec1c37 am: ef53e1edb8 am: 6385539732 am: 60642703ef\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1427368\n\nChange-Id: I34b35f6928ceb490ccb0049ef83fcbcef45769c4\n" }, { "commit": "2d74954fd8d7b943c62eb49d1d49b56628b89a24", "tree": "8ff97e28a160f0d5102f425620e3701e746d04b2", "parents": [ "087d5853040841db7919ab2f2870cd0e65ab3f91", "35d87776c4e3ffd7d112f2ce3a66248491965bc5" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Sep 14 22:20:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 14 22:20:22 2020 +0000" }, "message": "[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 5714e607c4 -s ours am: 7221a1de0e -s ours am: 35d87776c4 -s ours\n\nam skip reason: Change-Id Ic5e9d14519f1942a42613b83084c053cb8ca05db with SHA-1 a364a910cf is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12578854\n\nChange-Id: I97667ea960cce3572f4afc1bf8354f0f1b429bd5\n" }, { "commit": "60642703efad178590abc5a86b0edf661b5c5f62", "tree": "11d15b6ebbd04587d1277ea33f7c62c11b40e1c6", "parents": [ "35d87776c4e3ffd7d112f2ce3a66248491965bc5", "63855397320a7da593c5fe81d6903f77ce0eec8e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 14 21:59:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 14 21:59:10 2020 +0000" }, "message": "Merge \"Temporarily disable media.log post-crash logging\" am: 9900ec1c37 am: ef53e1edb8 am: 6385539732\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1427368\n\nChange-Id: Idf869494db84fcdaf96fdf30ba424fba41311ec9\n" }, { "commit": "35d87776c4e3ffd7d112f2ce3a66248491965bc5", "tree": "327e763d377be721d140a9968d9c249452ff32f9", "parents": [ "291cd2df2cfa06b449d22e978ca5490595a8ba52", "7221a1de0e68a077fbb5623b0c2f82857238976f" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Sep 14 21:51:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 14 21:51:01 2020 +0000" }, "message": "[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 5714e607c4 -s ours am: 7221a1de0e -s ours\n\nam skip reason: Change-Id Ic5e9d14519f1942a42613b83084c053cb8ca05db with SHA-1 a364a910cf is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12578854\n\nChange-Id: If5f438e177b47f026294905f6af0b5bb8b63f482\n" }, { "commit": "63855397320a7da593c5fe81d6903f77ce0eec8e", "tree": "544ad1197786e6459ec9f5c6db64927f76067264", "parents": [ "7221a1de0e68a077fbb5623b0c2f82857238976f", "ef53e1edb8f965175a50ebaac28bca0fd1ac5bd7" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 14 21:26:53 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 14 21:26:53 2020 +0000" }, "message": "Merge \"Temporarily disable media.log post-crash logging\" am: 9900ec1c37 am: ef53e1edb8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1427368\n\nChange-Id: I15dde072f8a0de21c4f2fa3b46e6f9be1ef99803\n" }, { "commit": "7221a1de0e68a077fbb5623b0c2f82857238976f", "tree": "c7ec6e8bb532c691d844b7563515bd3a732717d1", "parents": [ "a364a910cfbf49ef13d958c0fa5a66336eb8c564", "5714e607c4206c406d2da720260c7ca26bcf26b2" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Sep 14 21:18:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 14 21:18:59 2020 +0000" }, "message": "[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 5714e607c4 -s ours\n\nam skip reason: Change-Id Ic5e9d14519f1942a42613b83084c053cb8ca05db with SHA-1 a364a910cf is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12578854\n\nChange-Id: I1f0305c9dc6914832f147f12b6ed6ea2cd526209\n" }, { "commit": "ef53e1edb8f965175a50ebaac28bca0fd1ac5bd7", "tree": "a9ce899a09de4ad02ccdc6110dca2ae9382d6471", "parents": [ "5714e607c4206c406d2da720260c7ca26bcf26b2", "9900ec1c37a07511c4043187d0d607b7b681edaa" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 14 20:34:11 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 14 20:34:11 2020 +0000" }, "message": "Merge \"Temporarily disable media.log post-crash logging\" am: 9900ec1c37\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1427368\n\nChange-Id: Ia2b4970d80a03566e96cc473a518f9eb0f3e9cd8\n" }, { "commit": "9900ec1c37a07511c4043187d0d607b7b681edaa", "tree": "5874cdbe49f7f42636520c5ae7cffa48420b7718", "parents": [ "ba88b6bfd10d9cad8d5f10406e61408a8152eb50", "e2cf82957844ebfab9474013d7b297e66436a10e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 14 20:05:45 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 14 20:05:45 2020 +0000" }, "message": "Merge \"Temporarily disable media.log post-crash logging\"" }, { "commit": "087d5853040841db7919ab2f2870cd0e65ab3f91", "tree": "8ff97e28a160f0d5102f425620e3701e746d04b2", "parents": [ "b770759cf96281366b46d17342a1a20866309953", "b281445c6e7a40cc144752db8fbf8ddf7bd56b5f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 14 19:01:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 14 19:01:30 2020 +0000" }, "message": "Merge \"C2SoftGav1Dec: remove non-eos flush\" into rvc-qpr-dev am: b281445c6e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12568399\n\nChange-Id: Icbfd1024edc6b1cf73eabc327b5c4fd8d6b617e7\n" }, { "commit": "e2cf82957844ebfab9474013d7b297e66436a10e", "tree": "5874cdbe49f7f42636520c5ae7cffa48420b7718", "parents": [ "ba88b6bfd10d9cad8d5f10406e61408a8152eb50" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Sep 14 11:40:32 2020 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Sep 14 11:40:32 2020 -0700" }, "message": "Temporarily disable media.log post-crash logging\n\nSee also bug 168511485 which is tracking the need for a proper fix.\n\nBug: 165702394\nTest: at bug\nChange-Id: Id2da0341145bdf99d3d1bd518f19cafbcbad6e53\n" }, { "commit": "b281445c6e7a40cc144752db8fbf8ddf7bd56b5f", "tree": "60b143bdba253d0f15306a4c64e052f62cdbb639", "parents": [ "b8d89f38b24cab1f4d123192c01d5d766b88bd33", "3b63a258b13c3c0a358da3ee6f4f5522dff650a1" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 14 18:08:12 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 14 18:08:12 2020 +0000" }, "message": "Merge \"C2SoftGav1Dec: remove non-eos flush\" into rvc-qpr-dev" }, { "commit": "227fd47a03ed1f6ef133ba7a966a1d976b466f8d", "tree": "31451e0f1ce266d326e6fcab3dd369fc602b4bfd", "parents": [ "b1fb801fd4f7a85d43fcf9a55b9a18c9425d4dc7" ], "author": { "name": "Taehwan Kim", "email": "t_h.kim@samsung.com", "time": "Mon Sep 14 14:37:15 2020 +0900" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Sep 14 10:10:05 2020 -0700" }, "message": "libstagefright: Do not use max/min luminance if it\u0027s 0\n\nthis changes is from following commits for ACodec.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nDo not set SMPTE2086 if max/min luminance fields are 0,\nthese may indicate that max/min luminance is not present\nin the bitstream. Let GPU composition use default if needed.\n\nBug: 153847809\nTest: Play Netflix HDR content in GPU composition.\nChange-Id: Ibce5319f7832095314fe07b0ce13600658ce4627\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nChange-Id: I41113317e31ee30ed0d093d1fd57662110f798b2\nSigned-off-by: Taehwan Kim \u003ct_h.kim@samsung.com\u003e\n" }, { "commit": "5714e607c4206c406d2da720260c7ca26bcf26b2", "tree": "87ca53a879ef0b26e0ff787f358109faa29fff81", "parents": [ "6a715cf98325db2abb60e3f65352fede2f768939", "3992b18083c6adbc38cccfea9fd260b98f2c1bc1" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Sep 13 07:59:13 2020 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Sep 13 07:59:13 2020 -0700" }, "message": "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE\n\nMerged-In: Ic5e9d14519f1942a42613b83084c053cb8ca05db\nChange-Id: I7f4ef62badfe8a7fc7145114636715410c6fadc8\n" }, { "commit": "b770759cf96281366b46d17342a1a20866309953", "tree": "df6d8dca6de798134fe977eaa92554a7acbeecc3", "parents": [ "1281c1d4ec7d5752d7c0981f32171a83f80b2438", "b8d89f38b24cab1f4d123192c01d5d766b88bd33" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Sat Sep 12 01:37:03 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 12 01:37:03 2020 +0000" }, "message": "Merge \"aaudio test: catch errors with release of input stream\" into rvc-qpr-dev am: b8d89f38b2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12567382\n\nChange-Id: Ib3c70b6ac20a86b938b4146ef891a77defa05e00\n" }, { "commit": "b8d89f38b24cab1f4d123192c01d5d766b88bd33", "tree": "cf37c4ed8070e6e21aebd3cb64996c0583bacbc0", "parents": [ "27514853147fb24d48af6a4f678c010e822b1c8e", "33f03f61133460e7876d9c2b52ae865fc31d9a12" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Sat Sep 12 01:17:04 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Sep 12 01:17:04 2020 +0000" }, "message": "Merge \"aaudio test: catch errors with release of input stream\" into rvc-qpr-dev" }, { "commit": "3b63a258b13c3c0a358da3ee6f4f5522dff650a1", "tree": "6f2809b1e4a689bd2c9fa7d9974abcd52278db22", "parents": [ "27514853147fb24d48af6a4f678c010e822b1c8e" ], "author": { "name": "James Zern", "email": "jzern@google.com", "time": "Tue Aug 04 15:36:10 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Sep 11 22:51:59 2020 +0000" }, "message": "C2SoftGav1Dec: remove non-eos flush\n\neos is later checked and signalled in drainInternal. signalling eos on a\nzero sized frame will cause subsequent frame decodes to fail until the\nnext keyframe.\n\nfixes:\nCodec2VideoDecHidlTest#DecodeTestEmptyBuffersInserted/software_c2_android_av1_decoder_0\nafter ag/12144538 (Idc713f4b10776cfb6b7fa2d75b2162c3b85d3313)\n\nBug: 162267932\nTest: vts-tradefed run commandAndExit vts --include-filter VtsHalMediaC2V1_0TargetVideoDecTest\nChange-Id: Ied4cd9b6ad56f3630d9779ea32d0032a5bda1a29\n(cherry picked from commit d7c6d7534f1d7ddbea19449b1c3e2d38aefbbdb2)\n" }, { "commit": "33f03f61133460e7876d9c2b52ae865fc31d9a12", "tree": "1e9eccc3e465bc0a2b25e65a330bb2f294e14834", "parents": [ "e1f1cb5827a6c99d41e05e090b3b382f3598a58e" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Fri Aug 07 18:50:04 2020 +0000" }, "committer": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Fri Sep 11 11:44:09 2020 -0700" }, "message": "aaudio test: catch errors with release of input stream\n\nThe test_various.cpp file was missing some crashes\nthat could occur if AAudio query functions were called after\nAAudioStream_release().\n\nBug: 163165126\nTest: adb shell test_various\nChange-Id: Ib423186083a2245a5fdb817eee0ff781ed1cfa22\nMerged-In: Ib423186083a2245a5fdb817eee0ff781ed1cfa22\n" }, { "commit": "1281c1d4ec7d5752d7c0981f32171a83f80b2438", "tree": "d62219e73d503ad08c4d60a3029d22e61b8309dd", "parents": [ "af69d2203db2e0147f24c43486c36cf2b02c997f", "27514853147fb24d48af6a4f678c010e822b1c8e" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Fri Sep 11 16:49:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 16:49:25 2020 +0000" }, "message": "Merge changes from topic \"aaudio-callback-close\" into rvc-qpr-dev am: 2751485314\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12551623\n\nChange-Id: I520180492759313fd28baea43e43ec0af1f6c334\n" }, { "commit": "af69d2203db2e0147f24c43486c36cf2b02c997f", "tree": "7795d5ebeaa82c7c18f3827b8e640f19a7a66e60", "parents": [ "52bc293ab6d9b3e67c52fcc5fefd500060b4f6b9", "79224cacfbdb30956428bbe915323233949b768d" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Fri Sep 11 16:49:24 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 16:49:24 2020 +0000" }, "message": "aaudio: prevent onAudioDeviceUpdate past close am: 79224cacfb\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12551622\n\nChange-Id: I9530b754c9b67f968ae9b0088e627fa6434172f3\n" }, { "commit": "52bc293ab6d9b3e67c52fcc5fefd500060b4f6b9", "tree": "fad3d97e165d291264d510247d06fa1594b20f58", "parents": [ "60669b443009fdaf85d3e5f4782baf7b6aaa3ab7", "4719048ce0e6f8656a417a2f2fe6fbb848ed2ba7" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Fri Sep 11 16:49:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 16:49:21 2020 +0000" }, "message": "aaudio: fix crash from callbacks during close am: 4719048ce0\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12540591\n\nChange-Id: Ic046f39f0327c662362ceed7b090bb2cf91e2e1b\n" }, { "commit": "27514853147fb24d48af6a4f678c010e822b1c8e", "tree": "19a48638e723f2fe1cb6a2cb904e65f45aad26fb", "parents": [ "ed3dca686bd7eac70200a0b068206615fc0f7288", "5cad6399aaae8fd448f389967a30d00068b1efe0" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Fri Sep 11 16:24:05 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 11 16:24:05 2020 +0000" }, "message": "Merge changes from topic \"aaudio-callback-close\" into rvc-qpr-dev\n\n* changes:\n aaudio: fix crash on disconnect for shared streams\n aaudio: prevent onAudioDeviceUpdate past close\n aaudio: fix crash from callbacks during close\n" }, { "commit": "60669b443009fdaf85d3e5f4782baf7b6aaa3ab7", "tree": "03de782f4f7e84193c84ee6dcb8e8f5462e94f60", "parents": [ "88f8f94606933ec389ea50b07f5394622750819e", "ed3dca686bd7eac70200a0b068206615fc0f7288" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Sep 11 13:09:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 13:09:22 2020 +0000" }, "message": "Merge \"DO NOT MERGE Attribute SOURCE_HOTWORD to OP_RECORD_AUDIO_HOTWORD.\" into rvc-qpr-dev am: ed3dca686b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12468978\n\nChange-Id: I7afc064dd0b45165723b92031848f40feba65a4e\n" }, { "commit": "88f8f94606933ec389ea50b07f5394622750819e", "tree": "03de782f4f7e84193c84ee6dcb8e8f5462e94f60", "parents": [ "181438e955bac2e0137d991c468f583bdf3de153", "d127644025c5820e39a2908a249691284b4447d6" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Sep 11 13:09:19 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 13:09:19 2020 +0000" }, "message": "DO NOT MERGE Attribute SOURCE_HOTWORD to OP_RECORD_AUDIO_HOTWORD. am: d127644025\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12468978\n\nChange-Id: I3253b81c324ae91762a54533a2c1708c80026e8e\n" }, { "commit": "ed3dca686bd7eac70200a0b068206615fc0f7288", "tree": "96ba30f7f36738482d869c1082a265cddea34f87", "parents": [ "b197286f8c5e01c02e5a04d4e8332c8eca3fda5e", "d127644025c5820e39a2908a249691284b4447d6" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Sep 11 12:19:36 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 11 12:19:36 2020 +0000" }, "message": "Merge \"DO NOT MERGE Attribute SOURCE_HOTWORD to OP_RECORD_AUDIO_HOTWORD.\" into rvc-qpr-dev" }, { "commit": "b5bfadf6490d6fa4bc9a1cdaaa2ebe785808ccec", "tree": "79d921561a51cbca6141fc2dd87d7eacc98a4cf9", "parents": [ "ba88b6bfd10d9cad8d5f10406e61408a8152eb50" ], "author": { "name": "Saketh Sathuvalli", "email": "saketh.sathuvalli@ittiam.com", "time": "Tue Aug 11 17:23:45 2020 +0530" }, "committer": { "name": "Saketh Sathuvalli", "email": "saketh.sathuvalli@ittiam.com", "time": "Fri Sep 11 12:27:59 2020 +0530" }, "message": "libeffects: SUPPORT_MC macro clean up\n\nRemoved portions of code that are disabled\non enabling SUPPORT_MC macro.\nRemoved the switch from build makefiles\n\nTest: Tested using Solotester and Clarity apps\nBug: 129491957\n\nChange-Id: I87bed5ebbe95bce6d2e80d08d94142d37dbef235\n" }, { "commit": "181438e955bac2e0137d991c468f583bdf3de153", "tree": "fb9ac3e5a3b91629b042d8f2dc4f211b0efa38c5", "parents": [ "696c43b5a7b39c7b850ea76b3c1e96cc5963a49e", "291cd2df2cfa06b449d22e978ca5490595a8ba52" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Sep 11 04:55:11 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 04:55:11 2020 +0000" }, "message": "Merge \"libeffects: Add multichannel support to Reverb\" am: ba88b6bfd1 am: 6a715cf983 am: a364a910cf am: 291cd2df2c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1396509\n\nChange-Id: I9e4fc3a6ef367bb1af7d6243584d839558c6e072\n" }, { "commit": "696c43b5a7b39c7b850ea76b3c1e96cc5963a49e", "tree": "0f822ade4b9c29f5295be9f18a51cc2ef0d9b9d5", "parents": [ "85109f953b728cbd50b36c18c48e52ef71f3bb95", "e88bfc12fa63b5f083d87faa5f40751b3bbfc1c9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Sep 11 03:58:51 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 03:58:51 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R\" am: 0bbd9a10e5 -s ours am: fcc43c2c03 -s ours am: 9e98556449 -s ours am: e88bfc12fa -s ours\n\nam skip reason: Change-Id Ic54c8dcf210e9b375e7fdce6444c7d882a1784d6 with SHA-1 451a36a9a6 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1422365\n\nChange-Id: I3a4a56bbb9ca5b1823319914b94cbbf547f6fd38\n" }, { "commit": "291cd2df2cfa06b449d22e978ca5490595a8ba52", "tree": "327e763d377be721d140a9968d9c249452ff32f9", "parents": [ "e88bfc12fa63b5f083d87faa5f40751b3bbfc1c9", "a364a910cfbf49ef13d958c0fa5a66336eb8c564" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Sep 11 03:51:05 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 03:51:05 2020 +0000" }, "message": "Merge \"libeffects: Add multichannel support to Reverb\" am: ba88b6bfd1 am: 6a715cf983 am: a364a910cf\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1396509\n\nChange-Id: Id136c4cf65c9623eca5d017dc7fe21231e4449c2\n" }, { "commit": "e88bfc12fa63b5f083d87faa5f40751b3bbfc1c9", "tree": "27a7cd1cc44669e7deee1b9be06ff201c80492ba", "parents": [ "3f185ad132f4dd2c4e31a06b69aec83aa44fcd39", "9e985564491244bb08054f45a2392fc6826be6b2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Sep 11 03:33:20 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 03:33:20 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R\" am: 0bbd9a10e5 -s ours am: fcc43c2c03 -s ours am: 9e98556449 -s ours\n\nam skip reason: Change-Id Ic54c8dcf210e9b375e7fdce6444c7d882a1784d6 with SHA-1 451a36a9a6 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1422365\n\nChange-Id: Ia68df4d8a961cb01c27f390b516c5da2b136db7e\n" }, { "commit": "a364a910cfbf49ef13d958c0fa5a66336eb8c564", "tree": "c7ec6e8bb532c691d844b7563515bd3a732717d1", "parents": [ "9e985564491244bb08054f45a2392fc6826be6b2", "6a715cf98325db2abb60e3f65352fede2f768939" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Sep 11 02:17:00 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 02:17:00 2020 +0000" }, "message": "Merge \"libeffects: Add multichannel support to Reverb\" am: ba88b6bfd1 am: 6a715cf983\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1396509\n\nChange-Id: Ic5e9d14519f1942a42613b83084c053cb8ca05db\n" }, { "commit": "9e985564491244bb08054f45a2392fc6826be6b2", "tree": "2f64e10a0e25e11ec4cbec2997ca61757cdce0e5", "parents": [ "77230bc934f9646030640993fa3f0a0db4c9ca5e", "fcc43c2c035a156e0c549d7496ed878478ce010b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Sep 11 02:02:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 02:02:29 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R\" am: 0bbd9a10e5 -s ours am: fcc43c2c03 -s ours\n\nam skip reason: Change-Id Ic54c8dcf210e9b375e7fdce6444c7d882a1784d6 with SHA-1 451a36a9a6 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1422365\n\nChange-Id: Ib51fb43f78f31b27bc3b08fc7a3b9327eb2bc98c\n" }, { "commit": "6a715cf98325db2abb60e3f65352fede2f768939", "tree": "dee2b4a0d227df2df3afb72223e50b72bcedc496", "parents": [ "fcc43c2c035a156e0c549d7496ed878478ce010b", "ba88b6bfd10d9cad8d5f10406e61408a8152eb50" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Sep 11 01:03:43 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 01:03:43 2020 +0000" }, "message": "Merge \"libeffects: Add multichannel support to Reverb\" am: ba88b6bfd1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1396509\n\nChange-Id: I657d6ec24eefa655a3d7e81b6d9a4cc5f6c7179d\n" }, { "commit": "fcc43c2c035a156e0c549d7496ed878478ce010b", "tree": "41e1735a1a979a48cb51e05cd9ac8b165bdbecec", "parents": [ "451a36a9a67eb9cad6931b908736072c76d30ec2", "0bbd9a10e5794965903028d5ce9d0fa955547c5e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Sep 11 00:39:51 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 00:39:51 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R\" am: 0bbd9a10e5 -s ours\n\nam skip reason: Change-Id Ic54c8dcf210e9b375e7fdce6444c7d882a1784d6 with SHA-1 451a36a9a6 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1422365\n\nChange-Id: I2275546c05453392d5ba25accad19e8ff70ed9ca\n" }, { "commit": "5cad6399aaae8fd448f389967a30d00068b1efe0", "tree": "60cdccf08e4a665a3657a15303a525b934f36093", "parents": [ "79224cacfbdb30956428bbe915323233949b768d" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Tue Sep 01 20:55:18 2020 +0000" }, "committer": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Thu Sep 10 14:55:00 2020 -0700" }, "message": "aaudio: fix crash on disconnect for shared streams\n\nThis fixes a regression caused by ag/12396646\nThat CL changed the way that AudioStreams are managed\nusing android::sp\u003c\u003e. Unfortunately it caused\na crash in audioserver when shared streams were disconnected.\nThe root cause was calling disconnectedRegisteredStreams()\nfrom a data processing thread, which resulted\nin deleting the object while the thread was using it.\n\nThe call was unnecessary so it was removed.\n\nBug: 161914201\nBug: 163165126\nBug: 164411271\nBug: 166877425\nTest: adb logcat *:F\nTest: Use OboeTester TEST DISCONNECT\nTest: See b/166877425 for more details\nChange-Id: I30fc7f00061a9caf5e3d9f7c8e257102c34f9d92\nMerged-In: I30fc7f00061a9caf5e3d9f7c8e257102c34f9d92\n" }, { "commit": "79224cacfbdb30956428bbe915323233949b768d", "tree": "3ff5396e1b0f316f25a4af8e48c9465d91cbc2a9", "parents": [ "4719048ce0e6f8656a417a2f2fe6fbb848ed2ba7" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Wed Aug 12 14:29:10 2020 +0000" }, "committer": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Thu Sep 10 14:54:30 2020 -0700" }, "message": "aaudio: prevent onAudioDeviceUpdate past close\n\nTo prevent late device update callbacks, the AudioStream\nwas made into a RefBase AudioDeviceCallback.\nSo now we can use a smart pointer to delay deletion of the\nstream if any callbacks are in flight while the stream is closed.\n\nSo an AudioStream is now a RefBased object and can be used with\nandroid::sp. That required some changes to the way it is referenced\nin several places.\n\nMyPlayerBase was modified to use a weak pointer to the parent stream.\n\nUse delete[] for mDistributionBuffer\n\nBug: 161914201\nBug: 163165126\nBug: 164411271\nTest: see bug for repro of the crash\nTest: atest CtsNativeMediaAAudioTestCases\nChange-Id: Ic24aca3eaf5d1610504bb89c06001a37d0d4a1c3\nMerged-In: Ic24aca3eaf5d1610504bb89c06001a37d0d4a1c3\n" }, { "commit": "4719048ce0e6f8656a417a2f2fe6fbb848ed2ba7", "tree": "8feaf2f9358a3993b5077647ddcd8952c71f7798", "parents": [ "e1f1cb5827a6c99d41e05e090b3b382f3598a58e" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Wed Aug 12 14:29:10 2020 +0000" }, "committer": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Thu Sep 10 14:52:58 2020 -0700" }, "message": "aaudio: fix crash from callbacks during close\n\nMove some code from release_l() into a new close_l().\nAlso stop callbacks before freeing memory in the\nFixedBlockReader.\n\nThe AudioTrack and AudioRecord callbacks can occur\nup until their destructors are called. This can lead\nto race conditions if the AAudio stream is dismantled\nwhile the AudioTrack or AudioRecord is still alive.\nThe AudioRecord was being deleted but not the AudioTrack.\nThat caused some streams to fail if they were using\na FixedBlockReader, which is used when the app\ncalls AAudioStreamBuilder_setFramesPerDataCallback().\n\nThere was also a problem with a few functions like\nAAudioStream_getFramesPerBurst() or AAudioStream_getTimestamp(),\nwhich would crash if called after AAudioStream_release( for\nINPUT streams.\n\nBug: 161914201\nBug: 163165126\nTest: see bug for repro of the crash\nTest: atest CtsNativeMediaAAudioTestCases\nChange-Id: If8f6f6f17ffe06eae98eb8b3930bca08c49a15f8\nMerged-In: If8f6f6f17ffe06eae98eb8b3930bca08c49a15f8\n(cherry picked from commit 320910fcf1e7d7729f37f95f591093191414e73f)\n" }, { "commit": "ba88b6bfd10d9cad8d5f10406e61408a8152eb50", "tree": "dee2b4a0d227df2df3afb72223e50b72bcedc496", "parents": [ "0bbd9a10e5794965903028d5ce9d0fa955547c5e", "71e87bfa0719b54059babbcb6f14ad0738da9c19" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Sep 10 19:42:17 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 10 19:42:17 2020 +0000" }, "message": "Merge \"libeffects: Add multichannel support to Reverb\"" }, { "commit": "71e87bfa0719b54059babbcb6f14ad0738da9c19", "tree": "bbb440a06a64da52c76232fcc046d853498fe23b", "parents": [ "579a5284be48aec4905160464716011cc7e89b9c" ], "author": { "name": "Saketh Sathuvalli", "email": "saketh.sathuvalli@ittiam.com", "time": "Sun Aug 09 11:58:16 2020 +0530" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Sep 10 19:41:36 2020 +0000" }, "message": "libeffects: Add multichannel support to Reverb\n\nTest: SoloTester and Clarity app\nTest: Standalone application test\nBug: 129491957\nChange-Id: Ifac02eb2a7ac3eba5fae9318c3ae1e1c7df4f681\n" }, { "commit": "0bbd9a10e5794965903028d5ce9d0fa955547c5e", "tree": "41e1735a1a979a48cb51e05cd9ac8b165bdbecec", "parents": [ "bd5bb90b4d0032980a74849a798a52cba0f4a185", "fa8772b1a6b694d87c379b37bcb483c05021017a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 10 17:22:30 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 10 17:22:30 2020 +0000" }, "message": "Merge \"Merge Android R\"" }, { "commit": "85109f953b728cbd50b36c18c48e52ef71f3bb95", "tree": "0f822ade4b9c29f5295be9f18a51cc2ef0d9b9d5", "parents": [ "ec0f0ec225b7f5a95b305f0c4a345acc78874633", "b197286f8c5e01c02e5a04d4e8332c8eca3fda5e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 10 15:52:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 10 15:52:31 2020 +0000" }, "message": "Merge \"audio policy: fix beacon mute delay\" into rvc-qpr-dev am: b197286f8c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12383405\n\nChange-Id: I899bd7396e7e54aef461ef75f5d78c65c7b40b85\n" }, { "commit": "b197286f8c5e01c02e5a04d4e8332c8eca3fda5e", "tree": "e84d3182bbb1eab2b1a7c63b2fdb4b21c7695627", "parents": [ "5fc17f2fae4fd72e7695bc828200eb3b8202a754", "33897bac9744f10c126b9f44488d390b4de49331" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 10 15:17:07 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 10 15:17:07 2020 +0000" }, "message": "Merge \"audio policy: fix beacon mute delay\" into rvc-qpr-dev" }, { "commit": "fa8772b1a6b694d87c379b37bcb483c05021017a", "tree": "41e1735a1a979a48cb51e05cd9ac8b165bdbecec", "parents": [ "bd5bb90b4d0032980a74849a798a52cba0f4a185", "451a36a9a67eb9cad6931b908736072c76d30ec2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Sep 09 20:21:09 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Sep 09 20:21:09 2020 -0700" }, "message": "Merge Android R\n\nBug: 168057903\nMerged-In: Ic54c8dcf210e9b375e7fdce6444c7d882a1784d6\nChange-Id: Ibf198e9a93931b2af8a26827ac79ac0135f3ff3c\n" }, { "commit": "ec0f0ec225b7f5a95b305f0c4a345acc78874633", "tree": "a4da22251dab4aee686d9217e626383376d7e692", "parents": [ "acb4d9ca255eb027141f623d221d87fb30c9fc40", "3f185ad132f4dd2c4e31a06b69aec83aa44fcd39" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 09 17:16:19 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 09 17:16:19 2020 +0000" }, "message": "Merge \"Skip devices with multiple bits set.\" am: bd5bb90b4d am: 451a36a9a6 am: 77230bc934 am: 3f185ad132\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1421703\n\nChange-Id: I7205d741c7113277a52b922b777c208a9e3d6beb\n" }, { "commit": "3f185ad132f4dd2c4e31a06b69aec83aa44fcd39", "tree": "27a7cd1cc44669e7deee1b9be06ff201c80492ba", "parents": [ "8843cf96f564248d4e2b17c559dea377dce34d9c", "77230bc934f9646030640993fa3f0a0db4c9ca5e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 09 16:58:41 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 09 16:58:41 2020 +0000" }, "message": "Merge \"Skip devices with multiple bits set.\" am: bd5bb90b4d am: 451a36a9a6 am: 77230bc934\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1421703\n\nChange-Id: I4a44f3cbd6643acb970cf0797954699656b38f63\n" }, { "commit": "acb4d9ca255eb027141f623d221d87fb30c9fc40", "tree": "0ee39a3661a169087cab9c7f0265bd4573f313d1", "parents": [ "499713d39f11b7e01c53b1f16f325451d280e5b9", "5fc17f2fae4fd72e7695bc828200eb3b8202a754" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Sep 09 16:58:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 09 16:58:34 2020 +0000" }, "message": "Merge \"Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock.\" into rvc-qpr-dev am: 5fc17f2fae\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12393352\n\nChange-Id: I10315aec4a263581eee7734cae2745544cfc2577\n" }, { "commit": "77230bc934f9646030640993fa3f0a0db4c9ca5e", "tree": "2f64e10a0e25e11ec4cbec2997ca61757cdce0e5", "parents": [ "c5c9086d323906f2bdd2d020910291044250081e", "451a36a9a67eb9cad6931b908736072c76d30ec2" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 09 16:26:47 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 09 16:26:47 2020 +0000" }, "message": "Merge \"Skip devices with multiple bits set.\" am: bd5bb90b4d am: 451a36a9a6\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1421703\n\nChange-Id: Iad96bd32869ba3d798a185c82740684ead3349a8\n" }, { "commit": "5fc17f2fae4fd72e7695bc828200eb3b8202a754", "tree": "b9aa8c34f45e693af40cc6f655982d144d4b24ca", "parents": [ "e1f1cb5827a6c99d41e05e090b3b382f3598a58e", "5e2cd30c8942d6ee32c8f1a34997bb106b4ac971" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Sep 09 16:22:58 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 09 16:22:58 2020 +0000" }, "message": "Merge \"Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock.\" into rvc-qpr-dev" }, { "commit": "451a36a9a67eb9cad6931b908736072c76d30ec2", "tree": "41e1735a1a979a48cb51e05cd9ac8b165bdbecec", "parents": [ "2cbbfa584a989ce07ac5fa31d8159f31848c9825", "bd5bb90b4d0032980a74849a798a52cba0f4a185" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 09 16:18:23 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 09 16:18:23 2020 +0000" }, "message": "Merge \"Skip devices with multiple bits set.\" am: bd5bb90b4d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1421703\n\nChange-Id: Ic54c8dcf210e9b375e7fdce6444c7d882a1784d6\n" }, { "commit": "bd5bb90b4d0032980a74849a798a52cba0f4a185", "tree": "766e8d5c0e353b06334cd1d261f100c2df3774fd", "parents": [ "8028dfb98b90cdb555fd615049165031aa319fb9", "e3c22e22cac4625e0b5e8052826cc06ec171c45a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 09 16:08:02 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 09 16:08:02 2020 +0000" }, "message": "Merge \"Skip devices with multiple bits set.\"" }, { "commit": "e3c22e22cac4625e0b5e8052826cc06ec171c45a", "tree": "766e8d5c0e353b06334cd1d261f100c2df3774fd", "parents": [ "8028dfb98b90cdb555fd615049165031aa319fb9" ], "author": { "name": "Hongguang Chen", "email": "hgchen@google.com", "time": "Tue Sep 08 13:22:56 2020 -0700" }, "committer": { "name": "Hongguang Chen", "email": "hgchen@google.com", "time": "Tue Sep 08 22:24:02 2020 -0700" }, "message": "Skip devices with multiple bits set.\n\naosp/1399204 added AUDIO_DEVICE_OUT_BLE_SPEAKER whose value is\n0x20000001. The buildCommonTypesStructureFile.py didn\u0027t cover that kind\nof values and it caused audioserver crashed.\n\nThis CL skips that kind of devices. A general solution (b/168065706)\nshould be addressed in the configurable audio policy and parameter\nframework.\n\nBUG: 167745916\nTest: Check PolicySubsystem-CommonTypes.xml and boot up device.\nChange-Id: Id802d37c18c4fd152a84a5a1579390b464c505f1\n" }, { "commit": "499713d39f11b7e01c53b1f16f325451d280e5b9", "tree": "f2918dbcb1d96e16122dea4f4c896eab68d59126", "parents": [ "3803ff3ec558396240f6133ecbb22d02b931d142", "8843cf96f564248d4e2b17c559dea377dce34d9c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 09 04:07:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 09 04:07:37 2020 +0000" }, "message": "Merge \"Update DrmSessionManager to comply with Android\u0027s inclusive language guidance\" am: 8028dfb98b am: 2cbbfa584a am: c5c9086d32 am: 8843cf96f5\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1403167\n\nChange-Id: Id32216fcae706b1e17078f2ebe3a5aa8f4e96e47\n" }, { "commit": "8843cf96f564248d4e2b17c559dea377dce34d9c", "tree": "229bc04d7b549e37707d47c43c7f44d2920ffc0a", "parents": [ "876d943f7ed1c75688338c9072489d50ef4bae8f", "c5c9086d323906f2bdd2d020910291044250081e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 09 03:49:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 09 03:49:33 2020 +0000" }, "message": "Merge \"Update DrmSessionManager to comply with Android\u0027s inclusive language guidance\" am: 8028dfb98b am: 2cbbfa584a am: c5c9086d32\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1403167\n\nChange-Id: I75c1d3bbd2f10bae3f64eab5c4a84bb8a094b81b\n" }, { "commit": "c5c9086d323906f2bdd2d020910291044250081e", "tree": "e395e6dc34630c9aa26c68ee0c64327c07332cf6", "parents": [ "ed26941cd3de067436e659adef120d583ea77c98", "2cbbfa584a989ce07ac5fa31d8159f31848c9825" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 09 03:01:48 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 09 03:01:48 2020 +0000" }, "message": "Merge \"Update DrmSessionManager to comply with Android\u0027s inclusive language guidance\" am: 8028dfb98b am: 2cbbfa584a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1403167\n\nChange-Id: I5cc64f8c5a69ef50171e3999a79c1a6680c870b3\n" }, { "commit": "2cbbfa584a989ce07ac5fa31d8159f31848c9825", "tree": "c9db3a61c9d4bdf82baef244288c079cd3806273", "parents": [ "11e6000285d6338d4d62d16c035ed14e191f8d40", "8028dfb98b90cdb555fd615049165031aa319fb9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 09 02:40:35 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 09 02:40:35 2020 +0000" }, "message": "Merge \"Update DrmSessionManager to comply with Android\u0027s inclusive language guidance\" am: 8028dfb98b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1403167\n\nChange-Id: I883890b91c21a4a0f442633d9486a41396bd4d72\n" }, { "commit": "8028dfb98b90cdb555fd615049165031aa319fb9", "tree": "28dcc67bd4e22d70ca724e04c385875786a1be8d", "parents": [ "df913f7b9357c3d039508fecdb57b73e825f7d22", "6d9dac24dc9ff07c31f4aa132ea1065a783102f0" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 09 02:24:58 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 09 02:24:58 2020 +0000" }, "message": "Merge \"Update DrmSessionManager to comply with Android\u0027s inclusive language guidance\"" }, { "commit": "3803ff3ec558396240f6133ecbb22d02b931d142", "tree": "5c2b9367155715e704d22f137a64d4a8a1f85905", "parents": [ "9447b48f36b1bf26645e6256dd29224b6a398161", "e1f1cb5827a6c99d41e05e090b3b382f3598a58e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 08 20:17:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 08 20:17:33 2020 +0000" }, "message": "audio policy: correct force use touch sound delay am: e1f1cb5827\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12539419\n\nChange-Id: I7b8ecc463d043da5c9e479bf92a73654ba8f3ad7\n" }, { "commit": "e1f1cb5827a6c99d41e05e090b3b382f3598a58e", "tree": "5a867b160cc351c30d777319aad5c3f5fc727eee", "parents": [ "d1fa2375194096937bbdfd2def97969c4336191b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Aug 21 12:50:41 2020 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 08 18:25:21 2020 +0000" }, "message": "audio policy: correct force use touch sound delay\n\nDo not apply the special delay added in setForceUse() multiple times.\nThis delay was meant to be applied only once to avoid truncating touch\nsounds but is actually used multiple times when updating routes on all\noutput streams, thus lengthening the call audio path switch time\nunnecessarily.\n\nBug: 163537547\nTest: manual call routing test\nChange-Id: I6fe15d4ed9b1f37452921585e9f7684637e8a30b\n(cherry picked from commit b36b4accf36ba413529a0b6735802a65f42c2f7c)\n" }, { "commit": "9447b48f36b1bf26645e6256dd29224b6a398161", "tree": "62bc6e0895af051df03446dc2c5ecca8dd288d0f", "parents": [ "37e93d1bc4df8b2d9682c48236bb4dae87d6dd1b", "d1fa2375194096937bbdfd2def97969c4336191b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 03 00:53:20 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 03 00:53:20 2020 +0000" }, "message": "Merge \"audio flinger: handle race condition in AudioRecord creation\" into rvc-qpr-dev am: d1fa237519\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12484593\n\nChange-Id: I5e330127a6ef2efe394b06524af5ae20f01a71bc\n" }, { "commit": "d1fa2375194096937bbdfd2def97969c4336191b", "tree": "f2873c68b18cd34fec81208f8b5286c86b66985e", "parents": [ "35238dd6585645018f7a7a8a32fdece432458ce7", "717bc28fc5959c0edb2bbd86692ba5164893f719" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 03 00:22:46 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 03 00:22:46 2020 +0000" }, "message": "Merge \"audio flinger: handle race condition in AudioRecord creation\" into rvc-qpr-dev" }, { "commit": "37e93d1bc4df8b2d9682c48236bb4dae87d6dd1b", "tree": "9b8b6dd0456585a36d18a959f65d4b197eaf42bc", "parents": [ "5294eb92f5e27c9872edcd6a449370a3bf5cd7aa", "876d943f7ed1c75688338c9072489d50ef4bae8f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 22:48:16 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 22:48:16 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\" am: df913f7b93 am: 11e6000285 am: ed26941cd3 am: 876d943f7e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1289076\n\nChange-Id: If61efad4a80aa65e3e9f6fd0c9d6529f9ead9f58\n" }, { "commit": "876d943f7ed1c75688338c9072489d50ef4bae8f", "tree": "a2337a0b7c118974cc7b537a08f315dc3768c236", "parents": [ "6848641a68a245c9acdb6b0563b61af05fe5d688", "ed26941cd3de067436e659adef120d583ea77c98" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 22:17:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 22:17:02 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\" am: df913f7b93 am: 11e6000285 am: ed26941cd3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1289076\n\nChange-Id: I6d536e6b1059fc53acec94f22cddd6783da66999\n" }, { "commit": "ed26941cd3de067436e659adef120d583ea77c98", "tree": "2fff59547ebc5644d2ebda5fc03158473cc21b2f", "parents": [ "8b712f70450c5318b46579c6b2c3b3d75be95fc8", "11e6000285d6338d4d62d16c035ed14e191f8d40" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 21:35:11 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 21:35:11 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\" am: df913f7b93 am: 11e6000285\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1289076\n\nChange-Id: I6a87dac3f3e050d608077f6afe55b83f028edb88\n" }, { "commit": "11e6000285d6338d4d62d16c035ed14e191f8d40", "tree": "6ed0c602fe86115e7676da19cf89e1a54b1d3078", "parents": [ "697ce36c44e6c3674b26039cc2f8da76e3990f30", "df913f7b9357c3d039508fecdb57b73e825f7d22" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 21:05:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 21:05:08 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\" am: df913f7b93\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1289076\n\nChange-Id: I0127f5ec69825b5568c57cc5cc6f57f9ecac8f14\n" }, { "commit": "df913f7b9357c3d039508fecdb57b73e825f7d22", "tree": "f302d75022dbf4c2a0327a75b7745953e294a8ec", "parents": [ "96a663b0ef0b0273111a47aa2c3fdc4029a36e4e", "032f7a122fd4a778147dc348b1954ac7dc112a84" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 20:43:06 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 02 20:43:06 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\"" }, { "commit": "5294eb92f5e27c9872edcd6a449370a3bf5cd7aa", "tree": "789d0b6bdb31ea469f7d645b0194aab3e76a82f3", "parents": [ "738f5ecdaea2af982ba00c4b974a33dbac8f7d0c", "35238dd6585645018f7a7a8a32fdece432458ce7" ], "author": { "name": "Hayden Gomes", "email": "haydengomes@google.com", "time": "Wed Sep 02 16:33:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 16:33:33 2020 +0000" }, "message": "Merge \"audio policy: fix concurrent capture policy for virtual sources\" into rvc-qpr-dev am: 35238dd658\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12196105\n\nChange-Id: I6029ece39734bea6bdcad7cc1ea5f2b2ab5e593a\n" }, { "commit": "35238dd6585645018f7a7a8a32fdece432458ce7", "tree": "acebd01148680908072bb155c37217cf0aaad8e8", "parents": [ "23d433f4a27a05dc89e558c06032b305ad0337f6", "55fd81d7e1011565e894a4530eb8693c824f45b4" ], "author": { "name": "Hayden Gomes", "email": "haydengomes@google.com", "time": "Wed Sep 02 15:55:30 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 02 15:55:30 2020 +0000" }, "message": "Merge \"audio policy: fix concurrent capture policy for virtual sources\" into rvc-qpr-dev" }, { "commit": "738f5ecdaea2af982ba00c4b974a33dbac8f7d0c", "tree": "db33075ab607ca808a841c5597288e60d498c147", "parents": [ "32377d64e483cd1ff1b3fbb8c0d7e2e782a95b1b", "23d433f4a27a05dc89e558c06032b305ad0337f6" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 02:21:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 02:21:17 2020 +0000" }, "message": "Merge \"framework/av,C2SoftGav1Dec: update to libgav1 v0.16.0\" into rvc-qpr-dev am: 23d433f4a2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12250263\n\nChange-Id: I6c728288c7b9bcb1c716cae0d81626c9affed65e\n" }, { "commit": "23d433f4a27a05dc89e558c06032b305ad0337f6", "tree": "9a0e4a5fac0733c00b8158b1df5688f86e419ca8", "parents": [ "3626bf513e108d230ca5ec0e8fa37ab95c217d45", "b7aee6e111fff30e4e0f5d4a4b4a60ed033d67d8" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 02:00:59 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 02 02:00:59 2020 +0000" }, "message": "Merge \"framework/av,C2SoftGav1Dec: update to libgav1 v0.16.0\" into rvc-qpr-dev" }, { "commit": "32377d64e483cd1ff1b3fbb8c0d7e2e782a95b1b", "tree": "8750af6324624c5ae407e45f3de477f39b415525", "parents": [ "65c647c35db9494c118b9830b8554f4169ec65a9", "6848641a68a245c9acdb6b0563b61af05fe5d688" ], "author": { "name": "Peiyong Lin", "email": "lpy@google.com", "time": "Wed Sep 02 01:05:42 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 01:05:42 2020 +0000" }, "message": "Use more inclusive terms. am: 697ce36c44 am: 8b712f7045 am: 6848641a68\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12505403\n\nChange-Id: I1bd8776ce57ec6b29556c599b95ab8feb9154cb7\n" }, { "commit": "6848641a68a245c9acdb6b0563b61af05fe5d688", "tree": "46ce02739a2899d0c4c1c356ec955d7242ea753b", "parents": [ "e12b63aff36f973cdea38a2d391182ba24249eb8", "8b712f70450c5318b46579c6b2c3b3d75be95fc8" ], "author": { "name": "Peiyong Lin", "email": "lpy@google.com", "time": "Wed Sep 02 00:45:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 00:45:40 2020 +0000" }, "message": "Use more inclusive terms. am: 697ce36c44 am: 8b712f7045\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12505403\n\nChange-Id: I55ea7032460fd52448feeaf840ba8698db3e2242\n" }, { "commit": "8b712f70450c5318b46579c6b2c3b3d75be95fc8", "tree": "313257662bcc66636d05c6a27e530a2ea72429f1", "parents": [ "b1cfe1266fd543b347107356a57c70f58ceb005e", "697ce36c44e6c3674b26039cc2f8da76e3990f30" ], "author": { "name": "Peiyong Lin", "email": "lpy@google.com", "time": "Wed Sep 02 00:21:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 00:21:50 2020 +0000" }, "message": "Use more inclusive terms. am: 697ce36c44\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12505403\n\nChange-Id: Ice1685616e48b8fcdcb46c320b208707045be1ed\n" }, { "commit": "b7aee6e111fff30e4e0f5d4a4b4a60ed033d67d8", "tree": "69f84a65bad554b027c12cf540d19fa673e658db", "parents": [ "c4ba40d49f0862487dea32b3efffbd291802130d" ], "author": { "name": "James Zern", "email": "jzern@google.com", "time": "Fri Jun 26 13:49:53 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Sep 01 22:38:47 2020 +0000" }, "message": "framework/av,C2SoftGav1Dec: update to libgav1 v0.16.0\n\nthis is dependent on the update to external/libgav1 (ag/12016847,\nchange-id I63361c388d8cf6f652774b07c9475c45951599c5)\n\nBug: 162267932\nTest: playback, cts on sargo-userdebug / sargo_hwasan-userdebug\nTest: aosp_arm-eng aosp_arm64-eng aosp_x86-eng aosp_x86_64-eng build\nChange-Id: Idc713f4b10776cfb6b7fa2d75b2162c3b85d3313\nMerged-In: Idc713f4b10776cfb6b7fa2d75b2162c3b85d3313\n(cherry picked from commit 4f5bdb78a4c4d4620504733e9e779261e93686b6)\n" }, { "commit": "697ce36c44e6c3674b26039cc2f8da76e3990f30", "tree": "fe1e301cbf22d53ef1b1607ebbe6bce46046a101", "parents": [ "4ffca8764be4b177cd08dfbd0705ad1e236709ce" ], "author": { "name": "Peiyong Lin", "email": "lpy@google.com", "time": "Tue Jul 28 21:01:51 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 22:25:23 2020 +0000" }, "message": "Use more inclusive terms.\n\nBug: b/162288333\nTest: N/A\nChange-Id: I77b216eb01d31a8b494b35b7e867f374de64cacc\n" }, { "commit": "65c647c35db9494c118b9830b8554f4169ec65a9", "tree": "8750af6324624c5ae407e45f3de477f39b415525", "parents": [ "45d6dc964d0fbcfde10dcef07fda68a84b6a2516", "e12b63aff36f973cdea38a2d391182ba24249eb8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 22:09:48 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 22:09:48 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\" into stage-aosp-master am: 4ffca8764b -s ours am: b1cfe1266f -s ours am: e12b63aff3 -s ours\n\nam skip reason: Change-Id Ie94127c1e981cb18671d5137ba0d39355d1353da with SHA-1 924eccfd6f is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12485043\n\nChange-Id: I8ed8d6c9b0a600cb16d26c0db3bcb795659e1166\n" }, { "commit": "45d6dc964d0fbcfde10dcef07fda68a84b6a2516", "tree": "8750af6324624c5ae407e45f3de477f39b415525", "parents": [ "917ca09494b5fbad9f7ef63f85fa3ac1d80d0864", "37e9654973cf0458a30805ef2180265e356e1987" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 21:48:42 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 21:48:42 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\" am: 96a663b0ef am: 0e30ca6437 am: 4984eb5e21 am: 37e9654973\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1416258\n\nChange-Id: I27be61eb183692a7b44802d2ed35e0a629441c70\n" }, { "commit": "e12b63aff36f973cdea38a2d391182ba24249eb8", "tree": "46ce02739a2899d0c4c1c356ec955d7242ea753b", "parents": [ "37e9654973cf0458a30805ef2180265e356e1987", "b1cfe1266fd543b347107356a57c70f58ceb005e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 21:46:32 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 21:46:32 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\" into stage-aosp-master am: 4ffca8764b -s ours am: b1cfe1266f -s ours\n\nam skip reason: Change-Id Ie94127c1e981cb18671d5137ba0d39355d1353da with SHA-1 924eccfd6f is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12485043\n\nChange-Id: I0816a5eaa48c495e7146fa38fa030169c17b1062\n" }, { "commit": "37e9654973cf0458a30805ef2180265e356e1987", "tree": "46ce02739a2899d0c4c1c356ec955d7242ea753b", "parents": [ "ff30ed79d2c4715e355824980c4978c066ebf177", "4984eb5e21d5918e9195ccb3d9540ed155820ec6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 21:31:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 21:31:21 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\" am: 96a663b0ef am: 0e30ca6437 am: 4984eb5e21\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1416258\n\nChange-Id: Ibe802a15ab203d206d898ee4feb7d4a94037e5cf\n" }, { "commit": "b1cfe1266fd543b347107356a57c70f58ceb005e", "tree": "313257662bcc66636d05c6a27e530a2ea72429f1", "parents": [ "4984eb5e21d5918e9195ccb3d9540ed155820ec6", "4ffca8764be4b177cd08dfbd0705ad1e236709ce" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 20:36:57 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 20:36:57 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\" into stage-aosp-master am: 4ffca8764b -s ours\n\nam skip reason: Change-Id Ie94127c1e981cb18671d5137ba0d39355d1353da with SHA-1 924eccfd6f is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12485043\n\nChange-Id: Ib892e15fb42ba64ec651803a7863844ae4b06ca9\n" }, { "commit": "4984eb5e21d5918e9195ccb3d9540ed155820ec6", "tree": "313257662bcc66636d05c6a27e530a2ea72429f1", "parents": [ "e75114727d73502257ef503451453c6f85ded175", "0e30ca64372f8e4dab5cbe3d2b0e326081c4fb2f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 20:22:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 20:22:55 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\" am: 96a663b0ef am: 0e30ca6437\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1416258\n\nChange-Id: Idb94e55c869c66e18349e9ef7f1f02c87bb4ef9d\n" }, { "commit": "4ffca8764be4b177cd08dfbd0705ad1e236709ce", "tree": "be2657e20b7222754d29d14d8f2f1fe309bffc62", "parents": [ "0e30ca64372f8e4dab5cbe3d2b0e326081c4fb2f", "2e40c302d6117ec6eb65f25832a71488367b4dfb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 20:03:43 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 01 20:03:43 2020 +0000" }, "message": "Merge \"Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\" into stage-aosp-master" }, { "commit": "0e30ca64372f8e4dab5cbe3d2b0e326081c4fb2f", "tree": "1954de8b8b30436bb3fed2fe21b70e1cea8cecab", "parents": [ "054de8d6440fd30238fa9330bcc038cda745b244", "96a663b0ef0b0273111a47aa2c3fdc4029a36e4e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 20:01:44 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 20:01:44 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\" am: 96a663b0ef\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1416258\n\nChange-Id: I29e4415ac61a0bb58524858282731c6c2b3fba17\n" }, { "commit": "96a663b0ef0b0273111a47aa2c3fdc4029a36e4e", "tree": "6e40f2c53934ba0246207e8be722204106f0a5d7", "parents": [ "579a5284be48aec4905160464716011cc7e89b9c", "58fb14aa84f41329fccc7185701ffbf502f77114" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 19:26:30 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 01 19:26:30 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\"" }, { "commit": "917ca09494b5fbad9f7ef63f85fa3ac1d80d0864", "tree": "224b7d6f94ed76aebc7877b1a62f6462ae516a05", "parents": [ "7f572c9b873b86d021056653a9f92887c7ae2ee6", "3626bf513e108d230ca5ec0e8fa37ab95c217d45" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Aug 31 22:29:24 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 31 22:29:24 2020 +0000" }, "message": "Merge \"AudioMixer: Fix MONO_EXPAND for more than 2 channels\" into rvc-qpr-dev am: 3626bf513e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12172441\n\nChange-Id: I4600b70a84ff09907990642b156121533311d632\n" }, { "commit": "3626bf513e108d230ca5ec0e8fa37ab95c217d45", "tree": "960d4c1812c839fcb252166aa0ea0bb467db9fec", "parents": [ "0b3f254028404b4772e02f9d1cdfcefba0e264b4", "5ed1a86d041a47017efa0ac527969c08963e0770" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Aug 31 21:44:29 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 31 21:44:29 2020 +0000" }, "message": "Merge \"AudioMixer: Fix MONO_EXPAND for more than 2 channels\" into rvc-qpr-dev" } ], "next": "58fb14aa84f41329fccc7185701ffbf502f77114" }