)]}' { "log": [ { "commit": "84c6684bba418c1e902e3bb57c61908ba1a99d6c", "tree": "440412eaf90f8506a44b5a4b00b80b32a8be2eee", "parents": [ "94e56bc598fe74ea7113199778830186443de850", "17bebd2fd7d3af0bc648172da6ae36f8b55ad7af" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Jul 21 17:14:30 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 21 17:14:30 2017 +0000" }, "message": "Merge \"Expose SubscriptionPlan API.\" into oc-mr1-dev" }, { "commit": "d57fcca82343d276e9d35e86bd7039f19db819a1", "tree": "95e326c623279c62d96ddca6338becb3d2accf02", "parents": [ "0d7ff5328e15a1de752dcb483f9aca0e55a44118", "37a9991be98d7e5c9ab4ba102c4d29845fa94152" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Thu Jul 20 20:59:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 20:59:52 2017 +0000" }, "message": "Merge \"Add new column user_editable to Carriers table in telephony db.\" into oc-dr1-dev\nam: 37a9991be9\n\nChange-Id: I5b5499ed9528aab6718ffe325afe8f51265fd548\n" }, { "commit": "17bebd2fd7d3af0bc648172da6ae36f8b55ad7af", "tree": "8dbeea0ca5a636470cf1084a6b20acf6e71e28bc", "parents": [ "747938ed617afc89886631aede7470f66bd43465" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 19 21:00:38 2017 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Jul 20 14:55:57 2017 -0600" }, "message": "Expose SubscriptionPlan API.\n\nClean up SubscriptionPlan, add docs, and expose as public API.\n\nDeprecate older constants in CarrierConfigManager, and point users\ntowards new API. (The goal of CarrierConfigManager is to express\nkey/value pairs that are identical for all users on a particular\ncarrier, not to configure details that vary between users.)\n\nSince a CarrierService may itself not have access to the plan\ndetails, allow them to \"delegate\" the capability to configure plans\nto another package name.\n\nFactor out new RecurrenceRule class which is used by both\nNetworkPolicy and SubscriptionPlan internally. Polish it to support\narbitrary periods, and continue to test it through NPMST.\n\nBug: 63391323\nTest: bit FrameworksCoreTests:android.util.RecurrenceRuleTest\nTest: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest\nExempt-From-Owner-Approval: Bug 63673347\nChange-Id: I93fae4a43e58e9e4c32f8bf345a257dcd607f088\n" }, { "commit": "37a9991be98d7e5c9ab4ba102c4d29845fa94152", "tree": "ab008f9422b7492b9add2b307729f1eb6c60803e", "parents": [ "2ed613ca80f833df14c9a42c2dbe48d800c4eb5d", "d4977949346862bb42efa14be5171bf222d057d4" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Thu Jul 20 20:47:17 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 20 20:47:17 2017 +0000" }, "message": "Merge \"Add new column user_editable to Carriers table in telephony db.\" into oc-dr1-dev" }, { "commit": "bfa50d4852037787569fd16bb217b7595cbb403f", "tree": "d5e3afe1565fd1b75607dc34163397212598cb75", "parents": [ "2b594992635b94332a5e541c335d27af51401bb0", "7acfec846b7e11b3a72787df0b815d40d78328cd" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Jul 20 00:49:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 00:49:58 2017 +0000" }, "message": "Merge \"Add details to Download progress callback\" am: b440b572d7 am: 5f047a68d9 am: 12286b2608\nam: 7acfec846b\n\nChange-Id: If16b8c107d39c5791ea8c3b3b28afd4f37500b44\n" }, { "commit": "7acfec846b7e11b3a72787df0b815d40d78328cd", "tree": "5853d88ef8c3b7d8af6cec7bc55b21d41281fb77", "parents": [ "4dec845d52fc676eda9808c082ca7b0e53d439b3", "12286b2608f69c3911c40f4dc2a070097373b73f" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Jul 20 00:42:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 00:42:21 2017 +0000" }, "message": "Merge \"Add details to Download progress callback\" am: b440b572d7 am: 5f047a68d9\nam: 12286b2608\n\nChange-Id: Iff3707dab4ee737e5de2b1b8bded811f919553a8\n" }, { "commit": "5f047a68d96f252772144a729f423c172ce816e4", "tree": "575a928c636e847c26916d83649ef5d9d4fac70a", "parents": [ "5af59940d17cf20174865ac0aaf52c3b4d962a64", "b440b572d78d7cfc8a03030913465daac26bebad" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Jul 20 00:30:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 00:30:50 2017 +0000" }, "message": "Merge \"Add details to Download progress callback\"\nam: b440b572d7\n\nChange-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011\n" }, { "commit": "5263ad6f8ae1922b5d2066b15a0a7f0d67e4b88f", "tree": "e4c0595c02bac5e303248c58eb3049ecde0271be", "parents": [ "2b8d44f907d92941b74d12c3abf7a41e8eff893d", "89234305b20551068a88866d802e8ebd63f8b0e7" ], "author": { "name": "Ta-wei Yen", "email": "twyen@google.com", "time": "Thu Jul 20 00:19:37 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 20 00:19:37 2017 +0000" }, "message": "Merge \"Make EXTRA_IS_REFRESH for voicemail notification public\"" }, { "commit": "0ebff46583de6e77b80bd0cd282d7a6ba0074f96", "tree": "1f5b41fceb86df7bcdcd924d15314f9c3129aa78", "parents": [ "1585b2e7b75d2e1358cc0069f9fe7bcbb2f88417" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Jun 16 17:37:20 2017 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Wed Jul 19 15:02:29 2017 -0700" }, "message": "Add details to Download progress callback\n\nSplit decode into max size and current size.\n\nTest: builds\nChange-Id: Ice18d7f0e9ae99b3c24fe10843da80abd0d912d7\n" }, { "commit": "4595ad22fb4e925a8b2ee7e4dd62145e90458824", "tree": "a25919d069406f050721017c94db0894f4f2ab7c", "parents": [ "17b3bdc6acef600eb56e904c60d3b2fdf83aea42", "47208e2cf51bb12691f422b21c08462d962c0cbb" ], "author": { "name": "Chen Xu", "email": "fionaxu@google.com", "time": "Wed Jul 19 03:17:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 03:17:53 2017 +0000" }, "message": "Merge \"initial value for data_roaming based on carrier\" into oc-dr1-dev am: 068397a319\nam: 47208e2cf5\n\nChange-Id: I3d2af92b69f3a5736323900c27dcecc096eb1ab7\n" }, { "commit": "47208e2cf51bb12691f422b21c08462d962c0cbb", "tree": "cfdb3843cf986f5254167078cdee0fec5bcaaed1", "parents": [ "8e9b7efefd6f55b9e8aa46394aa154a328ff5406", "068397a31905da4182d0ac0d5fc4883ed77405b2" ], "author": { "name": "Chen Xu", "email": "fionaxu@google.com", "time": "Wed Jul 19 03:12:33 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 03:12:33 2017 +0000" }, "message": "Merge \"initial value for data_roaming based on carrier\" into oc-dr1-dev\nam: 068397a319\n\nChange-Id: I5c65666208e834a5b0ad5280f1670a0d7b31aa31\n" }, { "commit": "068397a31905da4182d0ac0d5fc4883ed77405b2", "tree": "5168ed7a844b7306792028704108ed9d92752893", "parents": [ "cbc1e6afe9a2f5600d2d01ec2ec77cdaa1990071", "7834be2a3cb6a8738c81c0d68b98da2a055bcca3" ], "author": { "name": "Chen Xu", "email": "fionaxu@google.com", "time": "Wed Jul 19 03:06:01 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 19 03:06:01 2017 +0000" }, "message": "Merge \"initial value for data_roaming based on carrier\" into oc-dr1-dev" }, { "commit": "89234305b20551068a88866d802e8ebd63f8b0e7", "tree": "71a7060aa7dd1d4cd6b0cf77fedbfb15de26b744", "parents": [ "3698fc8ea6254c18a87fa6bb5cf459c04c7bcf68" ], "author": { "name": "Ta-wei Yen", "email": "twyen@google.com", "time": "Tue Jul 18 17:30:35 2017 -0700" }, "committer": { "name": "Ta-wei Yen", "email": "twyen@google.com", "time": "Tue Jul 18 17:35:36 2017 -0700" }, "message": "Make EXTRA_IS_REFRESH for voicemail notification public\n\nThis extra is added in ag/2333070 to let the dialer know if a\nnotification should be silent since the user has alread been notified\n\nChange-Id: Ib2b4ab4cfa1c4baaef4eceb6fa1dab6a8fcfb84d\nFixes: 62202833\nTest: manual - leave voicemail, toggle airplane mode.\n" }, { "commit": "7834be2a3cb6a8738c81c0d68b98da2a055bcca3", "tree": "c7352eeee0a523cefd821b74e42664a3962846ae", "parents": [ "e72ec3cab2dbc1ca1b521a1171813e019432f3bc" ], "author": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Thu Jun 22 18:14:23 2017 -0700" }, "committer": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Tue Jul 18 17:32:52 2017 -0700" }, "message": "initial value for data_roaming based on carrier\n\n1. new carrier config for default data roaming value\nto support carrier specific feature: turn on data_roaming by default.\n\nBug: 36193933\nTest: manual test\nChange-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3\n" }, { "commit": "d4977949346862bb42efa14be5171bf222d057d4", "tree": "257a94493b169186131b11d7543efd6def8384ca", "parents": [ "c393be76d9550e143963e3fef1a6c47a004a5c16" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Mon Jul 17 14:46:39 2017 -0700" }, "committer": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Tue Jul 18 16:58:52 2017 +0000" }, "message": "Add new column user_editable to Carriers table in telephony db.\n\nTest: Verified manually that an APN with user_editable\u003dfalse cannot be\nmodified via UI\nBug: 62852457\nChange-Id: I67f1c5c537978d54aeea0a726d4056593381aa2d\n" }, { "commit": "42b4446b0eeb60e01db8174f6e286742a7357ba1", "tree": "f01d32f91bea1069cec7479df1893a85beec906d", "parents": [ "06820aa04a4a87bcbad0d37d6f1be9ac832a3ed4", "53313d7e8153982f842910118371e1dc061248cd" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jul 15 19:57:08 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jul 15 19:57:08 2017 +0000" }, "message": "Merge \"Iterate NetworkPolicy towards SubscriptionPlan.\"" }, { "commit": "53313d7e8153982f842910118371e1dc061248cd", "tree": "01f69d857d3abc6915b7d4b9daf1379abf303732", "parents": [ "43d2a1700b6eb1d804924c6a1e5e0161a13a5348" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Jul 13 16:47:32 2017 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Jul 14 16:18:40 2017 -0600" }, "message": "Iterate NetworkPolicy towards SubscriptionPlan.\n\nAdd new SubscriptionPlan API to describe the various types of carrier\ndata plans. Internally the OS will only use the first plan for\ndriving policy, but it will blindly plumb through the details for\nSettings to display any secondary plans.\n\nAs part of getting Settings ready to roll towards SubscriptionPlan,\nreduce references to NetworkPolicy internal fields. All usage cycle\ndetails are now obtained from an Iterator which converts to\nSubscriptionPlan under the hood.\n\nReplace all data usage cycle calculation with new SubscriptionPlan\nimplementation, and retrofit large suite of existing tests to\nexercise and verify the new logic.\n\nOffer a debugging property that can be used to return \"fake\" plan\nexamples for testing.\n\nBug: 63391323\nTest: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest\nExempt-From-Owner-Approval: Bug 63673347\nChange-Id: I889c653980eeb7887abdfa4f5b6986f35855ee6d\n" }, { "commit": "7e15c580852a1f18614396bc0f85f8e04d737d19", "tree": "8361bb22ad2aa26bf8ac3b8acbcc68a901899c3c", "parents": [ "7b8d8578de8846da89378735ca88d716bfd162e3", "b78661052c440067a67d73486c066b82b6326098" ], "author": { "name": "Naveen Kalla", "email": "mrnaveen@google.com", "time": "Thu Jul 13 20:43:21 2017 -0700" }, "committer": { "name": "Naveen Kalla", "email": "mrnaveen@google.com", "time": "Thu Jul 13 20:49:08 2017 -0700" }, "message": "resolve merge conflicts of b78661052c44 to oc-dr1-dev-plus-aosp\n\nBug: 62933474\nTest: Build\nChange-Id: I5728fd9175cc23ec8ef62c0b645cbb3505fb76e3\nMerged-In: If2b62b8148ba23840a4c018341e0fed24b41944b\n" }, { "commit": "4622acb95060b472e74b206199ea63264f0b41af", "tree": "25950c6310eba2199ceeeef1a872289cdf6800c2", "parents": [ "d7fad0e1cebbb6c352082ea911a85ade2adba833", "7b8d8578de8846da89378735ca88d716bfd162e3" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jul 14 03:01:09 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 03:01:09 2017 +0000" }, "message": "Merge \"Clean up streaming API docs and organize errors\" am: d2c8dcfcfe am: d98024a1f9 am: f83fb827a7\nam: 7b8d8578de\n\nChange-Id: Iea8b54a10778494a0aee969ebf70fdc4e5e86cf7\n" }, { "commit": "7b8d8578de8846da89378735ca88d716bfd162e3", "tree": "e18c658c2b5806e6af6a5c4003b35927d689c4ea", "parents": [ "041111ff7e6157c153f186de49c4eb17f55e3c21", "f83fb827a7b78de25ac0d5a25fcf3e9559d17901" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jul 14 02:54:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 02:54:29 2017 +0000" }, "message": "Merge \"Clean up streaming API docs and organize errors\" am: d2c8dcfcfe am: d98024a1f9\nam: f83fb827a7\n\nChange-Id: I90910fd62a74d7518d69c409eeb6cc8f4a7bb6f2\n" }, { "commit": "d98024a1f9acfb2ba342a42300fda24e2bcff47f", "tree": "49d797f712602c8df5991672a97c3ecfde9fe8bf", "parents": [ "a428392c1ddb93cabf0186ea0507b1fbc5254c60", "d2c8dcfcfe4cdc4fb4d3d86a8a7e6e7d43fdd9c0" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jul 14 02:43:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 02:43:10 2017 +0000" }, "message": "Merge \"Clean up streaming API docs and organize errors\"\nam: d2c8dcfcfe\n\nChange-Id: I9d77d7dbc3c53baaa0ce4928de3bcbe353c1f6ab\n" }, { "commit": "f9dd150ea601e8ba234a4ea21fcdc10ebbbaef84", "tree": "afe15ac646ebf739564f73a27746972b9264858b", "parents": [ "9522e0c53fc1e68f8e3a44c17c74c739279f1fef", "4ca9d2ee0e798f704e5f8c0ff32703d855d91c0d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 14 00:31:29 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 14 00:31:29 2017 +0000" }, "message": "Merge \"Convert CDMA caller ID codes while roaming on 3GPP networks\"" }, { "commit": "4ca9d2ee0e798f704e5f8c0ff32703d855d91c0d", "tree": "a5893ea38a8f3d93c8057de1ba4da27c5b7c1051", "parents": [ "f34c6d9cc12c2fe23b7bf9ce33502ad46005f5c1" ], "author": { "name": "Naveen Kalla", "email": "mrnaveen@google.com", "time": "Tue Jul 11 20:03:58 2017 -0700" }, "committer": { "name": "Naveen Kalla", "email": "mrnaveen@google.com", "time": "Thu Jul 13 15:27:33 2017 -0700" }, "message": "Convert CDMA caller ID codes while roaming on 3GPP networks\n\nConvert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA\ndevice is roaming on a 3GPP network. Use a Carrier Config\nto control this feature.\n\nBug: 62933474\nTest: Simulate Roaming scenario and ensure that the dial\n string is converted as expected.\n\nChange-Id: If2b62b8148ba23840a4c018341e0fed24b41944b\n" }, { "commit": "abd2842ce131818652884c3a2f5924218e07730c", "tree": "eefc8f4f361bb4a9c05dfe92b6e09fe7d5c9cd36", "parents": [ "c8c121757e74596004e5748d13d7ceb2bf570830" ], "author": { "name": "Naveen Kalla", "email": "mrnaveen@google.com", "time": "Tue Jul 11 20:03:58 2017 -0700" }, "committer": { "name": "Naveen Kalla", "email": "mrnaveen@google.com", "time": "Thu Jul 13 15:08:51 2017 -0700" }, "message": "Convert CDMA caller ID codes while roaming on 3GPP networks\n\nConvert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA\ndevice is roaming on a 3GPP network. Use a Carrier Config\nto control this feature.\n\nBug: 62933474\nTest: Simulate Roaming scenario and ensure that the dial\n string is converted as expected.\n\nChange-Id: If2b62b8148ba23840a4c018341e0fed24b41944b\nMerged-In: If2b62b8148ba23840a4c018341e0fed24b41944b\n" }, { "commit": "19b49f6c3ca051f91243c290e7868f7e83ba7005", "tree": "a8a6df3ad6306a41689c75ea66cf9653b2c37407", "parents": [ "1ecf426f08aae8c98cc618763f16266feb8a3f7b", "81d9c6fe71ce2685fed7f30a66090a3c9752c5da" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jul 12 23:57:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 23:57:21 2017 +0000" }, "message": "Merge \"Implement getDownloadStatus and add permission\" am: 2fa880d016 am: d45a007222 am: 9888af1dfc\nam: 81d9c6fe71\n\nChange-Id: Ida7f8cfd440553658108688b84f866dddafa3166\n" }, { "commit": "46cbcd1b4a02cca1bbe092875d3ea9d1ce5a7caa", "tree": "365a7012d996d2d8524df4a35cbfc2e49bce6486", "parents": [ "55f557dc7c1622ec757f7f47d469f742148814a8" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jul 07 13:33:16 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jul 12 16:53:12 2017 -0700" }, "message": "Clean up streaming API docs and organize errors\n\n* Implement listPendingDownloads and resetDownloadKnowledge\n* Bring MbmsStreamingManager docs in line with vendor-side API docs.\n* Remove activeStreamingServicesUpdated\n* Reorganize the errors in MbmsException into categories.\n* Add some vendor API docs for file-download\n\nChange-Id: Ia29066ea6f2c0414171cffa1ae11bb467f187bee\n" }, { "commit": "81d9c6fe71ce2685fed7f30a66090a3c9752c5da", "tree": "17996ca991ed5d4a1e6b05e2cc053816739793a5", "parents": [ "7e8be4fcc2c3a007864864a4a358004cd8f8a543", "9888af1dfcf6525d62dd2a33673362d38d585ad3" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jul 12 23:44:51 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 23:44:51 2017 +0000" }, "message": "Merge \"Implement getDownloadStatus and add permission\" am: 2fa880d016 am: d45a007222\nam: 9888af1dfc\n\nChange-Id: I98d30f379072302a5e76a8b157d8aecdd1616235\n" }, { "commit": "d45a00722271a39bb420b3d15b6bdd3a675d4dc5", "tree": "8c70841195f0a4db9470c373ad5d26d353cd9a86", "parents": [ "74868feecd376d4efce1096236ed58a0051a1bee", "2fa880d0162a206b9307bfd5cd37a37cf216895a" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jul 12 23:27:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 23:27:49 2017 +0000" }, "message": "Merge \"Implement getDownloadStatus and add permission\"\nam: 2fa880d016\n\nChange-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959\n" }, { "commit": "a4a79df9a40dd661e0bf56b83c7a7d6e619cffcf", "tree": "3a11f62e6f716b1703977443b9075eefd1031e82", "parents": [ "41d8ef907af21f0001c458fb235d40a77e357e0b", "0eba3cb020d16e3bdc9ee0bf6358662a54600f77" ], "author": { "name": "Derek Tan", "email": "derektan@google.com", "time": "Fri Jul 07 23:31:37 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 07 23:31:37 2017 +0000" }, "message": "Merge \"Prevent any app except LPA to create logical channel to AID of ISD-R.\" into oc-dr1-dev am: f1328fee0d\nam: 0eba3cb020\n\nChange-Id: I435e1a197b44eeff8b7453e2b9f88e9a901c285d\n" }, { "commit": "0eba3cb020d16e3bdc9ee0bf6358662a54600f77", "tree": "8307e781188d8c65210225301ae73a9db21f0c63", "parents": [ "654f917c174fbc70fb5a444da49d7ada5076978f", "f1328fee0da0683c3a1e8dd901a073ecd5e0f91a" ], "author": { "name": "Derek Tan", "email": "derektan@google.com", "time": "Fri Jul 07 23:18:54 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 07 23:18:54 2017 +0000" }, "message": "Merge \"Prevent any app except LPA to create logical channel to AID of ISD-R.\" into oc-dr1-dev\nam: f1328fee0d\n\nChange-Id: I8646c7983330beaf90f7935d01675f33df2bf7ef\n" }, { "commit": "f1328fee0da0683c3a1e8dd901a073ecd5e0f91a", "tree": "2e2a0fa2844f74b323541f1450b4630df613cb3e", "parents": [ "d4b83f96f84fc97689b27c8b96486ad74086d4d4", "cda9a836a949620cb5f3e2572764dc92dece4640" ], "author": { "name": "Derek Tan", "email": "derektan@google.com", "time": "Fri Jul 07 23:12:44 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 07 23:12:44 2017 +0000" }, "message": "Merge \"Prevent any app except LPA to create logical channel to AID of ISD-R.\" into oc-dr1-dev" }, { "commit": "c89c50c06a2ad32254614c919a99a6fd4f14f871", "tree": "90926dd81ef1e741fa10cfdf88c4eca2df8bc798", "parents": [ "179ed358a82c086ad3bcde238d1f20024523b63f", "d6c82cde94c39d965d5482d3d983939a1dc7b17d" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Fri Jul 07 02:56:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 07 02:56:50 2017 +0000" }, "message": "Merge \"Make dun APNs as read-only by default.\" into oc-dr1-dev am: 730e4a5651\nam: d6c82cde94\n\nChange-Id: Ia6c2ec49d20c53de9b8022cee342589ef2e87172\n" }, { "commit": "d6c82cde94c39d965d5482d3d983939a1dc7b17d", "tree": "53522854f4f52572f214f270aa6125357dbbaf24", "parents": [ "1f4f1774c9acd1111514cd695ba84bed1f79f7ec", "730e4a5651d41d5aa86d678cb1b3cc5130e5e1d8" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Fri Jul 07 02:37:34 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 07 02:37:34 2017 +0000" }, "message": "Merge \"Make dun APNs as read-only by default.\" into oc-dr1-dev\nam: 730e4a5651\n\nChange-Id: Iab30ea34531682e9e4212aa8930232121aa530bd\n" }, { "commit": "730e4a5651d41d5aa86d678cb1b3cc5130e5e1d8", "tree": "0bf1e6def54b2220e6de0c39c2cab2db2d8228b4", "parents": [ "3e9d74091c8958dd285a10ec606907bcf892d2d8", "94222f4c06761697f15ca93a9ef5e563c94ee7ca" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jul 06 23:50:32 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 06 23:50:32 2017 +0000" }, "message": "Merge \"Make dun APNs as read-only by default.\" into oc-dr1-dev" }, { "commit": "55f557dc7c1622ec757f7f47d469f742148814a8", "tree": "fe53d0db48c8a23323a83efe7a94624cf1d0d54d", "parents": [ "54b1e9c57c3b3bc08b106849ed78672b87ea954e" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jun 29 18:37:11 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 06 13:40:09 2017 -0700" }, "message": "Implement getDownloadStatus and add permission\n\n- Implement getDownloadStatus in the manager\n- Remove DownloadStatus and add constants in its place to reflect the\nstatus of a single file\n- Add ACT_AS_EMBMS_MIDDLEWARE permission\n\nChange-Id: Ica8b8a872a8088a2aaf56d40926051225aa39e87\n" }, { "commit": "f4ad19a8d29e91f1e1b72941ca72ece38307ff27", "tree": "6f8fd2aea566930b48e9540e29a818deeb92ec84", "parents": [ "5ce05725bae6c37cb47dc804de837d4109c4314d", "5ca73a0f9862225ed57d61a91e74f4321891ba5a" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 06 20:21:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 06 20:21:31 2017 +0000" }, "message": "Merge \"Merge \"Merge \"Merge \"Add a reason arg to streamStateUpdated\" am: 6ba3829074\" into stage-aosp-master am: 4c3be35123\" into oc-dev-plus-aosp am: af3c9615f1\" into oc-dr1-dev-plus-aosp\nam: 5ca73a0f98\n\nChange-Id: I6799f02b8d5949027c9215c4542e1f9620c74ba9\n" }, { "commit": "da7669040ce318a77510fae720e24e80216983f5", "tree": "206db8730d2d087de68e8c153da7bed0e900072f", "parents": [ "f888e4248a32febd64feb6ea3fbeab5b3e0b0507", "af3c9615f14a14ae1ca781e5159546d9b68eafd7" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 06 18:47:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 06 18:47:57 2017 +0000" }, "message": "Merge \"Merge \"Merge \"Add a reason arg to streamStateUpdated\" am: 6ba3829074\" into stage-aosp-master am: 4c3be35123\" into oc-dev-plus-aosp\nam: af3c9615f1\n\nChange-Id: If16e4a6da97e2ee70f2a2ca8444fa24fa9210bf1\n" }, { "commit": "5b754768a2616d1579481af4eaf669b449b5f3c6", "tree": "6c74059c60fd0a60bf77e464b8e5ba5b94f277d4", "parents": [ "481d92c517bdb2c94279381499a1d7ed8bab18b1", "6ba38290748b673fd1d94f4ab46f03edc787dd6b" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 06 18:24:02 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 06 18:24:02 2017 +0000" }, "message": "Merge \"Add a reason arg to streamStateUpdated\"\nam: 6ba3829074\n\nChange-Id: I0c05734f18d58d7693d8777a4d1bb7950a5f54af\n" }, { "commit": "6ba38290748b673fd1d94f4ab46f03edc787dd6b", "tree": "24a7facb9fbe0716219121597e53ae7214e1bb52", "parents": [ "09b6988e27a7cf394ec4077f58da2ee19b5c958c", "6e1d2feef5a6ec186ecd49cb8c1c0e402ab34868" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 06 18:08:02 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 06 18:08:02 2017 +0000" }, "message": "Merge \"Add a reason arg to streamStateUpdated\"" }, { "commit": "e527be7aa2e90e562934ceade31b5d7f685aa5b5", "tree": "d59ead51464d5870017ce12700b3eb9513159b99", "parents": [ "0cd93afc72cc5ee5aca3617c2bb6d31707581ab3", "64ec5d3547cee2a1f890f47f28ae01a52175a5de" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 06 02:24:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 06 02:24:36 2017 +0000" }, "message": "Merge \"Update DownloadRequest API\" am: fa42eea98f am: 5e7c98bb6a am: 812d0866b1\nam: 64ec5d3547\n\nChange-Id: Ie96d8b2ce004094b2dfd23939e4b2e19f62307c5\n" }, { "commit": "64ec5d3547cee2a1f890f47f28ae01a52175a5de", "tree": "b1b1531955cc73e49eaa34af53969a7725fe79c8", "parents": [ "15a1363463b008166582415f5a56a192db6f6996", "812d0866b18c0a168f9a005a3020508e122a0d1c" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 06 02:16:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 06 02:16:11 2017 +0000" }, "message": "Merge \"Update DownloadRequest API\" am: fa42eea98f am: 5e7c98bb6a\nam: 812d0866b1\n\nChange-Id: I10eca003e37657c6582718c70c39ac7f54badbae\n" }, { "commit": "5e7c98bb6a9f08b6dd889187504ae7fc53a7ff06", "tree": "ccc77442d323469b6204367b25a3e686d550659b", "parents": [ "17f2f1633ba3e025624ab45a55b7629abf51c0c8", "fa42eea98f653fa36a83a14bcbccdcaec505e874" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 06 02:03:42 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 06 02:03:42 2017 +0000" }, "message": "Merge \"Update DownloadRequest API\"\nam: fa42eea98f\n\nChange-Id: I0b966f0fa2ca3e1c45bf4932654a3bbc1b2d05eb\n" }, { "commit": "fa42eea98f653fa36a83a14bcbccdcaec505e874", "tree": "67b801c3e58f71439afa1a9b3a46ce99b8261d3d", "parents": [ "21187ba5cce9d790ddc9cf9612b7b3d783d65297", "3bedd88caeda1ce5add85228d00107f04e78dbe3" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 06 01:52:04 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 06 01:52:04 2017 +0000" }, "message": "Merge \"Update DownloadRequest API\"" }, { "commit": "6e1d2feef5a6ec186ecd49cb8c1c0e402ab34868", "tree": "33f4cae1d79edda137d7a6f948eaf34ec29579a0", "parents": [ "8558d93db8902740a5fba7c1e6a4b0bbc36a2c16" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jun 30 14:37:30 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jun 30 14:41:18 2017 -0700" }, "message": "Add a reason arg to streamStateUpdated\n\nChange-Id: I6cc48b64aa885672e062b060a0cf58649df17916\n" }, { "commit": "3c1d4d6ef45ed093403fe6ecf817e8eb62a89c59", "tree": "be51dfa941e939c50b9cc2f80be39117292e6d8c", "parents": [ "ed0cc81212c44f831aed19661a4377ff99cdb60c", "949b625c57f19c96c6c6eef26327c23412a63f7e" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jun 29 22:06:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 29 22:06:23 2017 +0000" }, "message": "Merge \"Implement cancelDownload and remove appName\" am: 9b43ffcf2f am: 4b1acf4421 am: 4c751c865a\nam: 949b625c57\n\nChange-Id: Iafa6c3b23ba2957e8a303f6190b32e801f6c047f\n" }, { "commit": "949b625c57f19c96c6c6eef26327c23412a63f7e", "tree": "844f8fb34b2d99f66649930ddbcbd91ed3f96677", "parents": [ "99eac47966df20849723de01e1b07ff9a6dff8b7", "4c751c865afca995a704eb693088b49ec8e6d126" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jun 29 21:58:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 29 21:58:22 2017 +0000" }, "message": "Merge \"Implement cancelDownload and remove appName\" am: 9b43ffcf2f am: 4b1acf4421\nam: 4c751c865a\n\nChange-Id: I05814ffe8fb4ca2f334d6c0ecd772295bc2c7c63\n" }, { "commit": "4b1acf4421ad6829f892489cf6b2fec30a8e991e", "tree": "4d42241ea101c2bee36eb9cfef0ea6886b07a4d9", "parents": [ "9fd5d0da1ebea07888fcc32e92a1a7e24b3a4f16", "9b43ffcf2f4154ec58a58e06f778c76fe17fe1e6" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jun 29 21:45:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 29 21:45:47 2017 +0000" }, "message": "Merge \"Implement cancelDownload and remove appName\"\nam: 9b43ffcf2f\n\nChange-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735\n" }, { "commit": "9b43ffcf2f4154ec58a58e06f778c76fe17fe1e6", "tree": "ff978b1fc8e86c692d0f53eb7dc760de26025a11", "parents": [ "874af710b7e180586a36bb55a620f234e9e3af80", "9f116ef480fce78c8a8211ba96e74607e33aec56" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jun 29 21:33:11 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jun 29 21:33:11 2017 +0000" }, "message": "Merge \"Implement cancelDownload and remove appName\"" }, { "commit": "3bedd88caeda1ce5add85228d00107f04e78dbe3", "tree": "c95e433f5df4d3bc4a705b4f6b733dd265212dbb", "parents": [ "9f116ef480fce78c8a8211ba96e74607e33aec56" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jun 29 14:10:48 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jun 29 14:31:00 2017 -0700" }, "message": "Update DownloadRequest API\n\n- Add set/getOpaqueData methods so middleware has one thing to persist\n- remove id from DownloadRequest since nobody seems to want it\n- replace FileServiceInfo with a service ID\n- add a FileInfo extra when sending file-completion to the app\n\nChange-Id: I75be3cce923d5d3c74081d344074b4e3c67deff3\n" }, { "commit": "5311da134a3f2ade5ca2facab5053b3d61987321", "tree": "9bb712d3df815e6d2a7a71e2eea09e7780330f2b", "parents": [ "761bad1c53fcf6751c7809da68c90fba35387936", "db8e4efd5bb60aa05cd9f581f39cd016da4fab70" ], "author": { "name": "yinxu", "email": "yinxu@google.com", "time": "Thu Jun 29 02:05:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 29 02:05:53 2017 +0000" }, "message": "Merge \"Use Bundle for inter-process message\"\nam: db8e4efd5b\n\nChange-Id: Ib93e91969063a5d2276c99b8b0fee4dd1a398771\n" }, { "commit": "db8e4efd5bb60aa05cd9f581f39cd016da4fab70", "tree": "1fbd5cc10544c9a9150245aa2cb2724b3f467cc7", "parents": [ "c2f33f18ebf8acc1812fba6f3ad519dedda40b5c", "77e6f9909a9533680f6617d05302c87f5582dc0b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 29 01:51:04 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jun 29 01:51:04 2017 +0000" }, "message": "Merge \"Use Bundle for inter-process message\"" }, { "commit": "9f116ef480fce78c8a8211ba96e74607e33aec56", "tree": "c91bdbcd668f023835e40f67a48fc071c8b8a821", "parents": [ "c2f33f18ebf8acc1812fba6f3ad519dedda40b5c" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jun 23 16:32:30 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jun 28 15:00:56 2017 -0700" }, "message": "Implement cancelDownload and remove appName\n\nImplements the cancelDownload call\nRemoves appName as an argument from all EMBMS-related apis\nImplements the cross-filesystem move method in MbmsDownloadReceiver\n\nChange-Id: Ie8ebfccca4fbb3d69289beb2ed77101fe2c7727f\n" }, { "commit": "58d47a6f04a0bbfe2654854c294e065ab46cbbc3", "tree": "d476249c82eb5bde45fcaa31a890e56beea74c02", "parents": [ "e5c09e42eb6c5cb58806b0a5bfc8b77613538cba", "ce07d61ce7f6141d5f21ea8f4fdcc17c2edc9282" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Wed Jun 28 21:06:34 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 28 21:06:34 2017 +0000" }, "message": "Merge \"IMS: Check for binderstate before calling endSession\" into oc-dr1-dev" }, { "commit": "9011975ce10640e42623a680fec99051d7acc549", "tree": "f3306397bdde725eb3ebdf5d4c5814960fa7c5a8", "parents": [ "fa177aca7472b58543d7599518853c729f9b0376", "5f48b1bc02151a08c47cf833113bc9cc91fcc56c" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jun 28 20:59:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 20:59:45 2017 +0000" }, "message": "Merge changes from topics \u0027embms-cleanup-action\u0027, \u0027embms-download-token\u0027 am: c2f33f18eb am: 761bad1c53 am: 8f42a3a281\nam: 5f48b1bc02\n\nChange-Id: I12300a1e96b97cfa47e7ff82e2ac50e7e9932eab\n" }, { "commit": "fa177aca7472b58543d7599518853c729f9b0376", "tree": "f054fd46b7ae47c051bdacabe56d2c342c817590", "parents": [ "b6d9ba31dec8e81a665cb7c1d19de1f31c717097", "b70e48b33b1c9492a230cd86389bd6650224ba2e" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jun 28 20:58:37 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 20:58:37 2017 +0000" }, "message": "Add download request tokens and enforce destination clear am: 2043f70acb am: 8763c625a3 am: fc156f357a\nam: b70e48b33b\n\nChange-Id: I8e9dbb203bb91c5ef32c38e0cb7de6f854e05ce8\n" }, { "commit": "5f48b1bc02151a08c47cf833113bc9cc91fcc56c", "tree": "9425af14d85d7b537f6e3631e73ee0f1b3dc5a3f", "parents": [ "b70e48b33b1c9492a230cd86389bd6650224ba2e", "8f42a3a281ec76d2b0f40b188ca5741f25202852" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jun 28 20:53:00 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 20:53:00 2017 +0000" }, "message": "Merge changes from topics \u0027embms-cleanup-action\u0027, \u0027embms-download-token\u0027 am: c2f33f18eb am: 761bad1c53\nam: 8f42a3a281\n\nChange-Id: Ib6c8e17b0d6664ded17ce8eb4314124eb676713c\n" }, { "commit": "b70e48b33b1c9492a230cd86389bd6650224ba2e", "tree": "8314b85e57c6a8c6db147943cfe0d7ab651a24da", "parents": [ "948f788fdfab4fd38ba8426b50aa89e1922e5cb6", "fc156f357a1f27249a13d43d9757f44b258386c9" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jun 28 20:51:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 20:51:57 2017 +0000" }, "message": "Add download request tokens and enforce destination clear am: 2043f70acb am: 8763c625a3\nam: fc156f357a\n\nChange-Id: I929fd3306a7bb8bbc2eeb31eb1732c99ec0fb743\n" }, { "commit": "ce07d61ce7f6141d5f21ea8f4fdcc17c2edc9282", "tree": "e5aa76bddb7c8427c3e4cb7b9c27645bd9357576", "parents": [ "bf15050a0c23fcfab2f7e103df6f86a65f72d212" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Jun 27 17:08:55 2017 +0000" }, "committer": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Wed Jun 28 20:39:23 2017 +0000" }, "message": "IMS: Check for binderstate before calling endSession\n\nImsRegistrationListenerProxy listener, which is registered\nas part of ImsManager.open, is not cleared even after moving\nfeature state to NOT_AVAILABLE because end session\nis never called.\n\nCheck for binder state instead of feature state READY before\ncalling end session. End session will be triggered after\nmoving feature state to NOT_AVAILABLE.\n\nNotify Ims state change only for the supported feature state\nchange to clients.\n\nTest: Manual\nBug: 62816014\nMerged-In: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b\nChange-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b\n(cherry picked from commit 913e11fcdfc9cbd7fd3eee1c94d1cb3fced37da9)\n" }, { "commit": "761bad1c53fcf6751c7809da68c90fba35387936", "tree": "f39a31df8f558a969776f70d7b2fb65dbe584a7d", "parents": [ "8763c625a3cc52ba48635f93593e6eebdf9399ca", "c2f33f18ebf8acc1812fba6f3ad519dedda40b5c" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jun 28 20:36:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 20:36:49 2017 +0000" }, "message": "Merge changes from topics \u0027embms-cleanup-action\u0027, \u0027embms-download-token\u0027\nam: c2f33f18eb\n\nChange-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81\n" }, { "commit": "8763c625a3cc52ba48635f93593e6eebdf9399ca", "tree": "e797377c9cbd91f77fb1ccde7457ddf9ccd679ca", "parents": [ "4a7e3de5e72e91f72b5ecc92acdb2a299500b65c", "2043f70acb2fa0bb9c0ddc056c9bfd427addc580" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jun 28 20:35:54 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 20:35:54 2017 +0000" }, "message": "Add download request tokens and enforce destination clear\nam: 2043f70acb\n\nChange-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f\n" }, { "commit": "c2f33f18ebf8acc1812fba6f3ad519dedda40b5c", "tree": "bf4e42bf10e77ba40b601443aef31dfdd7076387", "parents": [ "4e77ae6d1a4a04f3c925638a03e46fac156ce5a8", "990a573da975f70dcfde6dd98f00f055f205b257" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jun 28 20:26:15 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 28 20:26:15 2017 +0000" }, "message": "Merge changes from topics \u0027embms-cleanup-action\u0027, \u0027embms-download-token\u0027\n\n* changes:\n Implement the cleanup action in MbmsDownloadReceiver\n Add download request tokens and enforce destination clear\n" }, { "commit": "77e6f9909a9533680f6617d05302c87f5582dc0b", "tree": "ddec1636f7f6d85335930bd830d131f4b4706382", "parents": [ "c49534cf097f75421e56d1b6a22112ef942165c2" ], "author": { "name": "yinxu", "email": "yinxu@google.com", "time": "Tue Jun 27 14:05:17 2017 -0700" }, "committer": { "name": "yinxu", "email": "yinxu@google.com", "time": "Wed Jun 28 10:58:31 2017 -0700" }, "message": "Use Bundle for inter-process message\n\nThe message sent from NetworkScanRequestTracker to TelephonyScanManager\nmight be across different process, so we have to wrap the List\u003cCellInfo\u003e into\nBundle because List\u003c\u003e is not parcelable.\n\nCherry-picked cleanly from:\nhttps://googleplex-android-review.googlesource.com/#/c/2467157/\n\nTest: Telephony sanity tests\nBug: 30954762\n\nMerged-in: I77945b247530b85c0b82876d528549498a711550\nChangg-Id: I77945b247530b85c0b82876d528549498a711550\n(cherry picked from commit 56049437095d3cb8334f667ff73061f2926b5416)\n\nChange-Id: Iec4043e611a8f58733a361ec9a52fc74e1c974d5\n" }, { "commit": "ad60b3757533674dc27a441fdf40ca47db9e876e", "tree": "e7694a9e1257688eaac788951ac6e0c774b5d93a", "parents": [ "8d98c72f759615278e16be672363526ad7de46d4", "53ad2499f1bae7ea93bf1c73b7a32decb4fb74b0" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Wed Jun 28 17:41:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 17:41:26 2017 +0000" }, "message": "Merge \"Add EuiccManager#retainSubscriptionsOnFactoryReset API.\" into oc-dr1-dev am: f28843dd3f\nam: 53ad2499f1\n\nChange-Id: I538f0405811b0df28960acdb6f275689f19185dc\n" }, { "commit": "53ad2499f1bae7ea93bf1c73b7a32decb4fb74b0", "tree": "7095ffed8198b7b524a9d51728f43c7163712f07", "parents": [ "77fb4c5b0e48046b81b2cb886f92cbc8256be817", "f28843dd3fc38f6d032a2cdf9162120c6135ce62" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Wed Jun 28 17:33:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 17:33:01 2017 +0000" }, "message": "Merge \"Add EuiccManager#retainSubscriptionsOnFactoryReset API.\" into oc-dr1-dev\nam: f28843dd3f\n\nChange-Id: Ibd7c9c673c9272696cd955ddc50d4b55755d5429\n" }, { "commit": "f28843dd3fc38f6d032a2cdf9162120c6135ce62", "tree": "95e18ef6ac723a6ccaeaf66167e9617c41e52bf6", "parents": [ "e5ad3821e3b981e471cb5b5bd872dcf2c65f0867", "7b69a86b02e1e4b469181a8ad286f473df8b6352" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Wed Jun 28 17:23:49 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 28 17:23:49 2017 +0000" }, "message": "Merge \"Add EuiccManager#retainSubscriptionsOnFactoryReset API.\" into oc-dr1-dev" }, { "commit": "ed38bfdc8fbb361f4bd14c19bff924b34523f815", "tree": "cb3947b3ffb2e8922e9cf270881c8159d8a91b99", "parents": [ "cbbb27bce21844157e57cdb40d665e28f1eb63e0", "c567b166044c0fb42ade473ca7bf97f02c3d438f" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Wed Jun 28 16:59:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 16:59:26 2017 +0000" }, "message": "Merge \"Use Bundle for inter-process message\" into oc-dr1-dev am: e5ad3821e3\nam: c567b16604\n\nChange-Id: Icc35859aec67db25113cc7cb86fc3af75886c65b\n" }, { "commit": "c567b166044c0fb42ade473ca7bf97f02c3d438f", "tree": "9fce095e61467f2478f9c65fa0a388879c0bf057", "parents": [ "56fb90cf3e14b874d3702c6087e76a1bda922da1", "e5ad3821e3b981e471cb5b5bd872dcf2c65f0867" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Wed Jun 28 16:54:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 16:54:19 2017 +0000" }, "message": "Merge \"Use Bundle for inter-process message\" into oc-dr1-dev\nam: e5ad3821e3\n\nChange-Id: Ia847e54c387fc145b36313048860aa6b281d4c56\n" }, { "commit": "e5ad3821e3b981e471cb5b5bd872dcf2c65f0867", "tree": "bd499af5862ffcc258db2be8a7160bde283e03d7", "parents": [ "939171ee8bdb38ce3d31817af67d10fb98f94d94", "56049437095d3cb8334f667ff73061f2926b5416" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Wed Jun 28 16:47:50 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 28 16:47:50 2017 +0000" }, "message": "Merge \"Use Bundle for inter-process message\" into oc-dr1-dev" }, { "commit": "990a573da975f70dcfde6dd98f00f055f205b257", "tree": "8c70b38170c6b38e17da6a96a725eb8dde3401ef", "parents": [ "2043f70acb2fa0bb9c0ddc056c9bfd427addc580" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jun 21 18:23:48 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Tue Jun 27 19:15:55 2017 -0700" }, "message": "Implement the cleanup action in MbmsDownloadReceiver\n\nImplement ACTION_CLEANUP, add result codes for the ordered broadcasts,\nand remove the download request extra for file descriptor requests\n\nChange-Id: I5ee19ad0aefbdceacb636b3d17e197a6fb1bdaa6\n" }, { "commit": "db07b66d3aae2834628032aaf72d69a8900b9869", "tree": "360e180727cc94e48b65fb9b0aace6b046b11704", "parents": [ "9c1cdf2f1a3038a25a5b2c5d6c6d9de417bc3d67" ], "author": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Mon May 22 15:23:38 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jun 28 00:31:58 2017 +0000" }, "message": "Radio Interface changes to pass the encryption object, including the\nkey,to the modem.\n\nWe will now pass the ImsiEncryptionInfo object which includes mnc/mcc.\nBUG: 35606429\nTest: manual\n(cherry picked from commit 6d50fec388cf382a1f0a4886fe5cea16280f5bdf)\nMerged-In: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b\nChange-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b\n" }, { "commit": "cda9a836a949620cb5f3e2572764dc92dece4640", "tree": "f94cec53c01ab21e2af9346e732a221dd41b1087", "parents": [ "be6989cb9d3fbef37d6d1dd25ad47ce0b5e31a1a" ], "author": { "name": "Derek Tan", "email": "derektan@google.com", "time": "Tue Jun 27 14:44:41 2017 -0700" }, "committer": { "name": "Derek Tan", "email": "derektan@google.com", "time": "Tue Jun 27 15:03:51 2017 -0700" }, "message": "Prevent any app except LPA to create logical channel to AID of ISD-R.\n\nBug: 33077154\nTest: manual verification using LPA and Tycho.\n\nChange-Id: I4ef85529d0f63d46849d5afe76df90a27171e7db\n" }, { "commit": "56049437095d3cb8334f667ff73061f2926b5416", "tree": "68e17aef2c452c4dc0887c3477ee52affba74187", "parents": [ "9c1cdf2f1a3038a25a5b2c5d6c6d9de417bc3d67" ], "author": { "name": "yinxu", "email": "yinxu@google.com", "time": "Tue Jun 27 14:05:17 2017 -0700" }, "committer": { "name": "yinxu", "email": "yinxu@google.com", "time": "Tue Jun 27 14:52:45 2017 -0700" }, "message": "Use Bundle for inter-process message\n\nThe message sent from NetworkScanRequestTracker to TelephonyScanManager\nmight be across different process, so we have to wrap the List\u003cCellInfo\u003e into\nBundle because List\u003c\u003e is not parcelable.\n\nTest: Telephony sanity tests\nBug: 30954762\nChange-Id: I77945b247530b85c0b82876d528549498a711550\n" }, { "commit": "55b390b39944d681708b4d9d6b5654396e96c3d4", "tree": "439ba1367e6dba23d92c7da8527d769f347f124a", "parents": [ "8d1e9fc35148b2baedeac371c97578f8a59f8166", "5ab024333065c60620867e58eaa27f27dfa85752" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Tue Jun 27 19:10:55 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 27 19:11:03 2017 +0000" }, "message": "Merge \"Only require that system UIDs tag their sockets.\"" }, { "commit": "69754b07ba504047672ee1de0e036bbc94189b3f", "tree": "08b55b950cbe92e9df6662051e9ce7b4bf70ca99", "parents": [ "07d9516d21f672c983d625e75b6b6148213d076f", "d0b5ca2e26ecfc1ce925b5a17657e4d26774b4b4" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Jun 27 19:03:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 27 19:03:11 2017 +0000" }, "message": "Merge \"Merge \"IMS: Check for binderstate before calling endSession\" am: c49534cf09 am: 1de1c2bb66 am: 8f2950b2c4\" into oc-dr1-dev-plus-aosp\nam: d0b5ca2e26\n\nChange-Id: Ie3b0ba66d5e954a2d2c23c70a0d35ea1b7660670\n" }, { "commit": "5ab024333065c60620867e58eaa27f27dfa85752", "tree": "3fbc2b17d61db0a5866012c824e117d9f79a5ed7", "parents": [ "27895365008e704c85dcf9c152625695fee6707c" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Jun 27 11:01:36 2017 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Jun 27 11:11:06 2017 -0600" }, "message": "Only require that system UIDs tag their sockets.\n\nApps with a normal UID are typically isolated enough to not require\nsocket tagging; we\u0027re mostly interested in tracking down internal\nUIDs that have lots of code sharing the same UID.\n\nAlso fix up everyone doing manual string checks of Build.TYPE, since\nwe now have first-class fields for those.\n\nBug: 38126076\nTest: builds, boots\nChange-Id: I3a40348196bd8459289f2b9355d9783a07f1e7dd\n" }, { "commit": "913e11fcdfc9cbd7fd3eee1c94d1cb3fced37da9", "tree": "ae3ad70e713b608cab2ff3c8bfd69da89bf67758", "parents": [ "b7f44dfce91e595cd8e442c454a02a08b9878206", "8f2950b2c4b5cc0cf28e565c3a867c6203f94af1" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Jun 27 17:08:55 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 27 17:08:55 2017 +0000" }, "message": "Merge \"IMS: Check for binderstate before calling endSession\" am: c49534cf09 am: 1de1c2bb66\nam: 8f2950b2c4\n\nChange-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b\n" }, { "commit": "1de1c2bb66af856d45c0e8077bcbc4d55f7a7230", "tree": "c65e7a0e49445597c7ed77c71f402997266ce10e", "parents": [ "4fee968fa862aec4d742c01244b6cfb3ccdc3f9b", "c49534cf097f75421e56d1b6a22112ef942165c2" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Jun 27 16:57:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 27 16:57:11 2017 +0000" }, "message": "Merge \"IMS: Check for binderstate before calling endSession\"\nam: c49534cf09\n\nChange-Id: I9d173693c466b7d8512d11f266af48f5307669d5\n" }, { "commit": "c49534cf097f75421e56d1b6a22112ef942165c2", "tree": "69ff310089c19f8c64fdc95ed4b1131d2b6fe608", "parents": [ "f093d4e13e42a10bc6afc676d1453b4893b03ef7", "bed4d19db5b774609e61ef550d5655b9e3a607fe" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Jun 27 16:46:57 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 27 16:46:59 2017 +0000" }, "message": "Merge \"IMS: Check for binderstate before calling endSession\"" }, { "commit": "7b69a86b02e1e4b469181a8ad286f473df8b6352", "tree": "fc3d56d2e6ce2e69ffc46cb85d339f99d7086f21", "parents": [ "d20db5a0bd7f6560656f0da8637592143278e44d" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Fri Jun 16 15:20:34 2017 -0700" }, "committer": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Tue Jun 27 09:23:07 2017 -0700" }, "message": "Add EuiccManager#retainSubscriptionsOnFactoryReset API.\n\nBy default, all subscriptions are wiped on first boot after a factory\nreset. This ensures that if data is wiped outside of userspace (e.g.\nin fastboot/recovery), the profiles are wiped, as there\u0027s no way to\noffer this option to users in those modes - the radio isn\u0027t available\nfor us to access the eUICC.\n\nThis API provides a way to bypass this wipe if the user opts to retain\nthe policies for a wipe done from userspace (e.g. by unchecking the\n\"Wipe eUICC\" checkbox in platform settings before wiping). We tell the\nLPA to note this and skip the wipe on the ensuing factory reset.\n\nChange-Id: I2fe472417497e28b043841a5aa2dc9efa45ebbff\nTest: TreeHugger\nFixes: 62681577\n" }, { "commit": "5526fa1ce758c65a0e9ea9a3f23a245d15da836b", "tree": "7df3a271cd71e6200c1abd60cd0611cf2ff99cab", "parents": [ "28da658d1ebd806fcf1632f0eb2a9871fdfc4fbe", "f60773b22d76fbca295f7286873a974480a5fd30" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Tue Jun 27 01:00:05 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 27 01:00:05 2017 +0000" }, "message": "Merge \"Pass calling package to resolution UI.\" into oc-dr1-dev am: 776220d029\nam: f60773b22d\n\nChange-Id: I4d21f823af658701f7ffda1671d22eeee761cb57\n" }, { "commit": "f60773b22d76fbca295f7286873a974480a5fd30", "tree": "ed4fdccfecb68e92dc839210e00032bf120f8f69", "parents": [ "bb55e3e2e41c6e2d0bbb1372745221d164ade61e", "776220d02911681e6017172df2defdb48bb862a9" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Tue Jun 27 00:53:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 27 00:53:58 2017 +0000" }, "message": "Merge \"Pass calling package to resolution UI.\" into oc-dr1-dev\nam: 776220d029\n\nChange-Id: I9896d70fea9d69025c1a77d634333d160a71acb6\n" }, { "commit": "776220d02911681e6017172df2defdb48bb862a9", "tree": "81b06b7b72894fef37b79182552fa63e8c925279", "parents": [ "c4ccefc7fd50ddf0d4d3baa3df0a655f4a14cb0b", "b4c67ec3c85166a579612a563fc234ff326baedd" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jun 27 00:48:33 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 27 00:48:39 2017 +0000" }, "message": "Merge \"Pass calling package to resolution UI.\" into oc-dr1-dev" }, { "commit": "bed4d19db5b774609e61ef550d5655b9e3a607fe", "tree": "6678c3a94d49e14940140b9825a6a726f4f8a885", "parents": [ "51ee00785c070edb4609ec5496e690a9f4ebc871" ], "author": { "name": "Benergy Meenan Ravuri", "email": "bravuri@codeaurora.org", "time": "Tue Jun 20 17:00:42 2017 +0530" }, "committer": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Mon Jun 26 23:29:22 2017 +0000" }, "message": "IMS: Check for binderstate before calling endSession\n\nImsRegistrationListenerProxy listener, which is registered\nas part of ImsManager.open, is not cleared even after moving\nfeature state to NOT_AVAILABLE because end session\nis never called.\n\nCheck for binder state instead of feature state READY before\ncalling end session. End session will be triggered after\nmoving feature state to NOT_AVAILABLE.\n\nNotify Ims state change only for the supported feature state\nchange to clients.\n\nTest: Manual\nBug: 62816014\nChange-Id: I1bb588ce2be9c181355ff744f43dad4e784e4ec5\n" }, { "commit": "231e291b06a734d7ee0bc620ef992b9bd591c3fe", "tree": "e4bec9dcf82ab4ac5a81a46c361d624337dd21a1", "parents": [ "59a66b8601579086f0977ef9bd53012382901b87", "548475c58d78ced139596cfefb040895f14c9589" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Mon Jun 26 23:09:55 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 26 23:10:00 2017 +0000" }, "message": "Merge \"Fix the inconsistency of scan status.\" into oc-dr1-dev" }, { "commit": "a2790a13fd7b34307f8e7f5e8ff16a21a3f0d479", "tree": "9ed6e1526d4a25ce01e95d3b5c7890a844c59994", "parents": [ "02680636eb3c314789206643e844ebb11bc7c380" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jun 26 11:02:41 2017 -0600" }, "committer": { "name": "Pankaj Kanwar", "email": "pkanwar@google.com", "time": "Mon Jun 26 18:03:02 2017 +0000" }, "message": "Fix the red build.\n\nChange-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951\n(cherry picked from commit 29d670cea1c42d10274c5d97dcc8d2162540956e)\nMerged-In: If035d6939f5a465b4b579b590f8f2b5b532e0951\n" }, { "commit": "487893dada3af9ba2b0b92e62c56d5ab5746af1c", "tree": "1e61a35dfd49f37fa5962abcc901f43f152e792e", "parents": [ "adcd1fe0f6a28aab9e25a8a2aa65440d7d0929f4", "57ad8be7ecb65003ea83ca7536e5d513e8ada1cb" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Mon Jun 26 17:45:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 26 17:45:41 2017 +0000" }, "message": "Merge \"Fix the inconsistency of scan status.\" am: 41be35a1bd am: ac2d00a195 am: e30cfbea60\nam: 57ad8be7ec\n\nChange-Id: I2ee40a6c22a1bfe58ca107790719c5695aa7c774\n" }, { "commit": "57ad8be7ecb65003ea83ca7536e5d513e8ada1cb", "tree": "58518441a20f87aee77f696f5386f940f8293ea4", "parents": [ "658d7677fa744be88b4dffb218c1e25021115e32", "e30cfbea607a0d225203b006ddb1d29f21c8d994" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Mon Jun 26 17:36:15 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 26 17:36:15 2017 +0000" }, "message": "Merge \"Fix the inconsistency of scan status.\" am: 41be35a1bd am: ac2d00a195\nam: e30cfbea60\n\nChange-Id: Iaff6653418289136e24b4a1c16ee4e607d30dca0\n" }, { "commit": "e30cfbea607a0d225203b006ddb1d29f21c8d994", "tree": "a876bebf7f78bb31b5f46279d52259eb436d9607", "parents": [ "b5af86e4443864ad60016ff4cf60c3737eb7ab4b", "ac2d00a19538a6a1cfe7462b7c16cc9c65763d4c" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Mon Jun 26 17:27:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 26 17:27:21 2017 +0000" }, "message": "Merge \"Fix the inconsistency of scan status.\" am: 41be35a1bd\nam: ac2d00a195\n\nChange-Id: Ibcdbe63349031ea95d137dd18465bec5de6efd7a\n" }, { "commit": "ac2d00a19538a6a1cfe7462b7c16cc9c65763d4c", "tree": "3cdcada671c264ab23cc58494d258ebafd072b4e", "parents": [ "e26191a81c00cfc4c63d653b4825e3bef56e132a", "41be35a1bd26cfdd57755fad2f1b4e968408b51f" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Mon Jun 26 17:18:42 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 26 17:18:42 2017 +0000" }, "message": "Merge \"Fix the inconsistency of scan status.\"\nam: 41be35a1bd\n\nChange-Id: Ic92aa1aa9ecd91cd072257c93e12cdf030cdeba8\n" }, { "commit": "41be35a1bd26cfdd57755fad2f1b4e968408b51f", "tree": "25693411d2501bc5ca8c54d910e9196a22861acb", "parents": [ "1caaa514c9546e65810da68af3628beedbdc6e05", "ad50361ecec1844ddfb8a41097832a5cf0ecbb76" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Mon Jun 26 17:05:57 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 26 17:05:59 2017 +0000" }, "message": "Merge \"Fix the inconsistency of scan status.\"" }, { "commit": "29d670cea1c42d10274c5d97dcc8d2162540956e", "tree": "4d879373ab795d3bface8fa4ce598ac038b4d11c", "parents": [ "f76860652f959802243b26213ca51bd79cb25320" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jun 26 11:02:41 2017 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jun 26 11:02:41 2017 -0600" }, "message": "Fix the red build.\n\nChange-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951\n" }, { "commit": "a1b99b1b2953d3932da14f76fb376fbe0e2a6cdf", "tree": "811bca4d0f8867248883c45c28bbe68aa20d5841", "parents": [ "aec4c109f1ffd26c30446dc7654833148a0ebbee", "70c1f55927f528bff4fcff3bb4e76c2f48486227" ], "author": { "name": "Pankaj Kanwar", "email": "pkanwar@google.com", "time": "Mon Jun 26 16:10:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 26 16:10:40 2017 +0000" }, "message": "Merge \"Carrier Config changes to support IMSI encryption.\" am: 1caaa514c9 am: e26191a81c am: 01741762d8\nam: 70c1f55927\n\nChange-Id: Ib913d1897154aec9693ced4f8a95fd8fe57bc424\n" }, { "commit": "70c1f55927f528bff4fcff3bb4e76c2f48486227", "tree": "7355376e51a53819eebda4b2ecee129d3b5dc772", "parents": [ "58bcfb7d17c1341c0bd9c1035a8e17922829043e", "01741762d87068b05878ee6ffe7c377786b5c41b" ], "author": { "name": "Pankaj Kanwar", "email": "pkanwar@google.com", "time": "Mon Jun 26 16:03:06 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 26 16:03:06 2017 +0000" }, "message": "Merge \"Carrier Config changes to support IMSI encryption.\" am: 1caaa514c9 am: e26191a81c\nam: 01741762d8\n\nChange-Id: I385f7ce854a52533251d3777e227aeaf695bb7db\n" }, { "commit": "01741762d87068b05878ee6ffe7c377786b5c41b", "tree": "651b170bcabdb56905dfacf587ede0aa3efa80f8", "parents": [ "9e28f78763d0f7876cb55143bb4c93c77aaa4d6a", "e26191a81c00cfc4c63d653b4825e3bef56e132a" ], "author": { "name": "Pankaj Kanwar", "email": "pkanwar@google.com", "time": "Mon Jun 26 15:55:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 26 15:55:46 2017 +0000" }, "message": "Merge \"Carrier Config changes to support IMSI encryption.\" am: 1caaa514c9\nam: e26191a81c\n\nChange-Id: I777010e6fea82f237ddf224525739a5687f13a2c\n" }, { "commit": "e26191a81c00cfc4c63d653b4825e3bef56e132a", "tree": "4a720a6d5c9938bba369071cf365752351c468b8", "parents": [ "6b5d71f7e5097e48361a687fd202c883600c4149", "1caaa514c9546e65810da68af3628beedbdc6e05" ], "author": { "name": "Pankaj Kanwar", "email": "pkanwar@google.com", "time": "Mon Jun 26 15:48:03 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 26 15:48:03 2017 +0000" }, "message": "Merge \"Carrier Config changes to support IMSI encryption.\"\nam: 1caaa514c9\n\nChange-Id: Ia9c4d93e8ababf87a0d6027a4322e73111651844\n" }, { "commit": "766f4615e98976c03fd78ecd53ce4502b0e4642f", "tree": "0be419e0c2ce1edfd0d9a2df28eb691105b189ab", "parents": [ "91464bfe6809bf506fada1ec3822d0f9d69b5bef" ], "author": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Wed May 31 13:10:03 2017 -0700" }, "committer": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Sun Jun 25 19:46:52 2017 -0700" }, "message": "Carrier Config changes to support IMSI encryption.\n\nAdding 2 config parameters to CarrierConfigManager:\n1. imsi_key_download_url.\n2. imsi_key_expiration_days_time.\n\nBUG: 35606429\nTest: manual\n\nChange-Id: I191dd0db5fa84a57faea88cb59c2c0b2604064b2\n" }, { "commit": "429499f81319e9b92592bfd93064ba5f4549642d", "tree": "9ea44fdefe4ef915269165b89cba14876d2321e9", "parents": [ "157e546592fb33a6d8c3d04418e79d8c7f232f89", "5af2d63721c0976c7fe418228d5f686e1b7b1499" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Sat Jun 24 04:47:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jun 24 04:47:36 2017 +0000" }, "message": "Merge \"Refactored area update info support\" into oc-dr1-dev\nam: 5af2d63721\n\nChange-Id: I1ab48412baffcbc6ad2b98ea0966cff20c9762aa\n" }, { "commit": "2043f70acb2fa0bb9c0ddc056c9bfd427addc580", "tree": "4097546ffce8b15a11497ac85013cdfb0535875f", "parents": [ "e601160a9697bf836e425459e5d804d39457741f" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Mon Jun 19 17:20:10 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jun 23 16:45:19 2017 -0700" }, "message": "Add download request tokens and enforce destination clear\n\nStart writing tokens for each download request after calling download(),\nand check agains them when a completed-file intent is received with a\ndownload request extra.\nAlso start checking that the download destination is clear.\n\nChange-Id: I533fe2ba49ac56bed5eab44670fe8e9a273b1ffb\n" }, { "commit": "5af2d63721c0976c7fe418228d5f686e1b7b1499", "tree": "4582f4783be7e87c0107279e792eb6b677cb336b", "parents": [ "d2cca60d09625605def6f52df52e0b7ef89fde0c", "93c42856235ba0a47b9eb1514d37fd7b654f0df0" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Fri Jun 23 23:13:50 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 23 23:13:58 2017 +0000" }, "message": "Merge \"Refactored area update info support\" into oc-dr1-dev" }, { "commit": "548475c58d78ced139596cfefb040895f14c9589", "tree": "486735f2a9eb446bd90173f2b39f81fbb65b0bd2", "parents": [ "06c32f21fc2d51bcae7af0d7145311c8750d0d0c" ], "author": { "name": "yinxu", "email": "yinxu@google.com", "time": "Fri Jun 23 15:27:42 2017 -0700" }, "committer": { "name": "yinxu", "email": "yinxu@google.com", "time": "Fri Jun 23 15:39:13 2017 -0700" }, "message": "Fix the inconsistency of scan status.\n\nIn types.hal and ril.h, the scan status is defined as:\n PARTIAL \u003d 0x01\n COMPLETE \u003d 0x02\n\nBut in NetworkScanResult.java, the scan status is defined as:\n public static final int SCAN_STATUS_PARTIAL \u003d 0\n public static final int SCAN_STATUS_COMPLETE \u003d 1\n\nThis CL makes changes to NetworkScanResult.java so that the scan status\nis consistent both in Telephony and RIL.\n\nCherry-picked cleanly from:\nhttps://android-review.googlesource.com/#/c/422183/\n\nTest: Telephony sanity tests\nBug: 30954762\n\nMerged-in: Iadcd344ad3fe682da98a1a41c2964583f67dc792\nChange-Id: Iadcd344ad3fe682da98a1a41c2964583f67dc792\n(cherry picked from commit ad50361ecec1844ddfb8a41097832a5cf0ecbb76)\n" } ], "next": "ad50361ecec1844ddfb8a41097832a5cf0ecbb76" }