)]}' { "log": [ { "commit": "7886cfcf560d0e8193951e39c70c61f46d482f43", "tree": "cd40551a9cacda37734b7744c8d950effa4d670b", "parents": [ "aab9359c05065e43b248ae2507c946517d891a60", "cf1176073df4d6604234dd3c6e78f8c979a95212" ], "author": { "name": "Jack He", "email": "siyuanh@google.com", "time": "Wed Oct 10 20:59:31 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 10 20:59:31 2018 -0700" }, "message": "Merge \"Remove BluetoothDevice.ACTION_DISAPPEARED\"\nam: cf1176073d\n\nChange-Id: I1715c848fac8adfd41c7371a7103ea31bf4488ac\n" }, { "commit": "cf1176073df4d6604234dd3c6e78f8c979a95212", "tree": "7bd8cbb07416c35d416459471eb7ef39cba3e788", "parents": [ "772b75c26d304790806598f9f1773cdfcd8bc4d7", "4618ce3a06508cad04e93c05877ca37800644e7b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 11 03:32:10 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 11 03:32:10 2018 +0000" }, "message": "Merge \"Remove BluetoothDevice.ACTION_DISAPPEARED\"" }, { "commit": "4618ce3a06508cad04e93c05877ca37800644e7b", "tree": "2b1a90aea2895faa356ceb89b9ddca37c0b4d89e", "parents": [ "a788eabd7231ce2ab88a37b7762d20bcb81600ab" ], "author": { "name": "Jack He", "email": "siyuanh@google.com", "time": "Wed Oct 10 17:42:48 2018 -0700" }, "committer": { "name": "Jack He", "email": "siyuanh@google.com", "time": "Wed Oct 10 17:43:32 2018 -0700" }, "message": "Remove BluetoothDevice.ACTION_DISAPPEARED\n\nThis intent was never sent by the Bluetooth stack\n\nBug: 112115770\nTest: make\nChange-Id: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f\nMerged-In: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f\n(cherry picked from commit dd1c592fcd11e2bee25db0077da0ef3f59071d5d)\n" }, { "commit": "bfff7e2fe81cdc15453889008df715586bd8aefa", "tree": "2961a6719ff68de2aa806d44d3c8214d02cf0b89", "parents": [ "6ffa32f13dc4a05ed9b14a8b3ed4db02c4a3d102", "e75f2f504e4d119dc83d077802e62031efb9d300" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Oct 10 16:13:26 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 10 16:13:26 2018 -0700" }, "message": "Merge changes from topic \"aapt2-manifest-elements\"\nam: e75f2f504e\n\nChange-Id: I2cf054f942109e539c2439887078a6e182603456\n" }, { "commit": "e75f2f504e4d119dc83d077802e62031efb9d300", "tree": "7dc043ba5f0e34433e90d88249c1a4dfa1198b48", "parents": [ "4d9823f3eb12d27610770ea315512e460d8dbab3", "f5c86dc1c113dc2a898311ee4d446a9ab3ed8e72" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Oct 10 22:29:57 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 10 22:29:57 2018 +0000" }, "message": "Merge changes from topic \"aapt2-manifest-elements\"\n\n* changes:\n Remove workarounds for b/79755007\n AAPT2: Add the rest of supported manifest elements\n AAPT2: Add supported manifest elements\n" }, { "commit": "25131f86fac3fd2614c288a1bb8b4386a35173cc", "tree": "d3793a12535f5cdc3e7ec0197ff73f3d6776b471", "parents": [ "ef43636ce405f543f00ea1fc1831571ea336f638", "403813782f89f9e4418fca6ef24ae394c1faebb9" ], "author": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Tue Oct 09 16:37:23 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 09 16:37:23 2018 -0700" }, "message": "Merge \"Add READ_PRIVILEGED_PHONE_STATE to used permissions\"\nam: 403813782f\n\nChange-Id: Id778252cc548c20ed05dc59c4a3da85b40cc0b7c\n" }, { "commit": "ef43636ce405f543f00ea1fc1831571ea336f638", "tree": "20f90e47348fad2a4628c3c41a4d8324b125eb87", "parents": [ "2a656b455d5a585281b55d3f49daf8fe4aa17063", "d05c9bc51c976b4dc5826d1104e62e50e20ac40c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Oct 09 16:12:44 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 09 16:12:44 2018 -0700" }, "message": "Merge \"Convert PrintSpooler to Android.bp\"\nam: d05c9bc51c\n\nChange-Id: I3128882467bc21e7f9fb20734dd78c3f1f2a399b\n" }, { "commit": "403813782f89f9e4418fca6ef24ae394c1faebb9", "tree": "d8491eec70b6d9d0e932acabccf42081d8bf9eac", "parents": [ "d05c9bc51c976b4dc5826d1104e62e50e20ac40c", "1248e435a0ca9b0ca43559f0aa2c8f2f58ba1d12" ], "author": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Tue Oct 09 23:07:13 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 09 23:07:13 2018 +0000" }, "message": "Merge \"Add READ_PRIVILEGED_PHONE_STATE to used permissions\"" }, { "commit": "d05c9bc51c976b4dc5826d1104e62e50e20ac40c", "tree": "aa81b95f2a0c2a24433f72152258b880ae2d5686", "parents": [ "120b7fba9304025d3c630bf4b3681fc30108c2b4", "278a04aa6b897ad0adccdb685464e2f209f6a108" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Oct 09 21:50:40 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 09 21:50:40 2018 +0000" }, "message": "Merge \"Convert PrintSpooler to Android.bp\"" }, { "commit": "1248e435a0ca9b0ca43559f0aa2c8f2f58ba1d12", "tree": "2348914c1d77040b109085ee0dab96bc738c1fae", "parents": [ "61b9b6c9eb7acb7b5f260f43b04d31d17bb59557" ], "author": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Mon Oct 08 09:39:24 2018 -0700" }, "committer": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Mon Oct 08 11:29:03 2018 -0700" }, "message": "Add READ_PRIVILEGED_PHONE_STATE to used permissions\n\nBug: 110099294\nTest: cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.TelephonyManagerTest\nChange-Id: I13fec3d397c200ce92883883c96c07007e823efe\n" }, { "commit": "85666351d77197fdd6add1b04a721820904d838a", "tree": "2433dd729b7f859ce23cde523ee117b3e8250800", "parents": [ "79822ffb6f9b70e6324bcc577190eb262116c803", "503ae21287a72213457433476526ff8ea1465f3e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Oct 05 15:38:39 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 05 15:38:39 2018 +0000" }, "message": "Merge \"DO NOT MERGE Synchronize ZenModeControllerImpl callbacks\"" }, { "commit": "66dd5364216e7fdc56359a0ce6f688217e75205a", "tree": "9a67fee22418b6c0e8d22eed2e4d334bf45a5347", "parents": [ "ca239d77d67597019c0c14d0591e454753367ae5", "337946995021164e2ddd15c854cabca10136a57a" ], "author": { "name": "Ian Kasprzak", "email": "iankaz@google.com", "time": "Thu Oct 04 08:55:37 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 04 08:55:37 2018 -0700" }, "message": "Merge \"Add AndroidTest file for ExtServices\"\nam: 3379469950\n\nChange-Id: I320cce226746cdab310661143fc0f3e5aa1e124d\n" }, { "commit": "93d878f49e595a1af33d590f06306bbe7c3f9939", "tree": "1e54847d95559d6f44a495219b24bd7ae43c80d8", "parents": [ "2966539634082504439fa7f919233817f459b552" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Tue Aug 21 12:35:45 2018 -0400" }, "committer": { "name": "Ian Kasprzak", "email": "iankaz@google.com", "time": "Wed Oct 03 16:43:09 2018 -0700" }, "message": "Add AndroidTest file for ExtServices\n\nTest: make\nBug: 111475013, 117228643\nChange-Id: Id649a1ed2109dee87bb8c61c3a161efe99c5e457\nMerged-In: Id649a1ed2109dee87bb8c61c3a161efe99c5e457\n(cherry picked from commit cfd2692a94503753bf9abcffdb40ed2de682dd41)\n" }, { "commit": "278a04aa6b897ad0adccdb685464e2f209f6a108", "tree": "96e656988a1c284fa0688d3d0f6eb7ede1b17d8d", "parents": [ "6c35ea901c364f14198009b00b9e838842516911" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Oct 03 14:43:43 2018 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Oct 03 14:45:26 2018 -0700" }, "message": "Convert PrintSpooler to Android.bp\n\nSee build/soong/README.md for more information.\n\nBug: 80095087\nTest: atest PrintSpoolerOutOfProcessTests\nChange-Id: I9d641b9c480745ccee323aa0f758cd6a146e0638\n" }, { "commit": "6ac6aead0d22a61ef8b137de312336c21e2ca67e", "tree": "3c33a4ef4dff4ee0a4313d29599d5b6b808b19e7", "parents": [ "70509bba06eaec87cc8ddda850ae56b96ea059e0", "fce8595437da79c1f54739a98cae7bca1666cc39" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Oct 03 11:48:46 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 03 11:48:46 2018 -0700" }, "message": "Merge \"Add SapProfile to LocalBluetoothProfileManager (1/2)\"\nam: fce8595437\n\nChange-Id: I99f1cca275d571662f16427cbd330398ed6fb9f1\n" }, { "commit": "fce8595437da79c1f54739a98cae7bca1666cc39", "tree": "5f41981be05cef584c2417b1412b82dbe5001c4e", "parents": [ "7eaa2cbf51890cdf6d6662968053c84012103eca", "2be42b972c00e550ad9f3c37508c17069e6644d6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Oct 03 18:04:28 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 03 18:04:28 2018 +0000" }, "message": "Merge \"Add SapProfile to LocalBluetoothProfileManager (1/2)\"" }, { "commit": "70509bba06eaec87cc8ddda850ae56b96ea059e0", "tree": "7762d14632269faaeb92a5b907df72fae689dc29", "parents": [ "ab618e00b25d12593bcb8d4fd279e4ab78d15a33", "7eaa2cbf51890cdf6d6662968053c84012103eca" ], "author": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Wed Oct 03 09:56:53 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 03 09:56:53 2018 -0700" }, "message": "Merge \"Disable the buginfo dialog on AndroidTV\"\nam: 7eaa2cbf51\n\nChange-Id: If32bf9933b2443839391ac7d326778112937de90\n" }, { "commit": "503ae21287a72213457433476526ff8ea1465f3e", "tree": "d82aca41bb9fea049912eb253ef92b644e4b2c7a", "parents": [ "32fb670a0a023d8caeb571f9d2a581e489dd962d" ], "author": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Tue Oct 02 09:22:56 2018 -0400" }, "committer": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Wed Oct 03 12:36:04 2018 -0400" }, "message": "DO NOT MERGE Synchronize ZenModeControllerImpl callbacks\n\nTest: manual\nBug: 115688927\nChange-Id: Ib47913c7b5522c40405fadd97d570d5f197f71dc\n" }, { "commit": "7eaa2cbf51890cdf6d6662968053c84012103eca", "tree": "c291e152d3ce973c8681e8efd549ba8599a53703", "parents": [ "99c685b0e8800c6f8ec3eb301bfa70eb0674d8ac", "86f69db5c08aeb564300542d980f67d2252166ca" ], "author": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Wed Oct 03 15:39:22 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 03 15:39:22 2018 +0000" }, "message": "Merge \"Disable the buginfo dialog on AndroidTV\"" }, { "commit": "2be42b972c00e550ad9f3c37508c17069e6644d6", "tree": "2d14afbfbee4f337e67f5c5bf07eb14fc7736a41", "parents": [ "5604cc2516c788ab6242aef72f851e8771a31161" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Sep 26 20:45:26 2018 +0800" }, "committer": { "name": "Chienyuan Huang", "email": "chienyuanhuang@google.com", "time": "Wed Oct 03 11:05:31 2018 +0000" }, "message": "Add SapProfile to LocalBluetoothProfileManager (1/2)\n\n* add SapProfile and related logic to LocalBluetoothProfileManager\n* simplify logic for connect and disconnect in SapProfile\n* connect: remove connected device check logic. SapService will\n return false directly.\n* disconnect: remove connected device check logic. SapService will\n check it.\n* getConnectionStatus: remove connected device check logic.\n SapService will check it.\n* remove member variable V and related checks.\n* wrap if/else statement in curly brackets.\n* add robotest for SapProfile.\n\nBug: 116281023\nTest: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER\u003dSapProfileTest\nChange-Id: I2efc1beb7a12e1ec412baf54f895d2ebe930e8f1\nMerged-In: I2efc1beb7a12e1ec412baf54f895d2ebe930e8f1\n" }, { "commit": "f0f9fab3c8fc95a44e895562986b75dbe92ed7ca", "tree": "945f03f93eafe846846eb39c647b9656bd4eb8ab", "parents": [ "09087a83fa69db93da530a113ff397eb7cb7a771", "702587e7878c4629c9c3d8800e78e017f71bc6d8" ], "author": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Wed Oct 03 03:14:48 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 03 03:14:48 2018 -0700" }, "message": "Merge \"Warn about sensitive bugreport contents.\"\nam: 702587e787\n\nChange-Id: I4fa68006bf45a0514a153d4373274c12ba10f528\n" }, { "commit": "702587e7878c4629c9c3d8800e78e017f71bc6d8", "tree": "3abbaf5962ce92c1ec2c987d5c935334dc70aa40", "parents": [ "729ae07a369c5d9c1da018513fa25e4e804d054c", "e70a61d56dd91932d1d60e801dc17fc9a99f8fc2" ], "author": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Wed Oct 03 09:51:59 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 03 09:51:59 2018 +0000" }, "message": "Merge \"Warn about sensitive bugreport contents.\"" }, { "commit": "09087a83fa69db93da530a113ff397eb7cb7a771", "tree": "b41f35dbcde400ead49160b63f395f982db43086", "parents": [ "7ebecf2ad470aef22b2b9c0e96b08d194067b5b2", "729ae07a369c5d9c1da018513fa25e4e804d054c" ], "author": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Wed Oct 03 02:21:18 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 03 02:21:18 2018 -0700" }, "message": "Merge \"Synchronize access to sNotificationBundle.\"\nam: 729ae07a36\n\nChange-Id: I07b54a6252348d998ea0b695f3817059c63e0364\n" }, { "commit": "729ae07a369c5d9c1da018513fa25e4e804d054c", "tree": "73b4ac1dc2b1da2ef23884fe65a8ae14381874c1", "parents": [ "aa5cb71764f33e0e9976df5c4cc48f26734f8af7", "ed5e51dbb2e23ca43ff91733bad3a68a9d2d0f00" ], "author": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Wed Oct 03 08:55:01 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 03 08:55:01 2018 +0000" }, "message": "Merge \"Synchronize access to sNotificationBundle.\"" }, { "commit": "a447164ae5f45003b23a97c7dadefeb1d621265f", "tree": "8f2de1141cafafc090e7cd09b9ef5137a71021b6", "parents": [ "919e151bd36850d139e3b5ea6496511ef70b9ca6", "9073dc48393c689494cbc159fe8bfee29c02d86e" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Oct 02 15:28:39 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 02 15:28:39 2018 -0700" }, "message": "Merge \"Remove unused / invalid import\"\nam: 9073dc4839\n\nChange-Id: Icd39d49c9fae7c11837434fdcbe5603310034ad3\n" }, { "commit": "9073dc48393c689494cbc159fe8bfee29c02d86e", "tree": "caa2796e036b8bdda4a00aff8b91c4395188c4ff", "parents": [ "9b2c026f10f98dee726886ea1fadb698c9619456", "4ff327141d7efd59de401409347f950193899999" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Oct 02 21:46:01 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 02 21:46:01 2018 +0000" }, "message": "Merge \"Remove unused / invalid import\"" }, { "commit": "ed5e51dbb2e23ca43ff91733bad3a68a9d2d0f00", "tree": "49ac4fd6f0f28a982cffbf22b15c78ff20825159", "parents": [ "6ef0182f07a5a5b53f46ed4d9921cc115ac77e36" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Fri Sep 21 16:37:53 2018 -0700" }, "committer": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Tue Oct 02 11:39:42 2018 +0100" }, "message": "Synchronize access to sNotificationBundle.\n\nOtherwise Shell can crash due to ConcurrentModificationException\n\nTest: atest BugreportReceiverTest\nTest: manual verification\n\nFixes:116280360\n\nChange-Id: I138acd43b313d2a7a9d945fb44a9d63e1ad798eb\nMerged-In: I138acd43b313d2a7a9d945fb44a9d63e1ad798eb\n(cherry picked from commit ee72fa19a97f2b0677a130204e3527bc3233e4d9)\n" }, { "commit": "e70a61d56dd91932d1d60e801dc17fc9a99f8fc2", "tree": "cb1798d21e271ef642e7eab8fee72cb91091be64", "parents": [ "6ef0182f07a5a5b53f46ed4d9921cc115ac77e36" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Sep 13 11:49:54 2018 -0600" }, "committer": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Tue Oct 02 11:34:50 2018 +0100" }, "message": "Warn about sensitive bugreport contents.\n\nWe show this message when clicking a notification, but we also want\nto alert users when they\u0027re picking files to attach/share.\n\nBug: 114711671\nTest: manual\nChange-Id: I23e249c93d6fa9cf960ef2a61d3fe769eb56ddf5\nMerged-In: I23e249c93d6fa9cf960ef2a61d3fe769eb56ddf5\n(cherry picked from commit 59137825eb11e6ca4c53e43a9973983ebdd09b33)\n" }, { "commit": "86f69db5c08aeb564300542d980f67d2252166ca", "tree": "e855b9bc9e686ffdf1779df0a250833a33c8e037", "parents": [ "6ef0182f07a5a5b53f46ed4d9921cc115ac77e36" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Sep 03 16:06:30 2018 +0200" }, "committer": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Tue Oct 02 11:31:27 2018 +0100" }, "message": "Disable the buginfo dialog on AndroidTV\n\nBug: 113033835\nTest: Tested manually on Atom\nChange-Id: If65997e28db7c0100018145f9313549494e41a2a\nMerged-In: If65997e28db7c0100018145f9313549494e41a2a\n(cherry picked from commit cb68d29f03f14b188ccc02b877161173b631685d)\n(cherry picked from commit 01badb78744bc48e35215556a49ac97a17cbce3a)\n" }, { "commit": "4ff327141d7efd59de401409347f950193899999", "tree": "b6376be01f868db8451ac3b3cd3a5d8f009ba5cc", "parents": [ "4106e419b204c677afc1d9e216953ef4f04b3b73" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Oct 01 11:32:36 2018 +0100" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Oct 01 11:32:36 2018 +0100" }, "message": "Remove unused / invalid import\n\nNavigationBarCompat imports sun.misc.Resource though\nit doesn\u0027t need it.\n\nBug: 113148576\nTest: build only\nChange-Id: I26d6e0b3d9a8948333fdf9f3659b87b3b46a75d5\n" }, { "commit": "cb476f5fd6ad1a464290d977f5d7914ca43331f8", "tree": "be376df014d745f8ca72128fecf2c8769fe073cb", "parents": [ "89af05bc4c2e8e7a18e373a2933c61331c1c1c9b", "05e75be642bd334830812af0202cd0988bb61b6c" ], "author": { "name": "Jin Dong", "email": "jin.x.dong@sony.com", "time": "Fri Sep 28 18:35:25 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 28 18:35:25 2018 -0700" }, "message": "Merge \"Add vendor notice header at the top of Third-party licenses\"\nam: 05e75be642\n\nChange-Id: Ibfa8d796d67017dffab15faefd223721980b6921\n" }, { "commit": "16c8c0aef5100371f198c69b22a43a7edaa15b01", "tree": "1a7dcd1555405f4a616269370d02429e528ab1d9", "parents": [ "3e83b4cad84531a9136d6481d0ff017c9760da0e" ], "author": { "name": "Jin Dong", "email": "jin.x.dong@sony.com", "time": "Fri Aug 24 17:34:54 2018 +0800" }, "committer": { "name": "Fan Zhang", "email": "zhfan@google.com", "time": "Fri Sep 28 20:19:07 2018 +0000" }, "message": "Add vendor notice header at the top of Third-party licenses\n\nVendor can add notice header at the top of \"Third-party licenses\"\nby overlay the string notice_header.\n\nFixes: 116298367\nChange-Id: If80d69180664970441d0addccd81d65d7ab55c3b\nMerged-In: If80d69180664970441d0addccd81d65d7ab55c3b\n" }, { "commit": "737945fbd551582c9c413a9a98eb4224355c8f6b", "tree": "a32f51348dfb3a142304a38c21eac762a778b298", "parents": [ "47be78e5235e344019f4ef449c051bc08fca5790", "eb1d6d91af9133e035e2c25b7118250b7b31bd97" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Wed Sep 26 17:09:44 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 26 17:09:44 2018 -0700" }, "message": "Merge \"Dismiss SIM lock page after correct SIM\"\nam: eb1d6d91af\n\nChange-Id: I01551d9d8e14e7a9bd4ef5178b571beee032735b\n" }, { "commit": "eb1d6d91af9133e035e2c25b7118250b7b31bd97", "tree": "6c0f38b7b5c7e6cc3af1f644466ef1742a61e296", "parents": [ "b839befd7bd375b39d39723e42d912265031fbdf", "b4299d92e6d2679dc083e8cf6b21d56649a7059a" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Wed Sep 26 23:42:55 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 26 23:42:55 2018 +0000" }, "message": "Merge \"Dismiss SIM lock page after correct SIM\"" }, { "commit": "b4299d92e6d2679dc083e8cf6b21d56649a7059a", "tree": "c5552f680738ae8a4dabcb8dc1868ad1815731fa", "parents": [ "7fe46504bea1d55b83ceec0cb07b4b8d4fd80aeb" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Wed Sep 26 12:49:11 2018 -0700" }, "committer": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Wed Sep 26 12:59:57 2018 -0700" }, "message": "Dismiss SIM lock page after correct SIM\n\nPreviously the criteria was to dismiss if:\n1. There is no pin/password/pattern set AND\n2. the lockscreen is disabled.\n\nThis behaved incorrectly in the case where the lockscreen is enabled\nbut there is no pin/password/pattern set.\n\nWe fix the condition so that now we dismiss the SIM lock if:\n1. There is no pin/password/pattern set OR\n2. the lockscreen is disabled.\n\nFixes: 115780994\nTest: manual\nChange-Id: I88da896add635126934eb0ed22e617ac2607f15a\n" }, { "commit": "78e8da5e790d20ea452de4e15d5d3f0604699ccf", "tree": "086befb8f18684ceed391b46d9932916f539b628", "parents": [ "7fdac2d088c0cff988e18b15c91e079bb24b1911", "e238a19aa5865f9073aab4955de5ab6a50ad09a0" ], "author": { "name": "Leon Liao", "email": "leonliao@google.com", "time": "Wed Sep 26 05:58:46 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 26 05:58:46 2018 -0700" }, "message": "Merge \"Rename method isConnectable()\"\nam: e238a19aa5\n\nChange-Id: Ia19f7f53f62ff9839890e962b7b659c9f43fa3b1\n" }, { "commit": "7fdac2d088c0cff988e18b15c91e079bb24b1911", "tree": "c5d6cba0b1e17a7299fded0ce10c2e360e4443da", "parents": [ "89ec00b6221f39aec1bcfb72f66c8f5a6c56db59" ], "author": { "name": "hjchangliao", "email": "hjchangliao@google.com", "time": "Thu Apr 26 15:12:11 2018 +0800" }, "committer": { "name": "Ivan Podogov", "email": "ginkage@google.com", "time": "Wed Sep 26 11:55:04 2018 +0100" }, "message": "Remove wrapper for BluetoothA2dp\n\nRemove BluetoothA2dpWrapper,\nUse BluetoothA2dp to replace all of them.\n\nBug: 76167422\nChange-Id: I2a55677eb8ce4ef62008aa06929b0b78515b28e5\nMerged-In: I2a55677eb8ce4ef62008aa06929b0b78515b28e5\nTest: RunSettingsLibRoboTests\n" }, { "commit": "e238a19aa5865f9073aab4955de5ab6a50ad09a0", "tree": "730e7c57ffc76f29395f7df8cfa03126c88b6c66", "parents": [ "544b8efa464ac146eb1b5d7c4e8bdbb93a219a04", "3b5e6bd4e13a2d7cefb9e9f2f32613a07b82ef53" ], "author": { "name": "Leon Liao", "email": "leonliao@google.com", "time": "Tue Sep 25 23:06:20 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 25 23:06:20 2018 +0000" }, "message": "Merge \"Rename method isConnectable()\"" }, { "commit": "3d70baf5ff7d26581766f56407103fbc163cdf7e", "tree": "5ca57993781b03d69a41c4f036533966a9778c56", "parents": [ "9c5a6e2c6cba547454978b9e45071916f25b3279", "d106aac67bac832d63109abcd69fc5af668b81f9" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Thu Sep 20 18:09:35 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 20 18:09:35 2018 -0700" }, "message": "Merge \"Fix NullPointerException in CaptivePortalLogin\"\nam: d106aac67b\n\nChange-Id: I6cbb44bd5b2a492b938f3d64a5f10c818df8cb22\n" }, { "commit": "3b5e6bd4e13a2d7cefb9e9f2f32613a07b82ef53", "tree": "72d89671f7f36225e9dddde9b60d0e68993a3e51", "parents": [ "6e9ce1a296d334a468f2e76ba15d00be530b80bf" ], "author": { "name": "Leon Liao", "email": "leonliao@google.com", "time": "Tue Sep 18 12:45:45 2018 +0800" }, "committer": { "name": "Leon Liao", "email": "leonliao@google.com", "time": "Thu Sep 20 09:21:26 2018 +0800" }, "message": "Rename method isConnectable()\n\nLocalBluetoothProfile.isConnectable() checks whether the user can initiate a connection\nfor a specific profile, not really whether the profile is connectable.\n\nChange-Id: If6c6cd1554acf35db2460ea6ddb65148a7e86e45\nBug: 79982487\nTest: build\n" }, { "commit": "67c1d26a0771cab943dc68b03f34acb0b3a5882f", "tree": "5d5f8147df147e53144a46bdc5eb7635938f441d", "parents": [ "7cfbdcc4818e120e78c4b64e7baa3908679ce5d4" ], "author": { "name": "Hisanobu, Watanabe", "email": "hisanobu.watanabe@sony.com", "time": "Mon Aug 20 17:46:54 2018 +0900" }, "committer": { "name": "Yuuki Habu", "email": "yuuki.habu@sony.com", "time": "Wed Sep 19 15:15:29 2018 +0900" }, "message": "Fix NullPointerException in CaptivePortalLogin\n\n[Problem]\nAfter reboot, the CaptivePortalLogin crashes when start the\nCaptivePortalLogin from Recents Screen.\n\n[Root Cause]\nAlthough Network class is null, Network#getPrivateDnsBypassingCopy is\ncalled at CaptivePortalLoginActivity\n\n[Solution]\nTo check if NetworkCapabilities is null before\nNetwork#getPrivateDnsBypassingCopy\n\nBug: 113303484\nTest: built, boot and manual\n\nChange-Id: Icff8446fefa9700dcbcd1f8f1e4edeaf4b0d3557\n" }, { "commit": "cee5628c9b8d215bb524994d7f859f4bd8ad35c7", "tree": "9651b65442127cccf13f32d7759a64f52bb76758", "parents": [ "0d68d68b396491508c18fe5cd903675d7b5038b1", "7cfbdcc4818e120e78c4b64e7baa3908679ce5d4" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Tue Sep 18 22:24:51 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 18 22:24:51 2018 -0700" }, "message": "Merge \"Simplify logic for connect in PbapClientProfile\"\nam: 7cfbdcc481\n\nChange-Id: I9e96f965c94671b31a25245acc70757fabf6ff7b\n" }, { "commit": "f374663b3a04040b97ba2dbace4818237ccb54d3", "tree": "d65eeb17ad1cdc863e6bc0a001b661f4f165789a", "parents": [ "e7374ba2c7dae1c535975238d0ff42845df65084", "b545c70d1d58f48a3e0a4aae7027daa9178b1ad5" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Tue Sep 18 22:11:48 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 18 22:11:48 2018 -0700" }, "message": "Merge \"Simplify logic for getConnectionStatus in HidDeviceProfile\"\nam: b545c70d1d\n\nChange-Id: I6b876ae488809fd84e5c399fda2b5d7c3abfc8ae\n" }, { "commit": "e7374ba2c7dae1c535975238d0ff42845df65084", "tree": "322b874b2d3a3d6b8a09bfca11ec784de92c0235", "parents": [ "f46a3a3acc36d3e94bded359121dc100d12abf69", "0ac2a840a00dc749fb800b5d5a697238f0dfd404" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Tue Sep 18 22:08:48 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 18 22:08:48 2018 -0700" }, "message": "Merge \"Simplify logic for connect in MapClientProfile\"\nam: 0ac2a840a0\n\nChange-Id: Ibd99ec5998fc81b302235912076f5df153b5d8ba\n" }, { "commit": "7cfbdcc4818e120e78c4b64e7baa3908679ce5d4", "tree": "5cc1b3a0543f96cef0fce93306f7b044c0790810", "parents": [ "ba0b212a33efc4338c633f94dfea2229e4d38bc8", "d8ebc8db546e8e9d5b105dc82110f3417b030676" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 19 04:24:19 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 19 04:24:19 2018 +0000" }, "message": "Merge \"Simplify logic for connect in PbapClientProfile\"" }, { "commit": "b545c70d1d58f48a3e0a4aae7027daa9178b1ad5", "tree": "b26a9ae079d4455398ac5221cb9249ac49877633", "parents": [ "0ac2a840a00dc749fb800b5d5a697238f0dfd404", "932e63b32e948d2b3b0dfd3f6e5251bf823c549c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 19 02:08:33 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 19 02:08:33 2018 +0000" }, "message": "Merge \"Simplify logic for getConnectionStatus in HidDeviceProfile\"" }, { "commit": "0ac2a840a00dc749fb800b5d5a697238f0dfd404", "tree": "475bce6c29d9b4132c3a5b346ce8d77a7410345b", "parents": [ "48b50991ecde1b4d34489d9d1f02da654206e9fe", "a16ad76a818bf1d1664f43b1f67505bb7b306c86" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 19 02:08:05 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 19 02:08:05 2018 +0000" }, "message": "Merge \"Simplify logic for connect in MapClientProfile\"" }, { "commit": "a16ad76a818bf1d1664f43b1f67505bb7b306c86", "tree": "a12291a6405ae1eed661f65866fdb10a0ecea146", "parents": [ "daabcae9557b085d7b9d3b1945753718b734f332" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Mon Sep 17 10:54:37 2018 +0800" }, "committer": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Tue Sep 18 11:14:40 2018 +0800" }, "message": "Simplify logic for connect in MapClientProfile\n\n* connect: remove connected device check logic. MapClientService\n will check it.\n* remove member variable V and related checks.\n* wrap if/else statement in curly brackets.\n* add robotest for MapClientProfile.\n\nBug: 111812003\nTest: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER\u003dMapClientProfileTest\nChange-Id: Ic3620c8910e5acbb14e33369ff437d434b514ddf\nMerged-In: Ic3620c8910e5acbb14e33369ff437d434b514ddf\n" }, { "commit": "d8ebc8db546e8e9d5b105dc82110f3417b030676", "tree": "3546e9c19b11fa3052fd8d4d3b5559b8599a77a7", "parents": [ "daabcae9557b085d7b9d3b1945753718b734f332" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Mon Sep 17 11:47:44 2018 +0800" }, "committer": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Tue Sep 18 10:21:50 2018 +0800" }, "message": "Simplify logic for connect in PbapClientProfile\n\n* connect: remove connected device check logic. PbapClientService\n will check it.\n* remove member variable V and related checks.\n* wrap if/else statement in curly brackets.\n* add robotest for PbapClientProfile.\n\nBug: 111812003\nTest: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER\u003dPbapClientProfileTest\nChange-Id: Ide43ee5cec560945ad69639782ad6f214ea0cece\nMerged-In: Ide43ee5cec560945ad69639782ad6f214ea0cece\n" }, { "commit": "b04fcd584203f9000a4a0554f67adef0c80cb45f", "tree": "d4c3952a8c061b62421fec0e29c8d8bc87d52ee9", "parents": [ "b4c55fac9a109874169e4a5fb883f3f884fd2052", "55b91f6d93296b02244ccb9051a64f6ac498f56d" ], "author": { "name": "Yuanjia Hsu", "email": "yuanjiahsu@google.com", "time": "Mon Sep 17 07:09:28 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 17 07:09:28 2018 -0700" }, "message": "Merge \"Add feature flag in Settings.\"\nam: 55b91f6d93\n\nChange-Id: I27aa24563358fe4467de3aa3660825f1d8bd73d5\n" }, { "commit": "55b91f6d93296b02244ccb9051a64f6ac498f56d", "tree": "036c2da4189e5cd5b9542bce5cf7aa5034f441a0", "parents": [ "27eec4b376b098892d8292e97fe03c37de988b4c", "88363e9b2f6e19dabda54a43e0fd7966646d7338" ], "author": { "name": "Yuanjia Hsu", "email": "yuanjiahsu@google.com", "time": "Mon Sep 17 13:43:08 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 17 13:43:08 2018 +0000" }, "message": "Merge \"Add feature flag in Settings.\"" }, { "commit": "e6ce88ca3ce5f8a71c116b56d3c6c41b9a1964af", "tree": "c1b904cea3e511d140d1ac9e42df942ca4443e6e", "parents": [ "57a4bae7c3c79449fcb271375c8e3474a329f716", "0b925f85c00a9a3a942269236a16e77040a3eeb3" ], "author": { "name": "Shaotang Li", "email": "shaotangli@google.com", "time": "Sun Sep 16 22:27:03 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Sep 16 22:27:03 2018 -0700" }, "message": "Merge \"Add extra data when starting emergency dialer intent\"\nam: 0b925f85c0\n\nChange-Id: I9dc0b8711534c1dcdc5715a888a87fb4730f5061\n" }, { "commit": "0b925f85c00a9a3a942269236a16e77040a3eeb3", "tree": "d8f0d1e53f18337d5d423a8fef074092a18fce98", "parents": [ "daabcae9557b085d7b9d3b1945753718b734f332", "f9a69e2d24c4d3e9d924dfee2857167fb3159918" ], "author": { "name": "Shaotang Li", "email": "shaotangli@google.com", "time": "Mon Sep 17 04:14:51 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 17 04:14:51 2018 +0000" }, "message": "Merge \"Add extra data when starting emergency dialer intent\"" }, { "commit": "932e63b32e948d2b3b0dfd3f6e5251bf823c549c", "tree": "f231b0818e5e777183a7abfab447d8c80f191df4", "parents": [ "0890a2b51e2f618dca7d0085fc8bf6ded0684b01" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Sep 12 20:54:08 2018 +0800" }, "committer": { "name": "Chienyuan Huang", "email": "chienyuanhuang@google.com", "time": "Mon Sep 17 03:30:15 2018 +0000" }, "message": "Simplify logic for getConnectionStatus in HidDeviceProfile\n\n* getConnectionStatus: remove connected device check logic.\n HidDeviceService will check it.\n* rewrite the annotation about this class\n* remove member variable DEBUG and related checks.\n* add robotest for HidDeviceProfile\n\nBug: 111812003\nTest: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER\u003dHidDeviceProfileTest\nChange-Id: I2e7fdd69a46707339a32db4304666e50fd0cf954\nMerged-In: I2e7fdd69a46707339a32db4304666e50fd0cf954\n" }, { "commit": "f5c86dc1c113dc2a898311ee4d446a9ab3ed8e72", "tree": "b1ee1e980f9fcec240b0380e15a02fbf53ce8690", "parents": [ "00d5548355ed5a15219ad848ab7a947ea54f82de" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Aug 31 11:18:15 2018 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Sep 13 22:25:58 2018 -0700" }, "message": "Remove workarounds for b/79755007\n\naapt2 now recognizes these manifest elements.\n\nBug: 79755007\nTest: m checkbuild\nChange-Id: I2718fc973e08e7f5226b009807312bd534216f8d\n" }, { "commit": "3832515acfcb78f7ce458652397b1449eda5282c", "tree": "df139fd5c9723c2b878ace3b0a657212dcc8075d", "parents": [ "fc8de0d9e3481093419244246925689f66ebde40", "375af769e60024aab97418daf11c3c63294678eb" ], "author": { "name": "Evan Laird", "email": "evanlaird@google.com", "time": "Thu Sep 13 12:24:02 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 13 12:24:02 2018 -0700" }, "message": "Merge \"Leave spaces between Operator name and Clock in StatusBar\"\nam: 375af769e6\n\nChange-Id: If2c314f7dc98ffe4d461c90263503e66f72ada48\n" }, { "commit": "375af769e60024aab97418daf11c3c63294678eb", "tree": "e840f9cf822df00abc12d5365bf0bf29143bc7d1", "parents": [ "82e3d2f066bf8656672713b08407a46c8f29813b", "52a11bbe15c8b0045d61fe088116464eaff2e9ac" ], "author": { "name": "Evan Laird", "email": "evanlaird@google.com", "time": "Thu Sep 13 17:24:09 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 13 17:24:09 2018 +0000" }, "message": "Merge \"Leave spaces between Operator name and Clock in StatusBar\"" }, { "commit": "52a11bbe15c8b0045d61fe088116464eaff2e9ac", "tree": "21c84fecb90556c86b913f9c142cd61e97dc6f1f", "parents": [ "08d7a208e8c8b6e23d7949d5ce9bc06cb5bea538" ], "author": { "name": "Shigeki Yokomichi", "email": "Shigeki.XA.Yokomichi@sony.com", "time": "Wed Apr 11 15:46:00 2018 +0900" }, "committer": { "name": "Henrik Baard", "email": "henrik.baard@sony.com", "time": "Thu Sep 13 11:39:30 2018 +0000" }, "message": "Leave spaces between Operator name and Clock in StatusBar\n\nIn StatusBar, there are no spaces between Operator name and Clock,\nso leaving spaces to improve design.\n\nBug: 114133664\nTest: Manual, enable operator name in status row\nconfig_showOperatorNameInStatusBar, insert sim card with operator name,\nwatch status row.\n\nChange-Id: I1a2e33436ed50d429ae4b1769d0a72d501233a22\n" }, { "commit": "befac9737144197bc7244f77796f15de544adb65", "tree": "dd076087b7c2ac7916c953f54a90846e82ba6aa7", "parents": [ "1a63bcc0a5c0f0714ba94ed9e04736f6f7b75e23", "e7f1dc66617ed694f6882a18353016bb33e163d3" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Sep 13 00:32:19 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 13 00:32:19 2018 -0700" }, "message": "Merge \"Remove the last of the ResolvUtil uses\"\nam: e7f1dc6661\n\nChange-Id: I5f05b3279278f350bd4491efcdb674189b70d99b\n" }, { "commit": "e7f1dc66617ed694f6882a18353016bb33e163d3", "tree": "01c85165598f5b09e56218eb67c00b382f767f93", "parents": [ "0dcc53fd5280cfccdd8cc7b39f743a30886520bd", "95999bda8d3d6928843f90023edcaefc140f0c81" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 13 06:39:16 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 13 06:39:16 2018 +0000" }, "message": "Merge \"Remove the last of the ResolvUtil uses\"" }, { "commit": "6b245cdff61003fbb582255014b663fe2a7c7c97", "tree": "4d2db6844e694c0f99cce383f7c66d550d9659a8", "parents": [ "731fd3c48c20335e8a384cb0be9ce5de976d893a", "57d9052ce8640d7201285bb61314044fde512701" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Sep 12 21:23:27 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 12 21:23:27 2018 -0700" }, "message": "Merge \"Simplify logic for connect in HfpClientProfile\"\nam: 57d9052ce8\n\nChange-Id: If8fed65f3e0760c4ba7e16908f3c720eefa60162\n" }, { "commit": "731fd3c48c20335e8a384cb0be9ce5de976d893a", "tree": "654361d9fed64124e2a3ab78cd3efa188d06b742", "parents": [ "624ccc333141685cd4e74d943518607da3e2f6f9", "eff45f36cfede21b5af177e874a4d1bbe1370ec3" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Sep 12 21:19:10 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 12 21:19:10 2018 -0700" }, "message": "Merge \"Simplify logic for connect in A2dpSinkProfile\"\nam: eff45f36cf\n\nChange-Id: I78762f35350b9d7ac567e46cd30c728de6782bf3\n" }, { "commit": "57d9052ce8640d7201285bb61314044fde512701", "tree": "b791247d534c26c4cf1fa0036b1fca6ba010c72b", "parents": [ "eff45f36cfede21b5af177e874a4d1bbe1370ec3", "b6e4b8ab58f8496c34a5906230f46174aa1d1df4" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 13 03:00:19 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 13 03:00:19 2018 +0000" }, "message": "Merge \"Simplify logic for connect in HfpClientProfile\"" }, { "commit": "eff45f36cfede21b5af177e874a4d1bbe1370ec3", "tree": "04c0d3bd3d5349fd62118d7e3658007189f82bd9", "parents": [ "b65aca27af54c430ba65867bcdbff02507091af6", "dcbc7def1f0d6804859009ac0dcb8f968def24c5" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 13 02:58:50 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 13 02:58:50 2018 +0000" }, "message": "Merge \"Simplify logic for connect in A2dpSinkProfile\"" }, { "commit": "b6e4b8ab58f8496c34a5906230f46174aa1d1df4", "tree": "f7931e761e349ca258cc6de795a59f566c182b40", "parents": [ "0890a2b51e2f618dca7d0085fc8bf6ded0684b01" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Sep 05 20:29:23 2018 +0800" }, "committer": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Sep 12 15:24:37 2018 +0800" }, "message": "Simplify logic for connect in HfpClientProfile\n\n* connect: remove connected device check logic.\n HeadsetClientStateMachine will check it.\n* Remove member variable V and related checks.\n* wrap if/else statement in curly brackets.\n* add robotest for HfpClientProfile.\n\nBug: 111812003\nTest: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER\u003dHfpClientProfileTest\nChange-Id: Ie36efd6d0a9f8e6501a3690b026ea4bd39744b5c\nMerged-In: Ie36efd6d0a9f8e6501a3690b026ea4bd39744b5c\n" }, { "commit": "dcbc7def1f0d6804859009ac0dcb8f968def24c5", "tree": "38eda6b68b951d527e8c8e59f2a548fcf41c1c63", "parents": [ "0890a2b51e2f618dca7d0085fc8bf6ded0684b01" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Sep 05 21:28:59 2018 +0800" }, "committer": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Sep 12 15:15:42 2018 +0800" }, "message": "Simplify logic for connect in A2dpSinkProfile\n\n* connect: remove connected device check logic. A2dpSinkService\n will check it.\n* Remove member variable V and related checks.\n* wrap if/else statement in curly brackets.\n* add robotest for A2dpSinkProfile.\n\nBug: 111812003\nTest: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER\u003dA2dpSinkProfileTest\nChange-Id: Ia0a118d73e5bb35ed3b2b75e67aeb98ae936981f\nMerged-In: Ia0a118d73e5bb35ed3b2b75e67aeb98ae936981f\n" }, { "commit": "95999bda8d3d6928843f90023edcaefc140f0c81", "tree": "1e5caef05d982fca22c73470535084a6d48e0ff2", "parents": [ "2a10846e04a0dbf20a95764abdcdbf193d2d204a" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Sep 12 14:37:11 2018 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Sep 12 14:58:58 2018 +0900" }, "message": "Remove the last of the ResolvUtil uses\n\nThis is the completion of cleanup work started in aosp/674269.\nConsequently, also remove ResolvUtil.\n\nTest: as follows\n - built, flashed, booted\n - runtest frameworks-net passes\n - presubmit\nBug: 64133961\nBug: 72345192\nBug: 73872000\nBug: 78548486\nChange-Id: I980f8a9b67f3f06f2d97a60f8e58e92c36316d40\n" }, { "commit": "e8997689881c9bf16a738b5d50d446b15a88c062", "tree": "acee1a3c5f5762f48b77cdc7051b1e1c7d6b5401", "parents": [ "98cd65e17f02c649bef6d7bc34fdbbf47a1cf139", "99c1ddc921060f54a7b4bcd7a4251b349daf2b8c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 11 22:02:49 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 11 22:02:49 2018 +0000" }, "message": "Merge \"DO NOT MERGE base: getDataUsageInfo get cycle validation\"" }, { "commit": "99c1ddc921060f54a7b4bcd7a4251b349daf2b8c", "tree": "060d27741486196b3c36edf0cf2d312f4eef6f59", "parents": [ "90d5e7b190e120efce0354e6170969f88d97a6b7" ], "author": { "name": "John Zhao", "email": "yuankuiz@qualcomm.corp-partner.google.com", "time": "Thu Sep 06 00:29:31 2018 +0800" }, "committer": { "name": "Fan Zhang", "email": "zhfan@google.com", "time": "Tue Sep 11 20:47:06 2018 +0000" }, "message": "DO NOT MERGE base: getDataUsageInfo get cycle validation\n\nWhen the DataUsageController calculate the DataUsageInfo\nbased on the cycle from NetworkPolicyManager, that cycle\nshould be not null. Otherwise, it couldn\u0027t be used to do\noperation like toInstant() directly.\n\nThe error could be got from logcat is as:\nE AndroidRuntime: Caused by: java.lang.NullPointerException:\nAttempt to invoke virtual method \u0027java.time.Instant\njava.time.ZonedDateTime.toInstant()\u0027 on a null object reference\n\nE AndroidRuntime: at com.android.settingslib.net.\nDataUsageController.getDataUsageInfo\n(DataUsageController.java:140)\n\nInside of the core/java/android/net/NetworkPolicyManager.java:\npublic static Iterator\u003cPair\u003cZonedDateTime, ZonedDateTime\u003e\u003e\n cycleIterator(NetworkPolicy policy) {\n... ...\nreturn Pair.create(null, null);\n... ...\n}\nThat should be avoided.\n\nConsidering it could be happened in the NetworkPolicyManager side,\nand it is reasonable if it did it, validating operation is better\nto be considered by any caller such as the DataUsageController.\n\nBug: 113952713\n\nTest: specify the hasNext to be false but the DataUsageController\ndon\u0027t crash.\n\nChange-Id: I2469c129a160e30615ea6011adf18688f951eac8\nSigned-off-by: John Zhao \u003cyuankuiz@qualcomm.corp-partner.google.com\u003e\n" }, { "commit": "14e10c3b10563e68030bba002f5ee948d3b0dc91", "tree": "c3f3f60e48ec32ce3e2e1d88cc11467d4d424b64", "parents": [ "b7a4e9cf2114f07d6395242d59a387b7df7c7554", "60ff003a9d988ba7459906b131fa5718b80dc093" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Sep 11 01:44:59 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 11 01:44:59 2018 -0700" }, "message": "Merge \"Remove services.net JAR dependency\"\nam: 60ff003a9d\n\nChange-Id: I8024f076ae6c74287d6de9e1354d43fee1ca96ee\n" }, { "commit": "88363e9b2f6e19dabda54a43e0fd7966646d7338", "tree": "64434f1dc39a131181c9cc4b310f3cb25b563914", "parents": [ "4be1419838d8e356f28d05c186b4ba4609dea8a3" ], "author": { "name": "yuanjiahsu", "email": "yuanjiahsu@google.com", "time": "Thu Sep 06 19:23:52 2018 +0800" }, "committer": { "name": "yuanjiahsu", "email": "yuanjiahsu@google.com", "time": "Tue Sep 11 15:04:51 2018 +0800" }, "message": "Add feature flag in Settings.\n\nUser can enable/disable faster emergency phone call feature by switching\nthis flag from Settings, and the old flag switched by adb command was\nreplaced by this feature flag.\n\nTest: Manually\nBug: 113539598\nChange-Id: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d\n" }, { "commit": "b1ac188be9fbbb494879bfa1c851da3b2a6b480c", "tree": "3f625a0b4d697c4311fb43475c4a64b6536c90d6", "parents": [ "666bb5cf28adbd207830fcddfa67d06d14a4001f" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Sep 11 14:59:08 2018 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Sep 11 14:59:16 2018 +0900" }, "message": "Remove services.net JAR dependency\n\nTest: as follows\n - built, flashed, booted\n - runtest frameworks-net passes\n - captive portal interaction works as expected in Private DNS\n strict mode\nBug: 64133961\nBug: 72345192\nBug: 73872000\nBug: 78548486\n\nMerged-In: Ia2ab2fb15e7898d99d30da20699e0bbd7a5a0964\nChange-Id: I290811305fd89a4fb5633b47173aaec28e9ed4b5\n" }, { "commit": "1b9458f0b7b4af49c04d10890fa2482bf397a6f4", "tree": "c230f9de78e09fa75c0b8e2f5e3b6eac0bcd5023", "parents": [ "f98d5cb38be0cfbd2cf1eec610e63fe1ec5602cc", "beeb35f0de469e6178050b058499075762ab5e5f" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Mon Sep 10 21:08:14 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 10 21:08:14 2018 -0700" }, "message": "Merge \"Simplify logic for disconnect and getConnectionStatus in MapProfile\"\nam: beeb35f0de\n\nChange-Id: Id3180db7835d637c352f795a52e4c59b3801714d\n" }, { "commit": "beeb35f0de469e6178050b058499075762ab5e5f", "tree": "cbb9cd780a125d7f1caf6a25041652413ccd5f74", "parents": [ "0890a2b51e2f618dca7d0085fc8bf6ded0684b01", "f5b1c1d045b77bc2ba00ecc3ca5e029388b7d8e9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 11 03:49:37 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 11 03:49:37 2018 +0000" }, "message": "Merge \"Simplify logic for disconnect and getConnectionStatus in MapProfile\"" }, { "commit": "f5b1c1d045b77bc2ba00ecc3ca5e029388b7d8e9", "tree": "9d4aaaa86869e063373bd724f903685452dd98d1", "parents": [ "90d5e7b190e120efce0354e6170969f88d97a6b7" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Sep 05 17:03:20 2018 +0800" }, "committer": { "name": "Chienyuan Huang", "email": "chienyuanhuang@google.com", "time": "Sun Sep 09 08:21:21 2018 +0000" }, "message": "Simplify logic for disconnect and getConnectionStatus in MapProfile\n\n* disconnect: remove connected device check logic. BluetoothMapService\n will check it.\n* getConnectionStatus: remove connected device check logic.\n BluetoothMapService will check it.\n* Rewrite the annotation about this class.\n* Remove member variable V and related checks.\n* wrap if/else statement in curly brackets.\n\nBug: 111812003\nTest: manual - disconnect MAP from Settings UI\nChange-Id: I2469821f0ae2e3f384844326b30c7d3c4c88ab63\n" }, { "commit": "f9a69e2d24c4d3e9d924dfee2857167fb3159918", "tree": "52b286c2e46776e78f3d3656d25d378126a649ec", "parents": [ "9b2f244bdad6470d250eac93f560f1fee8124c69" ], "author": { "name": "Shaotang Li", "email": "shaotangli@google.com", "time": "Wed Jul 04 14:18:40 2018 +0800" }, "committer": { "name": "Shaotang Li", "email": "shaotangli@google.com", "time": "Thu Sep 06 05:28:32 2018 +0000" }, "message": "Add extra data when starting emergency dialer intent\n\nThis data is used for emergency dialer metrics to determine where user\nenters emergency dialer.\n\nBug: 111378820\nTest: manual\nChange-Id: Id2b6ea71d32ccfb913c84b3c44cc4752acb6fd99\nMerged-In: Id2b6ea71d32ccfb913c84b3c44cc4752acb6fd99\n" }, { "commit": "460a52947192febdf99f37cb761710a46c63fd46", "tree": "0cbac06627b95c5117a671b2dcbedfe5ff129a0e", "parents": [ "024387744a544bb7c4fc14c60b53969cf2ca449f", "b7a11d37488ea539bb168bcaa80c7a8b9388a661" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 05 23:03:36 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 05 23:03:36 2018 +0000" }, "message": "Merge \"Add process-lifecycle-owner-initializer to tests.\"" }, { "commit": "ef98a2ca1ca8fc1cf0dd2f8a7d098f4c00917be4", "tree": "8c0b21f06bce74a6c6c7f89b6ac3745d9100830e", "parents": [ "0b8f17b3ba65d9c8c59600eaa2b0e30dc032e91f", "2c3a8045cda7de035e438026fc6376b322e705ff" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 05 22:42:52 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 05 22:42:52 2018 +0000" }, "message": "Merge changes I7f1ef2e8,I498bc261\n\n* changes:\n Convert sysui to bp\n Cleanup trying to move to bp\n" }, { "commit": "b7a11d37488ea539bb168bcaa80c7a8b9388a661", "tree": "1e2b324ae02e0c15b22a9180d406ea342bb0de90", "parents": [ "2c3a8045cda7de035e438026fc6376b322e705ff" ], "author": { "name": "Alison Cichowlas", "email": "asc@google.com", "time": "Tue Aug 14 13:19:25 2018 -0400" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Sep 05 13:57:10 2018 -0700" }, "message": "Add process-lifecycle-owner-initializer to tests.\n\nBug: 112587252\nBug: 114073652\nTest: This is to fix the tests.\nChange-Id: I083db4e2eb4efd8d4a914f33ac259aa317e568de\nMerged-In: I083db4e2eb4efd8d4a914f33ac259aa317e568de\n(cherry picked from commit 5f5ad2e6274f28772d70de0a97301fd17ab7f4d3)\n(cherry picked from commit 0757deaad67bfa7d09e210566fdc7638fd8b8e3f)\n" }, { "commit": "2c3a8045cda7de035e438026fc6376b322e705ff", "tree": "1d7ee676bbe88318269c6a97bf4a4e9d5971ae0e", "parents": [ "4a8305dca62a622f7eabd5465503def5794a93e1" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Mon Aug 13 11:10:48 2018 -0400" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Sep 05 13:57:10 2018 -0700" }, "message": "Convert sysui to bp\n\nTest: tests gonna test, builds gonna build\nChange-Id: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264\nMerged-In: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264\n(cherry picked from commit a2f2d82f2698ca4d9fcfad2a94b5b683646c085d)\n(cherry picked from commit 1a8ee9d2f9bda161301469488d9a27baf5398233)\n(cherry picked from commit 83ce30d807c3621f47f753e75f41d2b887e3ccba)\n" }, { "commit": "4a8305dca62a622f7eabd5465503def5794a93e1", "tree": "f8b74fb3617cf456175eeb2f20e3d69e88d72730", "parents": [ "154519eb527abe8fe0bbcc976f94bd6286ccc82f" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Thu Aug 09 09:38:21 2018 -0400" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Sep 05 13:57:09 2018 -0700" }, "message": "Cleanup trying to move to bp\n\n - Remove some resources that don\u0027t appear to do anything\n - Don\u0027t assume resource ids are final, because they aren\u0027t when\n compiled as a library\n\nTest: build\nChange-Id: I498bc2612d3f47df5f567c18c29e1666431e971c\nMerged-In: I498bc2612d3f47df5f567c18c29e1666431e971c\n(cherry picked from commit 05dd5671720985c03f35ec476591fb0d8399a018)\n(cherry picked from commit a9b2fcad7a1ba9b5a459f46cc40504c7ea4fe590)\n(cherry picked from commit 4c9d66e56cc8c324c2dc87f75e6338b7464d6eaf)\n" }, { "commit": "0757deaad67bfa7d09e210566fdc7638fd8b8e3f", "tree": "a24920590a97cbc1452da7c9538f1263a01ba6a5", "parents": [ "83ce30d807c3621f47f753e75f41d2b887e3ccba" ], "author": { "name": "Alison Cichowlas", "email": "asc@google.com", "time": "Tue Aug 14 13:19:25 2018 -0400" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Sep 05 19:57:24 2018 +0000" }, "message": "Add process-lifecycle-owner-initializer to tests.\n\nBug: 112587252\nBug: 114073652\nTest: This is to fix the tests.\nChange-Id: I083db4e2eb4efd8d4a914f33ac259aa317e568de\nMerged-In: I083db4e2eb4efd8d4a914f33ac259aa317e568de\n(cherry picked from commit 5f5ad2e6274f28772d70de0a97301fd17ab7f4d3)\n" }, { "commit": "83ce30d807c3621f47f753e75f41d2b887e3ccba", "tree": "769d2d0295ec67fae21e8a11d7adaf82f3067c74", "parents": [ "4c9d66e56cc8c324c2dc87f75e6338b7464d6eaf" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Mon Aug 13 11:10:48 2018 -0400" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Sep 05 12:50:09 2018 -0700" }, "message": "Convert sysui to bp\n\nTest: tests gonna test, builds gonna build\nChange-Id: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264\nMerged-In: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264\n(cherry picked from commit a2f2d82f2698ca4d9fcfad2a94b5b683646c085d)\n(cherry picked from commit 1a8ee9d2f9bda161301469488d9a27baf5398233)\n" }, { "commit": "4c9d66e56cc8c324c2dc87f75e6338b7464d6eaf", "tree": "abeddf2905ba9cd1fe6dc12e78f87ac3f3eb9527", "parents": [ "6547dad5ac0ca56c99128d007b8d9ce419e82cc0" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Thu Aug 09 09:38:21 2018 -0400" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Sep 05 19:48:27 2018 +0000" }, "message": "Cleanup trying to move to bp\n\n - Remove some resources that don\u0027t appear to do anything\n - Don\u0027t assume resource ids are final, because they aren\u0027t when\n compiled as a library\n\nTest: build\nChange-Id: I498bc2612d3f47df5f567c18c29e1666431e971c\nMerged-In: I498bc2612d3f47df5f567c18c29e1666431e971c\n(cherry picked from commit 05dd5671720985c03f35ec476591fb0d8399a018)\n(cherry picked from commit a9b2fcad7a1ba9b5a459f46cc40504c7ea4fe590)\n" }, { "commit": "09c5a1d2089ea3a8ea105a588138d67ed5050fb8", "tree": "66da541ba450bf14dcc11f79ac73f4af9b590a25", "parents": [ "e310df92db135b5505674976c93333ea8870fbe6" ], "author": { "name": "Fan Zhang", "email": "zhfan@google.com", "time": "Tue Sep 04 13:56:51 2018 -0700" }, "committer": { "name": "Fan Zhang", "email": "zhfan@google.com", "time": "Tue Sep 04 13:57:29 2018 -0700" }, "message": "DO NOT MERGE: Reordered imports according to Android style.\n\nTest: rebuild\nChange-Id: I7b1ad77039868c6a827478fbbb32e0fd5c9a29cf\n" }, { "commit": "474e4f31638124f09df248695a5607beb10e528c", "tree": "41f98149e8d684de4228feb7053a9efb51690d30", "parents": [ "9cc6c2aa2ec1acced50bbea1f288537b32aad798", "7aae482135b6a1c2feecd4dba5395ec88879344a" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Aug 29 19:16:13 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 29 19:16:13 2018 -0700" }, "message": "Merge \"Simply logic for connect and disconnect in HeadsetProfile\"\nam: 7aae482135\n\nChange-Id: I59e9d745d64f20e84dd888f3981290b9296f4815\n" }, { "commit": "9cc6c2aa2ec1acced50bbea1f288537b32aad798", "tree": "d9f67f77062c3bcedd58f8e0672148bf98770215", "parents": [ "93518497b11c788007c835227c45bea876e3fd22", "8593fc6c064b6ddd15eb77605605ccc07266c6f8" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Aug 29 19:12:37 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 29 19:12:37 2018 -0700" }, "message": "Merge \"Remove connected device check logic in getConnectionState\"\nam: 8593fc6c06\n\nChange-Id: I86b30d27d3d7ab35473e8710b100e5730dfa12a4\n" }, { "commit": "7aae482135b6a1c2feecd4dba5395ec88879344a", "tree": "4f52fb4e3f2e3842747c496848719632941a38d1", "parents": [ "8593fc6c064b6ddd15eb77605605ccc07266c6f8", "edd44ec29279c34f2f730a0c2cc57e24ec1bae45" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 30 01:55:56 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 30 01:55:56 2018 +0000" }, "message": "Merge \"Simply logic for connect and disconnect in HeadsetProfile\"" }, { "commit": "8593fc6c064b6ddd15eb77605605ccc07266c6f8", "tree": "1369ac481b215c46c78774be4b96f535327fdaf5", "parents": [ "adbe45e0cabf543f55b54214756ac739f21e5cb6", "c129df807f1a5a2e2747b99fc224bbd41e93faf2" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 30 01:55:27 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 30 01:55:27 2018 +0000" }, "message": "Merge \"Remove connected device check logic in getConnectionState\"" }, { "commit": "cdf75c3cc82c8a3ea431f7d5b0c117601a8e6a33", "tree": "3f78010e3f52fda57bd1ee4785e0ba9c00896fff", "parents": [ "13d6540956bc0aff2e08b785d90ad3c91d81663d", "ec8d258c608e074a7c1e4ed81a9d38be1b16be7e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 29 18:31:09 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 29 18:31:09 2018 +0000" }, "message": "Merge changes from topic \"androidx-settings-aosp\"\n\n* changes:\n Migrated various apps under frameworks/base/packages/Shell to androidx\n Migrated SystemUI \u0026 SettingsLib to androidx\n" }, { "commit": "c129df807f1a5a2e2747b99fc224bbd41e93faf2", "tree": "d8d6d3f2b684e79fbe9e8517823d7ed34ace80cd", "parents": [ "c96760f4f30279bdddcbdc83398bc069740970f1" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Aug 29 23:14:55 2018 +0800" }, "committer": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Aug 29 23:14:55 2018 +0800" }, "message": "Remove connected device check logic in getConnectionState\n\nFrom current code, it will check if the device connected before\ngetConnectionState. We can remove this check logic because\nHidHostService will do it.\n\nBug: 111812003\nTest: manual - connect/disconnect HID keyborad from Settings UI\nChange-Id: Ib512b3f15109b6f4cacf1f1c517b69d17ddd5ac4\n" }, { "commit": "edd44ec29279c34f2f730a0c2cc57e24ec1bae45", "tree": "5efa04dd82ebdd3060f6dacd02289d62a334f70b", "parents": [ "c96760f4f30279bdddcbdc83398bc069740970f1" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Tue Aug 21 19:13:05 2018 +0800" }, "committer": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Wed Aug 29 20:40:06 2018 +0800" }, "message": "Simply logic for connect and disconnect in HeadsetProfile\n\n* connect: remove debug log of connect connected device. HeadsetService\n will check it and print related log.\n* disconnect: remove connected device check logic. HeadsetService will\n check it.\n* getConnectionStatus: remove connected device check logic.\n HeadsetService will check it.\n* wrap if/else statement in curly brackets.\n\nBug: 111812003\nTest: manual - connect/disconnect headset from Settings UI\n\nChange-Id: I2c58362c236a26b38c8aa67eb3a3433d76f97e45\n" }, { "commit": "ccbda28785e172f43f7c33bab3720d872e80a22e", "tree": "370932364313a773367a4f7b5c0f0fd97106f486", "parents": [ "ccf3aebc412c7bbacfd900faf47661a9791bef08", "17115bdb02c8b590f3317225ae8adcbc24e3da1f" ], "author": { "name": "Dario Freni", "email": "dariofreni@google.com", "time": "Wed Aug 29 02:31:34 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 29 02:31:34 2018 -0700" }, "message": "Merge \"Include NOTICE from /product and /product_services\"\nam: 17115bdb02\n\nChange-Id: Iba47449f44e8ad4ef17f8b4c5bfb1b713e12a7da\n" }, { "commit": "17115bdb02c8b590f3317225ae8adcbc24e3da1f", "tree": "0a51484934908a3c18b66784b274632e66401cd7", "parents": [ "0c7343ccd70e4deb53de030bc1ef96f1de9badb8", "a1766a1b2d2c2a826d6c204205233ba3ae30a54e" ], "author": { "name": "Dario Freni", "email": "dariofreni@google.com", "time": "Wed Aug 29 09:12:52 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 29 09:12:52 2018 +0000" }, "message": "Merge \"Include NOTICE from /product and /product_services\"" }, { "commit": "0bd9ac4b69af6e854c084c7be3fb398927306df2", "tree": "5fa323f7fd6abc0b7083280815e7586f8bf13717", "parents": [ "1ed3e96ea7a0cba2dff4727d8f7bac999939d89f", "0e1621296fdb09f3ffaaf69e77728663b0943953" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Aug 28 20:12:49 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 28 20:12:49 2018 -0700" }, "message": "Merge \"Remove ResolveUtil from frameworks/base callers\"\nam: 0e1621296f\n\nChange-Id: Ibc885ccd9531706df029154f7ec4fde71bf600d1\n" }, { "commit": "0e1621296fdb09f3ffaaf69e77728663b0943953", "tree": "d71e2f1947e735d519ad40fe26e3df486a2994c5", "parents": [ "c96760f4f30279bdddcbdc83398bc069740970f1", "f4fa98233990bc078caa6cc005b893896b1e3db3" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 29 02:58:08 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 29 02:58:08 2018 +0000" }, "message": "Merge \"Remove ResolveUtil from frameworks/base callers\"" }, { "commit": "ec8d258c608e074a7c1e4ed81a9d38be1b16be7e", "tree": "85e176ea3c685a3cb046db4f70a6b60f962e6be3", "parents": [ "b8616dc4d19d5a719ca705d8bd6e96140933a1a0" ], "author": { "name": "KOUSHIK PANUGANTI", "email": "kpanuganti@google.com", "time": "Mon Apr 23 17:31:10 2018 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Aug 28 14:20:24 2018 -0700" }, "message": "Migrated various apps under frameworks/base/packages/Shell to androidx\n\nBug: 76692459\nTest: make Shell\nChange-Id: If11159cac1bd5aa61c46a346647b97a661abbf11\nMerged-In: If11159cac1bd5aa61c46a346647b97a661abbf11\n(cherry picked from commit e92135a6e9e3bae6236063d35670f3f7f2f51be4)\n(cherry picked from commit 474df059db94fac9a279e5f90ab0c046de4a3e08)\n(cherry picked from commit e0efaddbebaf9cdabe4253d7f3cfdf87dc9a7446)\n" }, { "commit": "b8616dc4d19d5a719ca705d8bd6e96140933a1a0", "tree": "737c5e2e07936e6e1198c7c18b1c1bc553fb36a7", "parents": [ "46e75a69e87c6a8afe50582cb364162d75676a75" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Apr 17 09:50:46 2018 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Aug 28 14:19:51 2018 -0700" }, "message": "Migrated SystemUI \u0026 SettingsLib to androidx\n\nTest: make SystemUI SettingsLib\nBug:76692459\nChange-Id: I248fdf4042a0a97bc6349091da21c936c2d37c95\nMerged-In: I248fdf4042a0a97bc6349091da21c936c2d37c95\n(cherry picked from commit fd52c1433c4e4d3f53aef2454d03f6b58f2411a3)\n(cherry picked from commit d366771e84f584330c21b6381c902518af110034)\n(cherry picked from commit a14377a450a7172963ab7ec1b3e47444a3249216)\n" }, { "commit": "5b02a3306977a3f6ee25464078a71306f0098845", "tree": "d6cc83dcb2440e1c83d61c0865395db59128ada2", "parents": [ "20cc0ef0481f9b5dffa348cc23301509f7e2a8bd" ], "author": { "name": "hjchangliao", "email": "hjchangliao@google.com", "time": "Thu Apr 26 15:12:11 2018 +0800" }, "committer": { "name": "Fan Zhang", "email": "zhfan@google.com", "time": "Tue Aug 28 12:38:44 2018 -0700" }, "message": "DO NOT MERGE: Cherry-pick misc fixes to AOSP\n\nRemove wrapper for BluetoothA2dp\n\nRemove BluetoothA2dpWrapper,\nUse BluetoothA2dp to replace all of them.\n\nBug: 76167422\nTest: RunSettingsLibRoboTests\n\nRemove wrapper for LocationManager\n\nRemove LocationManagerWrapper from SettingsLib\n\nBug: 76167422\nTest: RunSettingsLibRoboTests\n" }, { "commit": "e0efaddbebaf9cdabe4253d7f3cfdf87dc9a7446", "tree": "cd7062fdb326a2d2f348eeeddd9acd978a16ebed", "parents": [ "a14377a450a7172963ab7ec1b3e47444a3249216" ], "author": { "name": "KOUSHIK PANUGANTI", "email": "kpanuganti@google.com", "time": "Mon Apr 23 17:31:10 2018 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Aug 28 11:51:32 2018 -0700" }, "message": "Migrated various apps under frameworks/base/packages/Shell to androidx\n\nBug: 76692459\nTest: make Shell\nChange-Id: If11159cac1bd5aa61c46a346647b97a661abbf11\nMerged-In: If11159cac1bd5aa61c46a346647b97a661abbf11\n(cherry picked from commit e92135a6e9e3bae6236063d35670f3f7f2f51be4)\n(cherry picked from commit 474df059db94fac9a279e5f90ab0c046de4a3e08)\n" } ], "next": "a14377a450a7172963ab7ec1b3e47444a3249216" }