)]}' { "log": [ { "commit": "9822725da07cc150f2410ad5360549018c3fbb1c", "tree": "a957540b0821e9737ce172c773ca49a8398ce9fa", "parents": [ "16318347d6bab6c169c1c461f7acfbc87955e3b2", "43848b4123e1b0d710a9c8bad4f130a2d9bb953b" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Tue Feb 25 14:53:24 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 25 14:53:24 2025 -0800" }, "message": "Merge \"[owners] Remove rtenneti@google.com from OWNERS\" into main" }, { "commit": "43848b4123e1b0d710a9c8bad4f130a2d9bb953b", "tree": "a957540b0821e9737ce172c773ca49a8398ce9fa", "parents": [ "16318347d6bab6c169c1c461f7acfbc87955e3b2" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Tue Feb 25 09:36:38 2025 -0800" }, "committer": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Tue Feb 25 09:36:42 2025 -0800" }, "message": "[owners] Remove rtenneti@google.com from OWNERS\n\nThis suggested change is automatically generated based on group\nmemberships and affiliations.\n\nPlease approve this change and vote the highest CR. This will keep the OWNERs\nfile tidy. We ask that you do not ignore this change and approve it\nunless you know a reason the OWNER should remain. It can always be\nreverted if needed.\n\nIf this change is in error, vote the lowest CR value (i.e. reject the CL)\nand the bot will abandon it.\n\nSee the owner\u0027s recent review activity for context:\nhttps://android-review.googlesource.com/q/rtenneti@google.com\n\nTo report an issue, file a bug in the Infra\u003eCodereview component.\n\nChange-Id: Ic2739c8b1eb1fec9db299440d85b252eb5854351\n" }, { "commit": "16318347d6bab6c169c1c461f7acfbc87955e3b2", "tree": "7f4dcde18156331bdf132641052a8f82299cf9b5", "parents": [ "134e092c9b71d8145ba8c7540bac0c392630218f", "26593afcb7fa0f8258fc50247a2d0eef4a343f82" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Mon Feb 24 12:29:52 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Feb 24 12:29:52 2025 -0800" }, "message": "Merge \"[owners] Remove jeffbailey@google.com from OWNERS\" into main" }, { "commit": "26593afcb7fa0f8258fc50247a2d0eef4a343f82", "tree": "7f4dcde18156331bdf132641052a8f82299cf9b5", "parents": [ "134e092c9b71d8145ba8c7540bac0c392630218f" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Sun Feb 23 08:59:15 2025 -0800" }, "committer": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Sun Feb 23 08:59:19 2025 -0800" }, "message": "[owners] Remove jeffbailey@google.com from OWNERS\n\nThis suggested change is automatically generated based on group\nmemberships and affiliations.\n\nPlease approve this change and vote the highest CR. This will keep the OWNERs\nfile tidy. We ask that you do not ignore this change and approve it\nunless you know a reason the OWNER should remain. It can always be\nreverted if needed.\n\nIf this change is in error, vote the lowest CR value (i.e. reject the CL)\nand the bot will abandon it.\n\nSee the owner\u0027s recent review activity for context:\nhttps://android-review.googlesource.com/q/jeffbailey@google.com\n\nTo report an issue, file a bug in the Infra\u003eCodereview component.\n\nChange-Id: I66b446524d1096269c51b86026d5355634d168c5\n" }, { "commit": "134e092c9b71d8145ba8c7540bac0c392630218f", "tree": "27fbaaef635b28b43739d4d343b7b5e396d15a27", "parents": [ "744ba9eca02df26836b621bce43a5ef6e4509a8e", "d8ae026f3257bd640d0ae5451d2eb8e2742e60fd" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Sep 19 16:35:15 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 19 16:35:15 2019 +0000" }, "message": "Merge \"Deleted \"\u003caction android:name\u003d\"android.intent.action.SEND\" /\u003e\" in \"com.android.email.activity.ComposeActivityEmailExternal\" activity of the AndroidManifest.xml as part of cleanup.\"" }, { "commit": "d8ae026f3257bd640d0ae5451d2eb8e2742e60fd", "tree": "27fbaaef635b28b43739d4d343b7b5e396d15a27", "parents": [ "744ba9eca02df26836b621bce43a5ef6e4509a8e" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Sep 18 16:02:57 2019 -0700" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Sep 18 16:02:57 2019 -0700" }, "message": "Deleted \"\u003caction android:name\u003d\"android.intent.action.SEND\" /\u003e\" in \"com.android.email.activity.ComposeActivityEmailExternal\" activity of the AndroidManifest.xml as part of cleanup.\n\nBug: 139259734\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n$ make Email -j\n$ make EmailTests -j\n -rw-r--r-- 1 rtenneti primarygroup 6356400 Sep 18 15:32 out/target/product/marlin/testcases/Email/arm64/Email.apk\n -rw-r--r-- 1 rtenneti primarygroup 389599 Sep 18 15:32 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r -d -g out/target/product/marlin/testcases/Email/arm64/Email.apk\n$ adb install -r -d -g out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n$ adb shell am instrument -w com.android.email.tests\n Time: 3.38\n OK (157 tests)\n\n$ atest EmailTests\n com.android.email.tests (157 Tests)\n [1/157] com.android.email.DummyFlakyTest#imNotReallyFlaky: PASSED (2ms)\n ...\n [157/157] com.android.emailcommon.utility.UtilityTest#testParseEmailDateTime: PASSED (0ms)\n\n EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0\n\n All tests passed!\n\nChange-Id: Ia397eee0d9b966d7052dea5b9791ad6f351e9bb9\n" }, { "commit": "744ba9eca02df26836b621bce43a5ef6e4509a8e", "tree": "b54cd53290e4f0c8154409cdc86bf102ab93e7f5", "parents": [ "32f6fe88c334742055a5afc880b1e72308d089cc", "1c4b9bca1fbf1e791bd1c6aa567cde71fd9ef325" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Sep 18 02:10:32 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 18 02:10:32 2019 +0000" }, "message": "Merge \"AOSP/Email - Secure UPDATE_WIDGET receiver with a new permission\"" }, { "commit": "1c4b9bca1fbf1e791bd1c6aa567cde71fd9ef325", "tree": "e0c2431d98f22d6cd56e9bf917eb45d14a297153", "parents": [ "7f38a247501b3c1294f24fbd8fdaec2fcbb3022a" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Mon Sep 16 15:22:08 2019 -0700" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Mon Sep 16 15:25:35 2019 -0700" }, "message": "AOSP/Email - Secure UPDATE_WIDGET receiver with a new permission\n\nThe update methods sends a broadcast with the account name, the folder, etc.\nThis implicitly bypasses the GET_ACCOUNT permission if a third-party\napplications listens to this broadcast.\n\n- Introduce a new app permission\n- com.android.email.permission.GET_WIDGET_UPDATE\n- Now the com.android.email.permission.GET_WIDGET_UPDATE is required to\n- receive the emitted broadcast\n- Add this permission to our existing widgets.\n\nPorted changes from cr/106302205\n- added uses-permission GET_WIDGET_UPDATE, so Gmail app has the permission to receive the intent\n\nBug: 139803872\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n$ make Email -j\n$ make EmailTests -j\n -rw-r--r-- 1 rtenneti primarygroup 6356400 Sep 16 14:10 out/target/product/marlin/testcases/Email/arm64/Email.apk\n -rw-r--r-- 1 rtenneti primarygroup 389599 Sep 16 14:18 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r -d -g out/target/product/marlin/testcases/Email/arm64/Email.apk\n$ adb install -r -d -g out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n$ adb shell am instrument -w com.android.email.tests\n Time: 34.746\n OK (157 tests)\n\n$ atest EmailTests\n Summary\n -------\n EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0\n\n All tests passed!\n\n$ adb install ../security_attack/bug_139803872/poc.apk\n Captured the logcat output at rtenneti\u0027s x20web logcat.out.0916.1503\n while reproducting the steps in b/139803872#comment3\n\nChange-Id: I6eea128c20b555b38d325e3706473bb18080bedd\n" }, { "commit": "32f6fe88c334742055a5afc880b1e72308d089cc", "tree": "8a32466af797ae9bee30a797003494652bee55ad", "parents": [ "7f38a247501b3c1294f24fbd8fdaec2fcbb3022a", "37275ba2833057630de85bfa95c141ec55c6d304" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 16 22:06:03 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 16 22:06:03 2019 +0000" }, "message": "Merge \"Deleted \"\u003caction android:name\u003d\"android.intent.action.SEND_MULTIPLE\" /\u003e\" in \"com.android.email.activity.ComposeActivityEmailExternal\" activity of the AndroidManifest.xml as part of cleanup.\"" }, { "commit": "37275ba2833057630de85bfa95c141ec55c6d304", "tree": "8a32466af797ae9bee30a797003494652bee55ad", "parents": [ "7f38a247501b3c1294f24fbd8fdaec2fcbb3022a" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Mon Sep 16 10:45:52 2019 -0700" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Mon Sep 16 11:14:56 2019 -0700" }, "message": "Deleted \"\u003caction android:name\u003d\"android.intent.action.SEND_MULTIPLE\" /\u003e\" in \"com.android.email.activity.ComposeActivityEmailExternal\" activity of the AndroidManifest.xml as part of cleanup.\n\nBug: 139259734\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n$ make Email -j\n$ make EmailTests -j\n -rw-r--r-- 1 rtenneti primarygroup 6356400 Sep 16 10:59 out/target/product/marlin/testcases/Email/arm64/Email.apk\n -rw-r--r-- 1 rtenneti primarygroup 389599 Sep 16 10:57 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r -d -g out/target/product/marlin/testcases/Email/arm64/Email.apk\n$ adb install -r -d -g out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n$ adb shell am instrument -w com.android.email.tests\n Time: 10.338\n OK (157 tests)\n\n$ atest EmailTests\n Summary\n -------\n EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0\n\n All tests passed!\n\nChange-Id: Iff7a42a3248a8b45cf128d2335624fc298c8888c\n" }, { "commit": "7f38a247501b3c1294f24fbd8fdaec2fcbb3022a", "tree": "04d4361c1b9122e392190dd2c9cf7b72349c3224", "parents": [ "82f1577f479c3ccf00cc88b4d30406a253cd4b15", "700b46714c96c269f4455eaa50c399cb858e8337" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Aug 15 14:37:50 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 15 14:37:50 2019 -0700" }, "message": "Merge \"AOSP/Email and AOSP/UnfiedEmail - Added back call to uiaccounts. + Added android.permission.FOREGROUND_SERVICE for UnfiedEmail and changed the code accordingly to work with API level 28.\"\nam: 700b46714c\n\nChange-Id: I1bff1de17d751c170c9dbd228cfa1bdd3764f7c6\n" }, { "commit": "700b46714c96c269f4455eaa50c399cb858e8337", "tree": "04d4361c1b9122e392190dd2c9cf7b72349c3224", "parents": [ "81b2fb9dcc5d55a4feebb932b4f3399992bf061b", "658ec93b44283f65bb84a6efdd07943c0211e9fb" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 15 20:39:20 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 15 20:39:20 2019 +0000" }, "message": "Merge \"AOSP/Email and AOSP/UnfiedEmail - Added back call to uiaccounts. + Added android.permission.FOREGROUND_SERVICE for UnfiedEmail and changed the code accordingly to work with API level 28.\"" }, { "commit": "658ec93b44283f65bb84a6efdd07943c0211e9fb", "tree": "04d4361c1b9122e392190dd2c9cf7b72349c3224", "parents": [ "81b2fb9dcc5d55a4feebb932b4f3399992bf061b" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Aug 15 11:49:35 2019 -0700" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Aug 15 11:49:35 2019 -0700" }, "message": "AOSP/Email and AOSP/UnfiedEmail - Added back call to uiaccounts.\n+ Added android.permission.FOREGROUND_SERVICE for UnfiedEmail and changed the\n code accordingly to work with API level 28.\n\nBug: 138276176\nBug: 119499886\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n$ make UnifiedEmail -j\n$ make Email -j\n$ make EmailTests -j\n\n$ ls -l out/target/product/marlin/testcases/Email/arm64/Email.apk out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n -rw-r--r-- 1 rtenneti primarygroup 6275529 Aug 15 11:33 out/target/product/marlin/testcases/Email/arm64/Email.apk\n -rw-r--r-- 1 rtenneti primarygroup 389599 Aug 15 11:42 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r -d -g out/target/product/marlin/testcases/Email/arm64/Email.apk\n$ adb install -r -d -g out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n$ adb shell am instrument -w com.android.email.tests\n Time: 6.543\n OK (157 tests)\n\n$ atest EmailTests\n Summary\n -------\n EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0\n All tests passed!\n\nChange-Id: Idd458f575c7c4b57a35c40c2ec7b8da048fbed72\n" }, { "commit": "82f1577f479c3ccf00cc88b4d30406a253cd4b15", "tree": "db78a259ac14bf21912e611a915510b8d9285cce", "parents": [ "224142f9d3a82d2472ce909acf5a100d2e0e4229", "7ad6bd9ac5de96bde9ba9e8417210fa4977ef86a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 14 11:35:20 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 14 11:35:20 2019 -0700" }, "message": "DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master\n\nBug: 134405016\nChange-Id: I7e836f2692bac2b6bd7c5c83420fde7dfa56ffc4\n" }, { "commit": "224142f9d3a82d2472ce909acf5a100d2e0e4229", "tree": "db78a259ac14bf21912e611a915510b8d9285cce", "parents": [ "e78a404e6c328ef41bb6ce27519b0e6ba7c3f649", "81b2fb9dcc5d55a4feebb932b4f3399992bf061b" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Aug 08 21:11:09 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 08 21:11:09 2019 -0700" }, "message": "Merge \"AOSP/Email - Bumped version number to 28. Disabled notifications, uifolders and uiaccounts to make Email work with API 28.\"\nam: 81b2fb9dcc\n\nChange-Id: I7fdca51cd14c124e6c6aa9400cc0866ec1527e3c\n" }, { "commit": "81b2fb9dcc5d55a4feebb932b4f3399992bf061b", "tree": "db78a259ac14bf21912e611a915510b8d9285cce", "parents": [ "55a6b2638f6c3430118af86253d01b5b3cca7c6b", "a822d5e39d89a6b12176375ed86d2193275c6a73" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 09 03:31:50 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 09 03:31:50 2019 +0000" }, "message": "Merge \"AOSP/Email - Bumped version number to 28. Disabled notifications, uifolders and uiaccounts to make Email work with API 28.\"" }, { "commit": "a822d5e39d89a6b12176375ed86d2193275c6a73", "tree": "db78a259ac14bf21912e611a915510b8d9285cce", "parents": [ "55a6b2638f6c3430118af86253d01b5b3cca7c6b" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Aug 08 13:40:31 2019 -0700" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Aug 08 13:52:52 2019 -0700" }, "message": "AOSP/Email - Bumped version number to 28. Disabled notifications, uifolders and\nuiaccounts to make Email work with API 28.\n\nBug: 138276176\nBug: 119499886\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n$ make UnifiedEmail -j\n$ make Email -j\n$ make EmailTests -j\n$ ls -l out/target/product/marlin/testcases/Email/arm64/Email.apk out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n -rw-r--r-- 1 rtenneti primarygroup 6275529 Aug 8 13:36 out/target/product/marlin/testcases/Email/arm64/Email.apk\n -rw-r--r-- 1 rtenneti primarygroup 389599 Aug 8 13:36 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r -d -g out/target/product/marlin/testcases/Email/arm64/Email.apk\n$ adb install -r -d -g out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n$ adb shell am instrument -w com.android.email.tests\n Time: 2.482\n OK (157 tests)\n\n$ atest EmailTests\n Summary\n -------\n EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0\n\nChange-Id: I8197d2bbbe03b6c1470eee5f796087903dda6a5f\n" }, { "commit": "e78a404e6c328ef41bb6ce27519b0e6ba7c3f649", "tree": "efeaace4ed6bd1cdcf41b90560d357bf7a79fd7f", "parents": [ "8632ccf76ea1a02377c7aa32eb1932770c341a00", "55a6b2638f6c3430118af86253d01b5b3cca7c6b" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Mon Aug 05 17:33:21 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 05 17:33:21 2019 -0700" }, "message": "Merge \"AOSP/Email - Bump version number to 28 in the XML file.\"\nam: 55a6b2638f\n\nChange-Id: I7d0790633f14fac8af84778470a21c0834bd33fc\n" }, { "commit": "55a6b2638f6c3430118af86253d01b5b3cca7c6b", "tree": "efeaace4ed6bd1cdcf41b90560d357bf7a79fd7f", "parents": [ "642040ba2de9ea1a8ad967342a9c437f54b4d4a6", "5db668f9cfdaed56a3f7997c8ff28aa2a231b97a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 06 00:16:20 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 06 00:16:20 2019 +0000" }, "message": "Merge \"AOSP/Email - Bump version number to 28 in the XML file.\"" }, { "commit": "5db668f9cfdaed56a3f7997c8ff28aa2a231b97a", "tree": "efeaace4ed6bd1cdcf41b90560d357bf7a79fd7f", "parents": [ "642040ba2de9ea1a8ad967342a9c437f54b4d4a6" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Mon Aug 05 14:36:41 2019 -0700" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Mon Aug 05 21:44:32 2019 +0000" }, "message": "AOSP/Email - Bump version number to 28 in the XML file.\n\nBug: 138276176\nBug: 119499886\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n$ make UnifiedEmail -j\n$ make Email -j\n$ make EmailTests -j\n\n$ ls -l out/target/product/marlin/testcases/Email/arm64/Email.apk out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n -rw-r--r-- 1 rtenneti primarygroup 6271433 Aug 5 11:34 out/target/product/marlin/testcases/Email/arm64/Email.apk\n -rw-r--r-- 1 rtenneti primarygroup 389599 Aug 5 11:35 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r -d -g out/target/product/marlin/testcases/Email/arm64/Email.apk\n$ adb install -r -d -g out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n$ adb shell am instrument -w com.android.email.tests\n Time: 2.615\n OK (157 tests)\n\n$ atest EmailTests\n Summary\n -------\n EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0\n\nChange-Id: I74bff10c5720a0a9232bae48af25d2bf30c6b6e6\n" }, { "commit": "8632ccf76ea1a02377c7aa32eb1932770c341a00", "tree": "6dc2f06ea226a9c726d4d24a2981d2de873a397b", "parents": [ "ae3b2d85cff2366a7c8310f72812a71ae2c5ba98", "642040ba2de9ea1a8ad967342a9c437f54b4d4a6" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Sun Aug 04 01:23:03 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Aug 04 01:23:03 2019 -0700" }, "message": "Merge \"Revert \"Revert \"AOSP/Email - Bump targetSdkVersion to 28.\"\"\"\nam: 642040ba2d\n\nChange-Id: Id0f3f65a7446f6db68b99bb52ec9982cba9c2ef0\n" }, { "commit": "ae3b2d85cff2366a7c8310f72812a71ae2c5ba98", "tree": "7a11d03d29777691f30efb4f2f180e5705bc4d4f", "parents": [ "2bf0c18734dbef08d63af62e9407cf4a4bae61f1", "4aa6a5ecd0db7b8232798c44610969ae711aea9a" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Sun Aug 04 00:55:31 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Aug 04 00:55:31 2019 -0700" }, "message": "Merge \"Revert \"Revert \"AOSP/Email - Changes for code to work with UnifiedEmail\u0027s version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService.\"\"\"\nam: 4aa6a5ecd0\n\nChange-Id: I24371b1b6b53700dd1e525f4f7972ac428c3976e\n" }, { "commit": "642040ba2de9ea1a8ad967342a9c437f54b4d4a6", "tree": "6dc2f06ea226a9c726d4d24a2981d2de873a397b", "parents": [ "4aa6a5ecd0db7b8232798c44610969ae711aea9a", "79e320aa5912c436f08b914f46b8d9283e2ab00c" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Sat Aug 03 02:10:09 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Aug 03 02:10:09 2019 +0000" }, "message": "Merge \"Revert \"Revert \"AOSP/Email - Bump targetSdkVersion to 28.\"\"\"" }, { "commit": "4aa6a5ecd0db7b8232798c44610969ae711aea9a", "tree": "7a11d03d29777691f30efb4f2f180e5705bc4d4f", "parents": [ "326f09fa687dabb3a99bd5d07e4777fdf8e88cad", "f179ed014696868837a0792bc27d4aae83bc9e00" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Sat Aug 03 02:09:48 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Aug 03 02:09:48 2019 +0000" }, "message": "Merge \"Revert \"Revert \"AOSP/Email - Changes for code to work with UnifiedEmail\u0027s version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService.\"\"\"" }, { "commit": "79e320aa5912c436f08b914f46b8d9283e2ab00c", "tree": "d84f034d70f85fc4ccc9b68b5813c6e1c42ecb16", "parents": [ "18f04be2a68d433da1a9f9f38dfe792fb43be498" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Aug 02 22:57:20 2019 +0000" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Aug 02 22:57:20 2019 +0000" }, "message": "Revert \"Revert \"AOSP/Email - Bump targetSdkVersion to 28.\"\"\n\nThis reverts commit 18f04be2a68d433da1a9f9f38dfe792fb43be498.\n\nReason for revert: Email app needs to target API level 28+ \nBug: 138276176\nBug: 119499886\n\nChange-Id: Id46c0c0379bd1bd35023cbd9325d42d090187725\n" }, { "commit": "f179ed014696868837a0792bc27d4aae83bc9e00", "tree": "f8d31801a4f109df19faba5f1831da14e72a0dad", "parents": [ "249fc8ff5d78ed27387d5adc86770ffc1768a857" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Aug 02 22:54:36 2019 +0000" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Aug 02 22:54:36 2019 +0000" }, "message": "Revert \"Revert \"AOSP/Email - Changes for code to work with UnifiedEmail\u0027s version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService.\"\"\n\nThis reverts commit 249fc8ff5d78ed27387d5adc86770ffc1768a857.\n\nReason for revert: Email app needs to target API level 28+ \nBug: 138276176\nBug: 119499886\n\nChange-Id: I8f47f809b1cdc2048fc613b819938a88a9588978\n" }, { "commit": "2bf0c18734dbef08d63af62e9407cf4a4bae61f1", "tree": "eee94d42cfff847c4a98b6cecbe035fd49e01715", "parents": [ "2a381e92877720825789adcaa1ba3290b7f98049", "326f09fa687dabb3a99bd5d07e4777fdf8e88cad" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Jul 24 01:25:18 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 24 01:25:18 2019 -0700" }, "message": "Merge \"Remove build-time dep on opt-datetimepicker\"\nam: 326f09fa68\n\nChange-Id: Ic786f77889377f3d61433794a65d19f82474f0a9\n" }, { "commit": "326f09fa687dabb3a99bd5d07e4777fdf8e88cad", "tree": "eee94d42cfff847c4a98b6cecbe035fd49e01715", "parents": [ "849ada38dce245505cd8485138943c387466b400", "b17e5376d160ee27507022e69d727b77eefc6d5e" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Jul 24 07:53:31 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 24 07:53:31 2019 +0000" }, "message": "Merge \"Remove build-time dep on opt-datetimepicker\"" }, { "commit": "b17e5376d160ee27507022e69d727b77eefc6d5e", "tree": "eee94d42cfff847c4a98b6cecbe035fd49e01715", "parents": [ "849ada38dce245505cd8485138943c387466b400" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 23 09:47:02 2019 +0100" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 23 09:47:02 2019 +0100" }, "message": "Remove build-time dep on opt-datetimepicker\n\nRemove build-time dep on opt-datetimepicker from\nthe Email app. The dependency appears to be unnecessary.\n\nBug: 16550209\nTest: build only\nChange-Id: I64ab23a5ffbd4e9f706fb77f87d764739aaeb460\n" }, { "commit": "7ad6bd9ac5de96bde9ba9e8417210fa4977ef86a", "tree": "8c33dc0412b80051da53a3ec464b44c7904d1f6e", "parents": [ "faf818c7278f67dbe01ae65eb5bbb8d3ecd15fba", "2a381e92877720825789adcaa1ba3290b7f98049" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Jul 03 16:37:58 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 03 16:37:58 2019 -0700" }, "message": "Merge \"AOSP/Email -Added TEST_MAPPING file and \"LOCAL_COMPATIBILITY_SUITE :\u003d device-tests\" to enable presubmit tests for Email.\" am: 849ada38dc\nam: 2a381e9287\n\nChange-Id: I2c55389c5dfa88eba041c5c9a21df52b56d9f548\n" }, { "commit": "faf818c7278f67dbe01ae65eb5bbb8d3ecd15fba", "tree": "c7e68d9fc673fc4a767805c449fdb781d2006fe4", "parents": [ "899a5aec2bb15ec2da6538a78c699acc74c9c43d", "4c3dc8daa55b8dc07a36275c48ec7d64d2635170" ], "author": { "name": "Brett Chabot", "email": "brettchabot@google.com", "time": "Wed Jul 03 16:32:59 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 03 16:32:59 2019 -0700" }, "message": "[automerger skipped] Merge \"Migrate packages/apps/Email to androidx.test\" am: 2fe2bc7ebc -s ours\nam: 4c3dc8daa5 -s ours\nam skip reason: change_id Id4f25bf324a564afbaf9c726ea97fa33074d8660 with SHA1 29260c13d9 is in history\n\nChange-Id: I60e369d5efbd2766a75fe2755cfc8e80a010872a\n" }, { "commit": "2a381e92877720825789adcaa1ba3290b7f98049", "tree": "8c33dc0412b80051da53a3ec464b44c7904d1f6e", "parents": [ "4c3dc8daa55b8dc07a36275c48ec7d64d2635170", "849ada38dce245505cd8485138943c387466b400" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Jul 03 16:28:39 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 03 16:28:39 2019 -0700" }, "message": "Merge \"AOSP/Email -Added TEST_MAPPING file and \"LOCAL_COMPATIBILITY_SUITE :\u003d device-tests\" to enable presubmit tests for Email.\"\nam: 849ada38dc\n\nChange-Id: Ied2a18348ca33cdf26b82be2a21a2205a2c62433\n" }, { "commit": "4c3dc8daa55b8dc07a36275c48ec7d64d2635170", "tree": "c7e68d9fc673fc4a767805c449fdb781d2006fe4", "parents": [ "899a5aec2bb15ec2da6538a78c699acc74c9c43d", "2fe2bc7ebcc0b47bff169a8cfbde43675da258b9" ], "author": { "name": "Brett Chabot", "email": "brettchabot@google.com", "time": "Wed Jul 03 16:21:02 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 03 16:21:02 2019 -0700" }, "message": "[automerger skipped] Merge \"Migrate packages/apps/Email to androidx.test\"\nam: 2fe2bc7ebc -s ours\nam skip reason: change_id Id4f25bf324a564afbaf9c726ea97fa33074d8660 with SHA1 29260c13d9 is in history\n\nChange-Id: I9470247ec93c7e0adf007d77a192c5ccba3d154b\n" }, { "commit": "849ada38dce245505cd8485138943c387466b400", "tree": "8c33dc0412b80051da53a3ec464b44c7904d1f6e", "parents": [ "2fe2bc7ebcc0b47bff169a8cfbde43675da258b9", "2c3c04f973d40d4f178d75a7cce0a92e02461c67" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 03 00:24:08 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 03 00:24:08 2019 +0000" }, "message": "Merge \"AOSP/Email -Added TEST_MAPPING file and \"LOCAL_COMPATIBILITY_SUITE :\u003d device-tests\" to enable presubmit tests for Email.\"" }, { "commit": "2c3c04f973d40d4f178d75a7cce0a92e02461c67", "tree": "8c33dc0412b80051da53a3ec464b44c7904d1f6e", "parents": [ "2fe2bc7ebcc0b47bff169a8cfbde43675da258b9" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Jun 28 14:58:44 2019 -0700" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jul 02 13:41:32 2019 -0700" }, "message": "AOSP/Email -Added TEST_MAPPING file and \"LOCAL_COMPATIBILITY_SUITE :\u003d device-tests\" to enable presubmit tests for Email.\n\nBug: 127848297\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n$ make EmailTests -j\n\n$ find out -name \"Email*apk\" -print -exec ls -l {} \\;\n out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n -rw-r--r-- 1 rtenneti primarygroup 397791 Jul 2 11:24 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n out/target/product/marlin/testcases/Email/arm64/Email.apk\n -rw-r--r-- 1 rtenneti primarygroup 6367434 Jul 1 13:15 out/target/product/marlin/testcases/Email/arm64/Email.apk\n\n$ adb install -r out/target/product/marlin/testcases/Email/arm64/Email.apk\n$ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb shell am instrument -w com.android.email.tests\n Time: 34.632\n OK (157 tests)\n\n$ atest EmailTests\n ...\n [100% 10/10] Copy: out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n 2019-07-02 11:29:03 atest_utils.py:164:INFO: Build successful\n\n Running Tests...\n\n EmailTests (157 Tests)\n ---------------------\n [1/157] com.android.email.DummyFlakyTest#imNotReallyFlaky: PASSED (1ms)\n ...\n [157/157] com.android.emailcommon.utility.UtilityTest#testParseEmailDateTime: PASSED (0ms)\n\n Summary\n -------\n EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0\n\n All tests passed!\n\nChange-Id: I5bacfbf4178d3859a3f6541c45fad52111385268\n" }, { "commit": "2fe2bc7ebcc0b47bff169a8cfbde43675da258b9", "tree": "c7e68d9fc673fc4a767805c449fdb781d2006fe4", "parents": [ "406e26177c5145f6769efd5fb69adbb3cd5ff092", "eaa57c0971ea6a5dc0269be25aa6fad4b697016c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jul 02 20:07:13 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 02 20:07:13 2019 +0000" }, "message": "Merge \"Migrate packages/apps/Email to androidx.test\"" }, { "commit": "eaa57c0971ea6a5dc0269be25aa6fad4b697016c", "tree": "c7e68d9fc673fc4a767805c449fdb781d2006fe4", "parents": [ "406e26177c5145f6769efd5fb69adbb3cd5ff092" ], "author": { "name": "Brett Chabot", "email": "brettchabot@google.com", "time": "Thu Dec 13 19:06:38 2018 -0800" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jul 02 12:07:27 2019 -0700" }, "message": "Migrate packages/apps/Email to androidx.test\n\nSee go/jetpack-test-android-migration\n\nTest: make checkbuild\nChange-Id: Id4f25bf324a564afbaf9c726ea97fa33074d8660\nMerged-In: Id4f25bf324a564afbaf9c726ea97fa33074d8660\n" }, { "commit": "899a5aec2bb15ec2da6538a78c699acc74c9c43d", "tree": "c7e68d9fc673fc4a767805c449fdb781d2006fe4", "parents": [ "1c6c477857f9ec005b4812fa1154ad2f51420737", "79e6f5d3ba8951accb863821bd9f9ed604a30083" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jul 01 20:59:58 2019 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jul 01 20:59:58 2019 +0000" }, "message": "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master\n\nBug: 134405016\nChange-Id: Ic54a94cc989ba8cba2134fed28de171df5dd1cb2\n" }, { "commit": "79e6f5d3ba8951accb863821bd9f9ed604a30083", "tree": "c7e68d9fc673fc4a767805c449fdb781d2006fe4", "parents": [ "1c7ce9197c5dedd618d769fdf77b8c324bf958e1", "e24a947615b28cc3e81170ccd90f2c24688df96e" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Jun 28 20:19:31 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 28 20:19:31 2019 -0700" }, "message": "[automerger skipped] [automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba am: 6b22b904fb am: ae61fe4c0a am: 721f9c585c am: 56b7e4558e am: e19a81b20c am: 7de20326e9 -s ours\nam: e24a947615 -s ours\nam skip reason: change_id Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283 with SHA1 bb50c5de8f is in history\n\nChange-Id: Ief5833cd19c9aaae022ee1695027732786cc5b1a\n" }, { "commit": "e24a947615b28cc3e81170ccd90f2c24688df96e", "tree": "c2ebc59cd52f241eab06152d62db4f5da820bb37", "parents": [ "0d80873160283b6ab6ed3278e252e84d98487d99", "7de20326e9f0e8f868f748531fe3cba4af0898bb" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Jun 28 19:52:42 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 28 19:52:42 2019 -0700" }, "message": "[automerger skipped] [automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba am: 6b22b904fb am: ae61fe4c0a am: 721f9c585c am: 56b7e4558e am: e19a81b20c\nam: 7de20326e9 -s ours\nam skip reason: change_id Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283 with SHA1 c504e21a11 is in history\n\nChange-Id: I90f4b840c74eb21c6a621d7352c7dc5852b505c8\n" }, { "commit": "7de20326e9f0e8f868f748531fe3cba4af0898bb", "tree": "e5d1028504073837a0a6ffd4d87364abb7c315fc", "parents": [ "800736df79e6a8296220ed84740ec54303bc7bac", "e19a81b20c7842191763160bc6482efe15312b3f" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Jun 28 19:23:27 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 28 19:23:27 2019 -0700" }, "message": "[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba am: 6b22b904fb am: ae61fe4c0a am: 721f9c585c am: 56b7e4558e\nam: e19a81b20c\n\nChange-Id: I8813892688a97bad04e9c57833e23203bcace2a7\n" }, { "commit": "e19a81b20c7842191763160bc6482efe15312b3f", "tree": "37701a32055d295609ff8bc2c858e6e29f9ba5f2", "parents": [ "86e89cca74e1383585e410338bd7cb0f9a688720", "56b7e4558e3f4830965b884e410d1c8386794a67" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Jun 28 18:36:53 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 28 18:36:53 2019 -0700" }, "message": "[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba am: 6b22b904fb am: ae61fe4c0a am: 721f9c585c\nam: 56b7e4558e\n\nChange-Id: Ifaff3cf9dc4c441f8d20fad8e112e705ce2d81a1\n" }, { "commit": "56b7e4558e3f4830965b884e410d1c8386794a67", "tree": "37701a32055d295609ff8bc2c858e6e29f9ba5f2", "parents": [ "f7005dabcddf646f3ff22685f12affbb91e5a6f0", "721f9c585cc8b4cfda0e3341792d65add4d20b58" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Jun 28 17:55:34 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 28 17:55:34 2019 -0700" }, "message": "[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba am: 6b22b904fb am: ae61fe4c0a\nam: 721f9c585c\n\nChange-Id: Idbfd7118d1cce7ee48e17f7d8cfe51aeb9ade265\n" }, { "commit": "1c7ce9197c5dedd618d769fdf77b8c324bf958e1", "tree": "c7e68d9fc673fc4a767805c449fdb781d2006fe4", "parents": [ "c153ea70cfcae16b6964a9f694a1678e8cd681b4", "0d80873160283b6ab6ed3278e252e84d98487d99" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri Jun 28 07:33:02 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 28 07:33:02 2019 -0700" }, "message": "[automerger skipped] Merge \"Revert \"AOSP/Email - Changes for code to work with UnifiedEmail\u0027s version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService.\"\" into qt-dev\nam: 0d80873160 -s ours\nam skip reason: change_id If97049cb5238a8a56caddb39827b177882c3c74d with SHA1 249fc8ff5d is in history\n\nChange-Id: Ie0a7a4645acdcd9dc50817a7c53a1c11a6fb6a31\n" }, { "commit": "0d80873160283b6ab6ed3278e252e84d98487d99", "tree": "c2ebc59cd52f241eab06152d62db4f5da820bb37", "parents": [ "af3a1fc9f944c4abce88bc4271e9140276a8442e", "883f025edc30febb9e439fd1430758f5eab4cf2f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 28 10:03:36 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 28 10:03:36 2019 +0000" }, "message": "Merge \"Revert \"AOSP/Email - Changes for code to work with UnifiedEmail\u0027s version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService.\"\" into qt-dev" }, { "commit": "c153ea70cfcae16b6964a9f694a1678e8cd681b4", "tree": "c7e68d9fc673fc4a767805c449fdb781d2006fe4", "parents": [ "1620a44e4220568d3b7c97cda0b3e1c0347abcfb", "af3a1fc9f944c4abce88bc4271e9140276a8442e" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Jun 27 18:22:38 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 27 18:22:38 2019 -0700" }, "message": "[automerger skipped] Merge \"Revert \"AOSP/Email - Bump targetSdkVersion to 28.\"\" into qt-dev\nam: af3a1fc9f9 -s ours\nam skip reason: change_id I66beb67a7bb74bd272c65777adbcd1f8d0d12835 with SHA1 18f04be2a6 is in history\n\nChange-Id: I757e7d3327ea744919c922c5cdd1938e9ad14029\n" }, { "commit": "af3a1fc9f944c4abce88bc4271e9140276a8442e", "tree": "1e0a50436514a4cb89e8456a6c233aff162833e7", "parents": [ "c504e21a118f30955ff0df81ead92313767bc0ab", "0e52fa5ed409cec374f28545f6420edde6fcb8db" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 28 00:49:06 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 28 00:49:06 2019 +0000" }, "message": "Merge \"Revert \"AOSP/Email - Bump targetSdkVersion to 28.\"\" into qt-dev" }, { "commit": "883f025edc30febb9e439fd1430758f5eab4cf2f", "tree": "fa687adf5508375f3abcb3158339c324e753459e", "parents": [ "c504e21a118f30955ff0df81ead92313767bc0ab" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 21:44:53 2019 +0000" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Jun 27 15:04:36 2019 -0700" }, "message": "Revert \"AOSP/Email - Changes for code to work with UnifiedEmail\u0027s version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService.\"\n\nThis reverts commit 1189cb8b2b2e1cc1fae89112351e6a0b9a8f7c33.\n\nReason for revert: No notification when new email arrived\nBug: 132923014\n\nCherry picking: https://android-review.googlesource.com/c/platform/packages/apps/Email/+/991656\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI for notifications.\n\n$ make -j 40\n$ make EmailTests -j\n$ adb install -r out/target/product/marlin/system/product/app/Email/Email.apk\n$ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n$ adb shell am instrument -w com.android.email.tests\n Time: 2.986\n OK (157 tests)\n\nChange-Id: If97049cb5238a8a56caddb39827b177882c3c74d\nMerged-In: If97049cb5238a8a56caddb39827b177882c3c74d\n" }, { "commit": "0e52fa5ed409cec374f28545f6420edde6fcb8db", "tree": "9f5c5bd93a488ab3a54c83e25c8e1e62e179159a", "parents": [ "658dc5b8e9ee47f547a4cf37ce696c70359e1ee9" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 21:44:07 2019 +0000" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Jun 27 21:57:21 2019 +0000" }, "message": "Revert \"AOSP/Email - Bump targetSdkVersion to 28.\"\n\nThis reverts commit 62359082b83b870195f7899bd33d3d86d1830988.\n\nReason for revert: No notification when new email arrived.\nBug: 132923014\n\nCherry-picking https://android-review.googlesource.com/c/platform/packages/apps/Email/+/992814\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI for notifications.\n\n$ make -j 40\n$ make EmailTests -j\n$ adb install -r out/target/product/marlin/system/product/app/Email/Email.apk\n$ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n$ adb shell am instrument -w com.android.email.tests\n Time: 2.986\n OK (157 tests)\n\nChange-Id: I66beb67a7bb74bd272c65777adbcd1f8d0d12835\nMerged-In: I66beb67a7bb74bd272c65777adbcd1f8d0d12835\n" }, { "commit": "1620a44e4220568d3b7c97cda0b3e1c0347abcfb", "tree": "c7e68d9fc673fc4a767805c449fdb781d2006fe4", "parents": [ "c1a9f3f76a66febe9c16c0f2e090971524f50e35", "c504e21a118f30955ff0df81ead92313767bc0ab" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Thu Jun 27 11:53:46 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 27 11:53:46 2019 -0700" }, "message": "[automerger skipped] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException.\nam: c504e21a11 -s ours\nam skip reason: change_id Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283 with SHA1 bb50c5de8f is in history\n\nChange-Id: I65031a628faf9a3c51c5b9ef671392378c7d9764\n" }, { "commit": "721f9c585cc8b4cfda0e3341792d65add4d20b58", "tree": "568664a63e552ff22841e3d735c12246ee51e624", "parents": [ "ef35412cb61ad47d064936a0e69e59333c15eaea", "ae61fe4c0a538f54cdf54a9a3a51b78468deae19" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Jun 27 18:14:44 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Jun 27 18:14:44 2019 +0000" }, "message": "[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba am: 6b22b904fb am: ae61fe4c0a\n\nChange-Id: I8dccbfc8337c888bbf7b4ba9079cc86d7b422b10\n" }, { "commit": "ae61fe4c0a538f54cdf54a9a3a51b78468deae19", "tree": "5a00d2332c6dc3e8ce8aacfa29c6ad7b722dda10", "parents": [ "30a7c1118cdcebd27902ef76f8facc379a4484d6", "6b22b904fb254026e6174c9ecc097f0b436bfea8" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Jun 27 18:14:42 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Jun 27 18:14:42 2019 +0000" }, "message": "[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba am: 6b22b904fb\n\nChange-Id: Icacd7fbf2983015e25ec9f46d55c5d90cf6dd58d\n" }, { "commit": "6b22b904fb254026e6174c9ecc097f0b436bfea8", "tree": "5a00d2332c6dc3e8ce8aacfa29c6ad7b722dda10", "parents": [ "33587b4e1dd2850e30c35aee0e195a0cae492b68", "c2b3e391ba498420435f504158c2c1b3a05fbec0" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Jun 27 18:14:40 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Jun 27 18:14:40 2019 +0000" }, "message": "[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba\n\nChange-Id: I613fd5a4a3ec359707812e08e90eda213d4f7b0b\n" }, { "commit": "c2b3e391ba498420435f504158c2c1b3a05fbec0", "tree": "5a00d2332c6dc3e8ce8aacfa29c6ad7b722dda10", "parents": [ "34534259def64303aef2facff76ddc295aacc91c", "f384b385eac49b54b94d916d15c4c4d3b13d0dcb" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Jun 27 18:14:38 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Jun 27 18:14:38 2019 +0000" }, "message": "[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea\n\nChange-Id: Id1d2ee833eb24017122dd6f1c5e0c0489a1531fa\n" }, { "commit": "f384b385eac49b54b94d916d15c4c4d3b13d0dcb", "tree": "5a00d2332c6dc3e8ce8aacfa29c6ad7b722dda10", "parents": [ "2f17f9f0182396b73032870556debde93ac725fc", "3150b66305bea67a83ce289c42c85efc669088d3" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Jun 27 18:14:35 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Jun 27 18:14:35 2019 +0000" }, "message": "[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException. am: 3150b66305\n\nChange-Id: I7414816da3c0dca218de3e2c8fbd3427bb31af92\n" }, { "commit": "3150b66305bea67a83ce289c42c85efc669088d3", "tree": "5a00d2332c6dc3e8ce8aacfa29c6ad7b722dda10", "parents": [ "e81f6f92bbdd43f34aa25fc2b7605aeb887af2cc" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 18:04:39 2019 -0700" }, "committer": { "name": "Bryan Ferris", "email": "bferris@google.com", "time": "Thu Jun 27 18:14:33 2019 +0000" }, "message": "AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException.\n\n+ Added \"originalExtras \u003d new Bundle();\" change from cl/247540041\n\nBug: 135889250\nBug: 127320867\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n -rw-r--r-- 1 rtenneti primarygroup 6371530 Jun 25 17:23 out/target/product/marlin/system/product/app/Email/Email.apk\n\n$ make EmailTests -j\n -rw-r--r-- 1 rtenneti primarygroup 365023 Jun 25 17:49 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r out/target/product/marlin/system/product/app/Email/Email.apk\n\n$ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb shell am instrument -w com.android.email.tests\n Time: 2.986\n OK (157 tests)\n\nChange-Id: Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283\nMerged-In: Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283\n" }, { "commit": "c504e21a118f30955ff0df81ead92313767bc0ab", "tree": "27a410a59bf7380bd183ad87f13dd2cef81f5a44", "parents": [ "658dc5b8e9ee47f547a4cf37ce696c70359e1ee9" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 18:04:39 2019 -0700" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Jun 26 23:35:27 2019 +0000" }, "message": "AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException.\n\n+ Added \"originalExtras \u003d new Bundle();\" change from cl/247540041\n\nBug: 135889250\nBug: 127320867\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n -rw-r--r-- 1 rtenneti primarygroup 6371530 Jun 25 17:23 out/target/product/marlin/system/product/app/Email/Email.apk\n\n$ make EmailTests -j\n -rw-r--r-- 1 rtenneti primarygroup 365023 Jun 25 17:49 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r out/target/product/marlin/system/product/app/Email/Email.apk\n\n$ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb shell am instrument -w com.android.email.tests\n Time: 2.986\n OK (157 tests)\n\nChange-Id: Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283\nMerged-In: Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283\n" }, { "commit": "c1a9f3f76a66febe9c16c0f2e090971524f50e35", "tree": "c7e68d9fc673fc4a767805c449fdb781d2006fe4", "parents": [ "a4f02a5f00f8ccb0dbcb797d0a8e7efad4d9459b", "1c6c477857f9ec005b4812fa1154ad2f51420737" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Jun 26 14:04:26 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 26 14:04:26 2019 -0700" }, "message": "Merge \"Revert \"AOSP/Email - Changes for code to work with UnifiedEmail\u0027s version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService.\"\" am: 406e26177c\nam: 1c6c477857\n\nChange-Id: I86f4dba3fdfce04e07e9c6784d0951fef91a8ef5\n" }, { "commit": "1c6c477857f9ec005b4812fa1154ad2f51420737", "tree": "d8f4141c7c1972acbc43ced6d654aa79c01d4c86", "parents": [ "adadbd5435abb8853d0e6d6db6353fdea0019290", "406e26177c5145f6769efd5fb69adbb3cd5ff092" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Jun 26 13:54:21 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 26 13:54:21 2019 -0700" }, "message": "Merge \"Revert \"AOSP/Email - Changes for code to work with UnifiedEmail\u0027s version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService.\"\"\nam: 406e26177c\n\nChange-Id: I071e330ec859050659f5bb11290dabbf4189e72f\n" }, { "commit": "406e26177c5145f6769efd5fb69adbb3cd5ff092", "tree": "d8f4141c7c1972acbc43ced6d654aa79c01d4c86", "parents": [ "ba4e097290fa78ec94b271826af4b04ba478ad01", "249fc8ff5d78ed27387d5adc86770ffc1768a857" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 26 20:38:19 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 26 20:38:19 2019 +0000" }, "message": "Merge \"Revert \"AOSP/Email - Changes for code to work with UnifiedEmail\u0027s version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService.\"\"" }, { "commit": "a4f02a5f00f8ccb0dbcb797d0a8e7efad4d9459b", "tree": "4b2c4df36cfab8a0071f145831a4f9e1d4eb7354", "parents": [ "9218fcd9380470b2e539c591bc04dedebb396e56", "adadbd5435abb8853d0e6d6db6353fdea0019290" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Jun 26 12:55:17 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 26 12:55:17 2019 -0700" }, "message": "Merge \"AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException.\" am: ba4e097290\nam: adadbd5435\n\nChange-Id: I080fbe70c9f67c6b3a9db0f9a6c6c67e7990261e\n" }, { "commit": "adadbd5435abb8853d0e6d6db6353fdea0019290", "tree": "f8d31801a4f109df19faba5f1831da14e72a0dad", "parents": [ "e8564c8e229aaf2a81f477a579e61dfc3c6c24cc", "ba4e097290fa78ec94b271826af4b04ba478ad01" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Jun 26 12:26:09 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 26 12:26:09 2019 -0700" }, "message": "Merge \"AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException.\"\nam: ba4e097290\n\nChange-Id: Ie47a1eeacf08121783ba81f06bb54519e305aa5b\n" }, { "commit": "249fc8ff5d78ed27387d5adc86770ffc1768a857", "tree": "d8f4141c7c1972acbc43ced6d654aa79c01d4c86", "parents": [ "ba4e097290fa78ec94b271826af4b04ba478ad01" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 21:44:53 2019 +0000" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Wed Jun 26 18:42:44 2019 +0000" }, "message": "Revert \"AOSP/Email - Changes for code to work with UnifiedEmail\u0027s version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService.\"\n\nThis reverts commit 1189cb8b2b2e1cc1fae89112351e6a0b9a8f7c33.\n\nReason for revert: No notification when new email arrived Bug: 132923014\n\nChange-Id: If97049cb5238a8a56caddb39827b177882c3c74d\n" }, { "commit": "9218fcd9380470b2e539c591bc04dedebb396e56", "tree": "7f21e756494c24f3d8d03896618f9eb3eef54a5f", "parents": [ "4e487dd2902d7d706265722d4383c1bc83023fec", "e8564c8e229aaf2a81f477a579e61dfc3c6c24cc" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 26 11:41:34 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 26 11:41:34 2019 -0700" }, "message": "Merge \"Pass --legacy to aapt2 compile for Email\" am: 89fc76897d\nam: e8564c8e22\n\nChange-Id: I0330525a6f7bf6914198105ce36203642943ae0b\n" }, { "commit": "ba4e097290fa78ec94b271826af4b04ba478ad01", "tree": "f8d31801a4f109df19faba5f1831da14e72a0dad", "parents": [ "89fc76897d8605c18eff386cc990a4618bd49154", "bb50c5de8fdf55d48d915eb37ab22ffe3f783028" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 26 18:32:29 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 26 18:32:29 2019 +0000" }, "message": "Merge \"AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException.\"" }, { "commit": "e8564c8e229aaf2a81f477a579e61dfc3c6c24cc", "tree": "4982e2c3e4a35e5cb9b6964acbaecc05505f61e8", "parents": [ "1bf17398f239b580a978b8ae1367b76170122793", "89fc76897d8605c18eff386cc990a4618bd49154" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 26 11:05:42 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 26 11:05:42 2019 -0700" }, "message": "Merge \"Pass --legacy to aapt2 compile for Email\"\nam: 89fc76897d\n\nChange-Id: Ib1de2f26f4700f3abe9f0508b595d057cde17166\n" }, { "commit": "89fc76897d8605c18eff386cc990a4618bd49154", "tree": "4982e2c3e4a35e5cb9b6964acbaecc05505f61e8", "parents": [ "daa93cd7ea3901e69ec234b43eefbf68cffe6515", "a6a6894252676287e62f4153eba066c9d5f5368c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 26 17:05:33 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 26 17:05:33 2019 +0000" }, "message": "Merge \"Pass --legacy to aapt2 compile for Email\"" }, { "commit": "4e487dd2902d7d706265722d4383c1bc83023fec", "tree": "b4feff9a600f85f81e2603156618a799db15675e", "parents": [ "3e0e8b964a61a251b3a2494ff82a3b8a6768f3ad", "1bf17398f239b580a978b8ae1367b76170122793" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Jun 25 20:49:20 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 25 20:49:20 2019 -0700" }, "message": "Merge \"Fix Email tests on userdebug builds.\" am: daa93cd7ea\nam: 1bf17398f2\n\nChange-Id: I75315ce54d14691a02dff446c142529a15f20eb3\n" }, { "commit": "1bf17398f239b580a978b8ae1367b76170122793", "tree": "228e176c551f354a554675cadb8d3df7cb11a7f8", "parents": [ "72a9ebeeb4b142f1ff46598bc1323fc9ef88d640", "daa93cd7ea3901e69ec234b43eefbf68cffe6515" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Jun 25 20:15:17 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 25 20:15:17 2019 -0700" }, "message": "Merge \"Fix Email tests on userdebug builds.\"\nam: daa93cd7ea\n\nChange-Id: I0a2f0ff3bc215947585e09573af985f924e4ce9a\n" }, { "commit": "daa93cd7ea3901e69ec234b43eefbf68cffe6515", "tree": "228e176c551f354a554675cadb8d3df7cb11a7f8", "parents": [ "b0378c8a93d1a7bb87dd3b6c043c6acd2abfeebb", "4a4928c9287ee6aa74910c3ed187d0b362283a1b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 26 02:54:24 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 26 02:54:24 2019 +0000" }, "message": "Merge \"Fix Email tests on userdebug builds.\"" }, { "commit": "3e0e8b964a61a251b3a2494ff82a3b8a6768f3ad", "tree": "fecee36383db82265285361f5f601985fe584432", "parents": [ "286d65829abf95216f1a92163c812fc7759fc7a7", "72a9ebeeb4b142f1ff46598bc1323fc9ef88d640" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 18:54:50 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 25 18:54:50 2019 -0700" }, "message": "Merge \"Revert \"AOSP/Email - Bump targetSdkVersion to 28.\"\" am: b0378c8a93\nam: 72a9ebeeb4\n\nChange-Id: I296357631a0f607b0ab16c2c5aa635483e901e8e\n" }, { "commit": "72a9ebeeb4b142f1ff46598bc1323fc9ef88d640", "tree": "a8102c9899d0f6834808dd29415ce8e387094b97", "parents": [ "8fe84dae8375951b78d44343bc2733f55da7b6e8", "b0378c8a93d1a7bb87dd3b6c043c6acd2abfeebb" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 18:36:13 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 25 18:36:13 2019 -0700" }, "message": "Merge \"Revert \"AOSP/Email - Bump targetSdkVersion to 28.\"\"\nam: b0378c8a93\n\nChange-Id: Idae36181905e3ee9a11ff562f7e97595a70f5031\n" }, { "commit": "4a4928c9287ee6aa74910c3ed187d0b362283a1b", "tree": "59dca2f0075abc0492de29648600e134d84d2816", "parents": [ "2d6b39e6cc1100792bff9582c7f6782e37e7838f" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Jun 25 18:13:44 2019 -0700" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Jun 25 18:18:20 2019 -0700" }, "message": "Fix Email tests on userdebug builds.\n\nRemove the \"if\" that applies proguard-test.flags only to eng builds.\n\nTest: Used atest and \u0027adb shell am...\u0027 all 157 tests pass.\n\nChange-Id: I08563ccf39d34a0a2d10295659b1f8d7c243c4a1\n" }, { "commit": "b0378c8a93d1a7bb87dd3b6c043c6acd2abfeebb", "tree": "a8102c9899d0f6834808dd29415ce8e387094b97", "parents": [ "2d6b39e6cc1100792bff9582c7f6782e37e7838f", "18f04be2a68d433da1a9f9f38dfe792fb43be498" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 26 01:14:40 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 26 01:14:40 2019 +0000" }, "message": "Merge \"Revert \"AOSP/Email - Bump targetSdkVersion to 28.\"\"" }, { "commit": "bb50c5de8fdf55d48d915eb37ab22ffe3f783028", "tree": "68b007664c26be86570eb60924be0b4b685fe1ad", "parents": [ "2d6b39e6cc1100792bff9582c7f6782e37e7838f" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 18:04:39 2019 -0700" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 18:04:39 2019 -0700" }, "message": "AOSP/Email - Create an empty Bundle if originalExtras doesn\u0027t exit. Backporting the fix to fix NullPointerException.\n\n+ Added \"originalExtras \u003d new Bundle();\" change from cl/247540041\n\nBug: 135889250\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n -rw-r--r-- 1 rtenneti primarygroup 6371530 Jun 25 17:23 out/target/product/marlin/system/product/app/Email/Email.apk\n\n$ make EmailTests -j\n -rw-r--r-- 1 rtenneti primarygroup 365023 Jun 25 17:49 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r out/target/product/marlin/system/product/app/Email/Email.apk\n\n$ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb shell am instrument -w com.android.email.tests\n Time: 2.986\n OK (157 tests)\n\nChange-Id: Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283\n" }, { "commit": "18f04be2a68d433da1a9f9f38dfe792fb43be498", "tree": "92f1a1b51ce893bc0605e7c97cd2f1818ff3be8f", "parents": [ "62359082b83b870195f7899bd33d3d86d1830988" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 21:44:07 2019 +0000" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue Jun 25 21:44:07 2019 +0000" }, "message": "Revert \"AOSP/Email - Bump targetSdkVersion to 28.\"\n\nThis reverts commit 62359082b83b870195f7899bd33d3d86d1830988.\n\nReason for revert: No notification when new email arrived Bug: 132923014\n\nChange-Id: I66beb67a7bb74bd272c65777adbcd1f8d0d12835\n" }, { "commit": "a6a6894252676287e62f4153eba066c9d5f5368c", "tree": "81d1c9091baa8ac942fbff57bfad17745eb18df2", "parents": [ "2d6b39e6cc1100792bff9582c7f6782e37e7838f" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jun 20 16:58:07 2019 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jun 20 17:01:55 2019 -0700" }, "message": "Pass --legacy to aapt2 compile for Email\n\nThis module produces warnings that are treated as errors if --legacy\nis not passed. --legacy is no longer being passed by default, so\nadd it here.\n\nBug: 135616422\nTest: m java\nChange-Id: If688796df77da43966460334d1b3fbba8136ba36\n" }, { "commit": "286d65829abf95216f1a92163c812fc7759fc7a7", "tree": "052838ce1f3b15dec255a59237dcb1d6b526913b", "parents": [ "ff6e704a9572557198558e18200cfeb8cc028dd6", "658dc5b8e9ee47f547a4cf37ce696c70359e1ee9" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri May 31 11:34:55 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 31 11:34:55 2019 -0700" }, "message": "[automerger skipped] [automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018 am: 34534259de am: 33587b4e1d am: 30a7c1118c am: ef35412cb6 am: f7005dabcd am: 86e89cca74 am: 800736df79\nam: 658dc5b8e9 -s ours\nam skip reason: change_id I5f6541ceb79a1a1c598d0c8207e3cab98d1a8ac5 with SHA1 a3c35e0ed3 is in history\n\nChange-Id: Iac69d87428cf4732de82eca271d57f04b618880d\n" }, { "commit": "658dc5b8e9ee47f547a4cf37ce696c70359e1ee9", "tree": "47ff35f63d508224a8dd0555d8a03a99c06a4753", "parents": [ "12d4bc2c2525d95c525e1bd9b1e738fe7157bd93", "800736df79e6a8296220ed84740ec54303bc7bac" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri May 31 11:18:13 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 31 11:18:13 2019 -0700" }, "message": "[automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018 am: 34534259de am: 33587b4e1d am: 30a7c1118c am: ef35412cb6 am: f7005dabcd am: 86e89cca74\nam: 800736df79\n\nChange-Id: I7602dcd26fe1d1a31a86c7e1df8b143208e01b6c\n" }, { "commit": "800736df79e6a8296220ed84740ec54303bc7bac", "tree": "44b021b799ba69439e0b5e4255a8abb0bc571714", "parents": [ "e9e9d8676e48327ed225bb41806ba468e1e46ed9", "86e89cca74e1383585e410338bd7cb0f9a688720" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri May 31 11:11:10 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 31 11:11:10 2019 -0700" }, "message": "[automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018 am: 34534259de am: 33587b4e1d am: 30a7c1118c am: ef35412cb6 am: f7005dabcd\nam: 86e89cca74\n\nChange-Id: I2899c1fec32458ec1dfdb5cea4898f6974723201\n" }, { "commit": "86e89cca74e1383585e410338bd7cb0f9a688720", "tree": "3e2b062ed4bbbd8eb3b6a4b2d26f6f973fda7602", "parents": [ "3cecde7d1814fd678fcc5f80ad940a703263ebd6", "f7005dabcddf646f3ff22685f12affbb91e5a6f0" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri May 31 11:04:06 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 31 11:04:06 2019 -0700" }, "message": "[automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018 am: 34534259de am: 33587b4e1d am: 30a7c1118c am: ef35412cb6\nam: f7005dabcd\n\nChange-Id: Ie0344e837ec3aeeb2be409c2cf0ef98593206214\n" }, { "commit": "f7005dabcddf646f3ff22685f12affbb91e5a6f0", "tree": "3e2b062ed4bbbd8eb3b6a4b2d26f6f973fda7602", "parents": [ "ad38b065750a25ff45bac3088c40867acd60610d", "ef35412cb61ad47d064936a0e69e59333c15eaea" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Fri May 31 10:52:02 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 31 10:52:02 2019 -0700" }, "message": "[automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018 am: 34534259de am: 33587b4e1d am: 30a7c1118c\nam: ef35412cb6\n\nChange-Id: I60d7e7082c2c3a1980242815e247931ce4eaea19\n" }, { "commit": "ff6e704a9572557198558e18200cfeb8cc028dd6", "tree": "052838ce1f3b15dec255a59237dcb1d6b526913b", "parents": [ "2da7b6062d3f802c0a668bf8a1b9768a0f763b77", "8fe84dae8375951b78d44343bc2733f55da7b6e8" ], "author": { "name": "Jaewoong Jung", "email": "jungjw@google.com", "time": "Fri May 31 08:48:36 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 31 08:48:36 2019 -0700" }, "message": "Merge \"Remove reference to LOCAL_PACKAGE_OVERRIDES.\" am: 2d6b39e6cc\nam: 8fe84dae83\n\nChange-Id: Ic05a126644c2aaae63586210ee20173ad34894b9\n" }, { "commit": "8fe84dae8375951b78d44343bc2733f55da7b6e8", "tree": "bc15efee7ae428da15d968d3194bf3c2897f75fa", "parents": [ "9c025aea1e0b1e6a68a0faa62d355764c85dc49c", "2d6b39e6cc1100792bff9582c7f6782e37e7838f" ], "author": { "name": "Jaewoong Jung", "email": "jungjw@google.com", "time": "Fri May 31 08:41:34 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 31 08:41:34 2019 -0700" }, "message": "Merge \"Remove reference to LOCAL_PACKAGE_OVERRIDES.\"\nam: 2d6b39e6cc\n\nChange-Id: Iee55c2d13422948e196411121f305217ffa76b36\n" }, { "commit": "2d6b39e6cc1100792bff9582c7f6782e37e7838f", "tree": "bc15efee7ae428da15d968d3194bf3c2897f75fa", "parents": [ "9c025aea1e0b1e6a68a0faa62d355764c85dc49c", "6a2f581c1ce58fed9eca49c15ff9354c16766b31" ], "author": { "name": "Jaewoong Jung", "email": "jungjw@google.com", "time": "Fri May 31 15:26:58 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri May 31 15:26:58 2019 +0000" }, "message": "Merge \"Remove reference to LOCAL_PACKAGE_OVERRIDES.\"" }, { "commit": "6a2f581c1ce58fed9eca49c15ff9354c16766b31", "tree": "bc15efee7ae428da15d968d3194bf3c2897f75fa", "parents": [ "9c025aea1e0b1e6a68a0faa62d355764c85dc49c" ], "author": { "name": "Jaewoong Jung", "email": "jungjw@google.com", "time": "Wed May 29 14:13:26 2019 -0700" }, "committer": { "name": "Jaewoong Jung", "email": "jungjw@google.com", "time": "Wed May 29 14:13:26 2019 -0700" }, "message": "Remove reference to LOCAL_PACKAGE_OVERRIDES.\n\nLOCAL_PACKAGE_OVERRIDES is now fully deprecated.\n\nTest: TreeHugger\nChange-Id: I6fb6b2f261eafbe8aba2a526a921c451272f2e03\n" }, { "commit": "ef35412cb61ad47d064936a0e69e59333c15eaea", "tree": "626a2f83a5c159ac1ba61347c543239faf28234a", "parents": [ "b6ef2df96b4d2810f60e74ed1870778c2a08d166", "30a7c1118cdcebd27902ef76f8facc379a4484d6" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed May 22 21:38:04 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed May 22 21:38:04 2019 +0000" }, "message": "[automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018 am: 34534259de am: 33587b4e1d am: 30a7c1118c\n\nChange-Id: I8ccec8ddef02a654a43ae589ea8dae11521dbd65\n" }, { "commit": "30a7c1118cdcebd27902ef76f8facc379a4484d6", "tree": "72469ff5e2cc4803f97b54f07a10e54b52973228", "parents": [ "247473a238323b1b54c0d4cd376227bb694e4ccd", "33587b4e1dd2850e30c35aee0e195a0cae492b68" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed May 22 21:38:02 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed May 22 21:38:02 2019 +0000" }, "message": "[automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018 am: 34534259de am: 33587b4e1d\n\nChange-Id: I5329b9144603c3e53bf8cebb75530e31d56c7e20\n" }, { "commit": "33587b4e1dd2850e30c35aee0e195a0cae492b68", "tree": "72469ff5e2cc4803f97b54f07a10e54b52973228", "parents": [ "c43cbbcf6245b45c4b89664d0cdfba3c2c612ff4", "34534259def64303aef2facff76ddc295aacc91c" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed May 22 21:38:00 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed May 22 21:38:00 2019 +0000" }, "message": "[automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018 am: 34534259de\n\nChange-Id: Ib62e4aee9bd2610b1336bfb03e20a17126f14169\n" }, { "commit": "34534259def64303aef2facff76ddc295aacc91c", "tree": "72469ff5e2cc4803f97b54f07a10e54b52973228", "parents": [ "063f6718e4198ad09cb0b91cab2c191f908168da", "2f17f9f0182396b73032870556debde93ac725fc" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed May 22 21:37:59 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed May 22 21:37:59 2019 +0000" }, "message": "[automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018\n\nChange-Id: Iaa18b104e738358bbfbf07f480f5927f47958569\n" }, { "commit": "2f17f9f0182396b73032870556debde93ac725fc", "tree": "72469ff5e2cc4803f97b54f07a10e54b52973228", "parents": [ "111878349ee4947a09305ad30feda4cf38cfa248", "e81f6f92bbdd43f34aa25fc2b7605aeb887af2cc" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed May 22 21:37:57 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed May 22 21:37:57 2019 +0000" }, "message": "[automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb\n\nChange-Id: Ib3f99b137d97a5c469af40c92885bb189c1556a8\n" }, { "commit": "e81f6f92bbdd43f34aa25fc2b7605aeb887af2cc", "tree": "72469ff5e2cc4803f97b54f07a10e54b52973228", "parents": [ "c87d04b8c190f52c4f7e8a22dfaa2b5e065415fe" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Mon May 13 13:29:40 2019 -0700" }, "committer": { "name": "Bryan Ferris", "email": "bferris@google.com", "time": "Wed May 22 21:37:56 2019 +0000" }, "message": "AOSP/Email - bug fix: do not allow composing message with hidden private data attachments.\n\nPorted/merged thefollowing from CL\n https://critique.corp.google.com/#review/247540041\n\noriginal file:\n java/com/google/android/apps/gmail/unifiedgmail/src/com/google/android/gm/ComposeActivityGmailExternal.java\n\naosp\u0027s version:\n src/com/android/email/activity/ComposeActivityEmailExternal.java\n\nChange description from the above CL:\n \"Switch intent filtering to be whitelist based rather than blacklist based.\n\n ComposeActivityGmailExternal should whitelist what extras we allow in.\n This is a very belated follow up to cl/235253805 where I wrote a quick fix\n as a blacklist based solution.\"\n\nBug: 127320867\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n -rw-r--r-- 1 rtenneti primarygroup 6375626 May 5 19:49 out/target/product/marlin/system/product/app/Email/Email.apk\n\n$ make UnifiedEmailTests -j\n -rw-r--r-- 1 rtenneti primarygroup 311703 May 5 20:04 out/target/product/marlin/testcases/UnifiedEmailTests/arm64/UnifiedEmailTests.apk\n\n$ make EmailTests -j\n -rw-r--r-- 1 rtenneti primarygroup 365023 May 13 14:39 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r out/target/product/marlin/system/product/app/Email/Email.apk\n$ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n$ adb install -r out/target/product/marlin/testcases/UnifiedEmailTests/arm64/UnifiedEmailTests.apk\n\n$ adb shell am instrument -w com.android.mail.emailtests\n Time: 3.519\n OK (157 tests)\n\nChange-Id: I5f6541ceb79a1a1c598d0c8207e3cab98d1a8ac5\nMerged-In: I5f6541ceb79a1a1c598d0c8207e3cab98d1a8ac5\n" }, { "commit": "2da7b6062d3f802c0a668bf8a1b9768a0f763b77", "tree": "22d72fbe7280422c83a9e5dab18d0abb8361cb37", "parents": [ "601f9e8b639e39d0111903f59e47d1e249f19f7c", "9c025aea1e0b1e6a68a0faa62d355764c85dc49c" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue May 14 14:44:41 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 14 14:44:41 2019 -0700" }, "message": "Merge \"AOSP/Email - bug fix: do not allow composing message with hidden private data attachments.\" am: 2bf0821b32\nam: 9c025aea1e\n\nChange-Id: I887daee774662751f22f684cbc8abce31febe1b6\n" }, { "commit": "9c025aea1e0b1e6a68a0faa62d355764c85dc49c", "tree": "1a4b4fa9fa0a19e732053333a74fd4ce12bcb4c3", "parents": [ "326aa0989e8f8979e8ae32e9aa2d8e976b899bd0", "2bf0821b324365fbf1295129fbd28bb60d68e59a" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Tue May 14 14:40:03 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 14 14:40:03 2019 -0700" }, "message": "Merge \"AOSP/Email - bug fix: do not allow composing message with hidden private data attachments.\"\nam: 2bf0821b32\n\nChange-Id: Ibd30e8d6caf0b45b7f4e30abacb5951b1c25f68f\n" }, { "commit": "2bf0821b324365fbf1295129fbd28bb60d68e59a", "tree": "1a4b4fa9fa0a19e732053333a74fd4ce12bcb4c3", "parents": [ "030a32e354a6f0d45f943a2312a0d60916592d5c", "a3c35e0ed32430c4be2778849aced502b642ea57" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 14 21:31:30 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue May 14 21:31:30 2019 +0000" }, "message": "Merge \"AOSP/Email - bug fix: do not allow composing message with hidden private data attachments.\"" }, { "commit": "601f9e8b639e39d0111903f59e47d1e249f19f7c", "tree": "7b38afc339940d2b801a848e83179f6716c6097a", "parents": [ "12d4bc2c2525d95c525e1bd9b1e738fe7157bd93", "326aa0989e8f8979e8ae32e9aa2d8e976b899bd0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 13 17:44:25 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 13 17:44:25 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master\nam: 326aa0989e -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: If04eda93df522e60e8a50bb57327331fe9de4ada\n" }, { "commit": "326aa0989e8f8979e8ae32e9aa2d8e976b899bd0", "tree": "d84f034d70f85fc4ccc9b68b5813c6e1c42ecb16", "parents": [ "030a32e354a6f0d45f943a2312a0d60916592d5c", "86a28bd4926b0d0e733992aeedf3ba94dfd6364c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 13 15:39:15 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 13 15:39:15 2019 -0700" }, "message": "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master\n\nBug: 132622481\nChange-Id: I738ebbd9dad9f16451a2c77a847caa1b2941d91b\n" }, { "commit": "a3c35e0ed32430c4be2778849aced502b642ea57", "tree": "1a4b4fa9fa0a19e732053333a74fd4ce12bcb4c3", "parents": [ "2d56e4b6ea0cd9c6a3a38bf4468f83cf48e8a74b" ], "author": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Mon May 13 13:29:40 2019 -0700" }, "committer": { "name": "Raman Tenneti", "email": "rtenneti@google.com", "time": "Mon May 13 14:57:59 2019 -0700" }, "message": "AOSP/Email - bug fix: do not allow composing message with hidden private data attachments.\n\nPorted/merged thefollowing from CL\n https://critique.corp.google.com/#review/247540041\n\noriginal file:\n java/com/google/android/apps/gmail/unifiedgmail/src/com/google/android/gm/ComposeActivityGmailExternal.java\n\naosp\u0027s version:\n src/com/android/email/activity/ComposeActivityEmailExternal.java\n\nChange description from the above CL:\n \"Switch intent filtering to be whitelist based rather than blacklist based.\n\n ComposeActivityGmailExternal should whitelist what extras we allow in.\n This is a very belated follow up to cl/235253805 where I wrote a quick fix\n as a blacklist based solution.\"\n\nBug: 127320867\n\nTest: manual - Ran the following tests on Pixel phone. Tested the email UI.\n\n$ make -j 40\n -rw-r--r-- 1 rtenneti primarygroup 6375626 May 5 19:49 out/target/product/marlin/system/product/app/Email/Email.apk\n\n$ make UnifiedEmailTests -j\n -rw-r--r-- 1 rtenneti primarygroup 311703 May 5 20:04 out/target/product/marlin/testcases/UnifiedEmailTests/arm64/UnifiedEmailTests.apk\n\n$ make EmailTests -j\n -rw-r--r-- 1 rtenneti primarygroup 365023 May 13 14:39 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n\n$ adb install -r out/target/product/marlin/system/product/app/Email/Email.apk\n$ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk\n$ adb install -r out/target/product/marlin/testcases/UnifiedEmailTests/arm64/UnifiedEmailTests.apk\n\n$ adb shell am instrument -w com.android.mail.emailtests\n Time: 3.519\n OK (157 tests)\n\nChange-Id: I5f6541ceb79a1a1c598d0c8207e3cab98d1a8ac5\n" }, { "commit": "86a28bd4926b0d0e733992aeedf3ba94dfd6364c", "tree": "b9a91b738bf90737942e1834d35fbf4d4e1caf6d", "parents": [ "143d2c9a8b3faf6b0718390336cc2acd0da71167", "e9e9d8676e48327ed225bb41806ba468e1e46ed9" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue May 07 21:59:19 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue May 07 21:59:19 2019 +0000" }, "message": "Snap for 5450365 from e9e9d8676e48327ed225bb41806ba468e1e46ed9 to pi-platform-release\n\nChange-Id: I27dd3e1454c2e2fd2109eb02004a1557a8943d6b\n" }, { "commit": "12d4bc2c2525d95c525e1bd9b1e738fe7157bd93", "tree": "7b38afc339940d2b801a848e83179f6716c6097a", "parents": [ "cb5d8b8ba33bdf0f065466f297295c85ad140310", "67ede7c177259f973ee816564e9e64ceceb59e26" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Mar 11 15:02:29 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Mar 11 15:02:29 2019 -0700" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Merge PPRL.190305.001 into master\" am: 2d56e4b6ea -s ours am: 030a32e354 -s ours\nam: 67ede7c177 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Icdd0b8c85e65cf1c64d016a62d9125679fd03efd\n" } ], "next": "67ede7c177259f973ee816564e9e64ceceb59e26" }