summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-18Merge "AOSP/UnifiedEmail - Secure UPDATE_WIDGET receiver with a new permission"HEADndk-sysroot-r21mastermainRaman Tenneti
2019-09-17AOSP/UnifiedEmail - Secure UPDATE_WIDGET receiver with a new permissionRaman Tenneti
The update methods sends a broadcast with the account name, the folder, etc. This implicitly bypasses the GET_ACCOUNT permission if a third-party applications listens to this broadcast. - Introduce a new app permission - com.android.email.permission.GET_WIDGET_UPDATE - Now the com.android.email.permission.GET_WIDGET_UPDATE is required to - receive the emitted broadcast - Add this permission to our existing widgets. Ported changes from cr/106302205 - added uses-permission GET_WIDGET_UPDATE, so Gmail app has the permission to receive the intent Bug: 139803872 Test: manual - Ran the following tests on Pixel phone. Tested the email UI. $ make -j 40 $ make Email -j $ make EmailTests -j -rw-r--r-- 1 rtenneti primarygroup 6356400 Sep 16 14:10 out/target/product/marlin/testcases/Email/arm64/Email.apk -rw-r--r-- 1 rtenneti primarygroup 389599 Sep 16 14:18 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk $ adb install -r -d -g out/target/product/marlin/testcases/Email/arm64/Email.apk $ adb install -r -d -g out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk $ adb shell am instrument -w com.android.email.tests Time: 34.746 OK (157 tests) $ atest EmailTests Summary ------- EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0 All tests passed! $ adb install ../security_attack/bug_139803872/poc.apk Captured the logcat output at rtenneti's x20web logcat.out.0916.1503 while reproducting the steps in b/139803872#comment3 Change-Id: Ied292eab76c672c60de57f8ce43df0e0ea6d3464
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: Ia94cb35a5062d0d7f4d2439d43a64fceb6be5c89
2019-08-15Merge "AOSP/Email and AOSP/UnfiedEmail - Added back call to uiaccounts. + ↵temp_140451723Raman Tenneti
Added android.permission.FOREGROUND_SERVICE for UnfiedEmail and changed the code accordingly to work with API level 28." am: eb01557d85 Change-Id: I455cb68c9797c4c98402ff61686b191fb983d425
2019-08-15Merge "AOSP/Email and AOSP/UnfiedEmail - Added back call to uiaccounts. + ↵Treehugger Robot
Added android.permission.FOREGROUND_SERVICE for UnfiedEmail and changed the code accordingly to work with API level 28."
2019-08-15AOSP/Email and AOSP/UnfiedEmail - Added back call to uiaccounts.Raman Tenneti
+ Added android.permission.FOREGROUND_SERVICE for UnfiedEmail and changed the code accordingly to work with API level 28. Bug: 138276176 Bug: 119499886 Test: manual - Ran the following tests on Pixel phone. Tested the email UI. $ make -j 40 $ make UnifiedEmail -j $ make Email -j $ make EmailTests -j $ ls -l out/target/product/marlin/testcases/Email/arm64/Email.apk out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk -rw-r--r-- 1 rtenneti primarygroup 6275529 Aug 15 11:33 out/target/product/marlin/testcases/Email/arm64/Email.apk -rw-r--r-- 1 rtenneti primarygroup 389599 Aug 15 11:42 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk $ adb install -r -d -g out/target/product/marlin/testcases/Email/arm64/Email.apk $ adb install -r -d -g out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk $ adb shell am instrument -w com.android.email.tests Time: 6.543 OK (157 tests) $ atest EmailTests Summary ------- EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0 All tests passed! Change-Id: I6593b5dad3a5e79bba41a645f17e74af20d16a3c
2019-08-14DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: Iad997cb8695fb03ff7d5aa677d6970c791e3a73e
2019-08-13[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release ↵Xin Li
(PPRL.190801.002) in master" am: 24beb9aa0a -s ours am skip reason: subject contains skip directive Change-Id: I50edf15a8bd6e7a643dca829c702cfe15c7e3f11
2019-08-14Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190801.002) in master"Treehugger Robot
2019-08-13DO NOT MERGE - Skip pie-platform-release (PPRL.190801.002) in masterXin Li
Bug: 139369544 Change-Id: I1757cf8c28c08681c5f8762ab29b9bd03a1c34ce
2019-08-13Snap for 5674421 from fb8d6e7a153ab1a96348647eef3f8fa14b1a2353 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: I9ca05ce21dbdbc04e2d3757950ceb8d5caac92ed
2019-08-04Merge "Revert "Revert "AOSP/UnifiedEmail - Bumped the targetSdkVersion to 28 ↵Raman Tenneti
(maximum version). Used JobIntentservice API calls to replace context.startService.""" am: 516e349b34 Change-Id: I51c6b09ad91d05168a3e6c1a3f706d28352bb17a
2019-08-03Merge "Revert "Revert "AOSP/UnifiedEmail - Bumped the targetSdkVersion to 28 ↵Raman Tenneti
(maximum version). Used JobIntentservice API calls to replace context.startService."""
2019-08-02Revert "Revert "AOSP/UnifiedEmail - Bumped the targetSdkVersion to 28 ↵Raman Tenneti
(maximum version). Used JobIntentservice API calls to replace context.startService."" This reverts commit 20e45d84f9dc906034fb535ac35fb2a2ba9dc995. Reason for revert: Email app needs to target API level 28+ Bug: 138276176 Bug: 119499886 Change-Id: I17abf17744dcd59948b40b1137c06e8e429e5adc
2019-08-01[automerger skipped] Merge "Import translations. DO NOT MERGE"Bill Yi
am: d6521bbe73 -s ours am skip reason: subject contains skip directive Change-Id: I298b358faa204de48a5436211b08b121f7b59c73
2019-08-01Merge "Import translations. DO NOT MERGE"Treehugger Robot
2019-07-31Import translations. DO NOT MERGEBill Yi
BUG: 135616422 Test: none Change-Id: I6174e180026d270cf0a3ddb71c9f5fedeee6f02a Auto-generated-cl: translation import Merged-In: I6174e180026d270cf0a3ddb71c9f5fedeee6f02a
2019-07-24Merge "Remove build-time dep on opt-datetimepicker"Neil Fuller
am: fa08781197 Change-Id: I0abdbd76d87e96c65fd2b62d8387a7c1ddd24c1c
2019-07-24Merge "Remove build-time dep on opt-datetimepicker"Neil Fuller
2019-07-23Remove build-time dep on opt-datetimepickerNeil Fuller
Remove build-time dependency on opt-datetimepicker from the UnifiedEmail app. The dependency appears to be unnecessary. Bug: 16550209 Test: build only Change-Id: I46db4f48fdcd5c20d119f72b7e7e559a3b21eceb
2019-07-08Merge "AOSP/UnifiedEmail - Fix improperly formatted resource strings in ↵Raman Tenneti
UnifiedEmail." am: f9fe78cbb1 am: 09a9ca6446 Change-Id: I48dd6108ec6f9a0089ca317996aa9d1d895a1b54
2019-07-08Merge "AOSP/UnifiedEmail - Fix improperly formatted resource strings in ↵Raman Tenneti
UnifiedEmail." am: f9fe78cbb1 Change-Id: Id042ed9b1300a756ce1181b37840c2db857991d8
2019-07-09Merge "AOSP/UnifiedEmail - Fix improperly formatted resource strings in ↵android-o-mr1-iot-release-1.0.14Treehugger Robot
UnifiedEmail."
2019-07-08AOSP/UnifiedEmail - Fix improperly formatted resource strings in UnifiedEmail.Raman Tenneti
TODO: Need to run translation to fix across all languages. Bug: 135616422 Test: manual - Did a "make -j40" and verified that there are no warnings in strings.xml. Change-Id: I953357d0b3222818e673ea88f8ec77ac16264c02
2019-06-28[automerger skipped] Revert "AOSP/UnifiedEmail - Bumped the targetSdkVersion ↵Raman Tenneti
to 28 (maximum version). Used JobIntentservice API calls to replace context.startService." am: b64f24986e -s ours am skip reason: change_id I010565b2f8616195f397db4473b3a34fc8b150b5 with SHA1 20e45d84f9 is in history Change-Id: If77be84db25013ecf962135efefafd95721a7133
2019-06-27Revert "AOSP/UnifiedEmail - Bumped the targetSdkVersion to 28 (maximum ↵android10-devRaman Tenneti
version). Used JobIntentservice API calls to replace context.startService." This reverts commit c851a0a2fa18cf76f4fe5eb53ce489f051fb7019. Reason for revert: No notification when new email arrived Bug: 132923014 Cherry picking - https://android-review.googlesource.com/c/platform/packages/apps/UnifiedEmail/+/990099 Test: manual - Ran the following tests on Pixel phone. Tested the email UI for notification. $ make -j 40 $ make EmailTests -j $ adb install -r out/target/product/marlin/system/product/app/Email/Email.apk $ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk $ adb shell am instrument -w com.android.email.tests Time: 2.986 OK (157 tests) Change-Id: I010565b2f8616195f397db4473b3a34fc8b150b5 Merged-In: I010565b2f8616195f397db4473b3a34fc8b150b5
2019-06-26Merge "Revert "AOSP/UnifiedEmail - Bumped the targetSdkVersion to 28 ↵Raman Tenneti
(maximum version). Used JobIntentservice API calls to replace context.startService."" am: 7ffdac40ac am: 7cecc49387 Change-Id: I61d98c23c2411e9fb09515741f4ffe652aface43
2019-06-26Merge "Revert "AOSP/UnifiedEmail - Bumped the targetSdkVersion to 28 ↵Raman Tenneti
(maximum version). Used JobIntentservice API calls to replace context.startService."" am: 7ffdac40ac Change-Id: If5264cb8ae7c311bbe1547d78c29018b09255867
2019-06-26Merge "Revert "AOSP/UnifiedEmail - Bumped the targetSdkVersion to 28 ↵Treehugger Robot
(maximum version). Used JobIntentservice API calls to replace context.startService.""
2019-06-26Merge "Pass --legacy to aapt2 compile for UnifiedEmail" am: c7c9b11ad3Colin Cross
am: 2f00f25613 Change-Id: I2b894484c028fc1d886e45f7c4c74ec0d37be0e7
2019-06-26Revert "AOSP/UnifiedEmail - Bumped the targetSdkVersion to 28 (maximum ↵Raman Tenneti
version). Used JobIntentservice API calls to replace context.startService." This reverts commit c851a0a2fa18cf76f4fe5eb53ce489f051fb7019. Reason for revert: No notification when new email arrived Bug: 132923014 Change-Id: I010565b2f8616195f397db4473b3a34fc8b150b5
2019-06-26Merge "Pass --legacy to aapt2 compile for UnifiedEmail"Colin Cross
am: c7c9b11ad3 Change-Id: I37e33ca17ecb4fcf6fba4a41a24706b25e297916
2019-06-26Merge "Pass --legacy to aapt2 compile for UnifiedEmail"Colin Cross
2019-06-25Merge "Fix UnifiedEmail tests on userdebug builds." am: f9cde871ffBob Badour
am: c79e075ab4 Change-Id: Ie44ee1df9888495e8e1366871bfa846f6516bc74
2019-06-25Merge "Fix UnifiedEmail tests on userdebug builds."Bob Badour
am: f9cde871ff Change-Id: I16a3476f33a2ea2eda8d7a7944f5c6b305e7bd02
2019-06-26Merge "Fix UnifiedEmail tests on userdebug builds."Treehugger Robot
2019-06-25Fix UnifiedEmail tests on userdebug builds.Bob Badour
Remove the "if" that applies proguard-test.flags only to eng builds. Test: Tested with 'adb shell am ...' all 276 tests pass. Change-Id: I1091bf891f9b0c94a505223c5c0767dc1e93a1cb
2019-06-20Pass --legacy to aapt2 compile for UnifiedEmailColin Cross
This module produces warnings that are treated as errors if --legacy is not passed. --legacy is no longer being passed by default, so add it here. Bug: 135616422 Test: m java Change-Id: Ib71df676a67aa94684fa1db01f2a5a3dd29cf963
2019-06-12Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449, ↵android-9.0.0_r47pie-qpr3-b-releaseandroid-build-team Robot
7995789, 7995790, 7995450, 7996029, 7996030, 7996139, 7996140, 7996141, 7996142, 7996143, 7996144, 7995544, 7995545, 7995546, 7995547, 7995548, 7995549, 7995550, 7996145, 7996146, 7996032, 7996147, 7996148, 7996149, 7996150, 7994747, 7994748, 7995451, 7994749, 7994750, 7995966, 7995967, 7994751, 7996151, 7996152, 7996153] into pi-qpr3-b-release Change-Id: Ia8993221977e0727eee5a07394329ca6455bb3c4
2019-06-12AOSP/UnifiedEmail - bug fix to composing messages.Raman Tenneti
As part of porting https://critique.corp.google.com/#review/247540041, needed to make EXTRA_TO, EXTRA_CC, EXTRA_BCC, EXTRA_SUBJECT, EXTRA_BODY public so that they couuld be accessed from packages/apps/Email package. Bug: 127320867 Test: manual - Ran the following tests on Pixel phone. Tested the email UI. $ make -j 40 -rw-r--r-- 1 rtenneti primarygroup 6375626 May 5 19:49 out/target/product/marlin/system/product/app/Email/Email.apk $ make UnifiedEmailTests -j -rw-r--r-- 1 rtenneti primarygroup 311703 May 5 20:04 out/target/product/marlin/testcases/UnifiedEmailTests/arm64/UnifiedEmailTests.apk $ make EmailTests -j -rw-r--r-- 1 rtenneti primarygroup 365023 May 13 14:39 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk $ adb install -r out/target/product/marlin/system/product/app/Email/Email.apk $ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk $ adb install -r out/target/product/marlin/testcases/UnifiedEmailTests/arm64/UnifiedEmailTests.apk $ adb shell am instrument -w com.android.mail.emailtests Time: 3.519 OK (157 tests) Change-Id: I2a0e1048bac20c4346ec16d4bc8151297971fe0d Merged-In: I2a0e1048bac20c4346ec16d4bc8151297971fe0d (cherry picked from commit 8c19e4f8fa80ab21da9bd684f038f24cb1240011)
2019-05-31[automerger skipped] [automerger] AOSP/UnifiedEmail - bug fix to composing ↵Raman Tenneti
messages. am: 8c19e4f8fa am: 09976e5356 am: fabc43ef7e am: 93fc485022 am: 62c0cea734 am: 16addb8f66 am: 3aef2f2371 am: bf3bb73e90 am: a48cf7cf64 am: 6bc8d9a464 -s ours am skip reason: change_id I2a0e1048bac20c4346ec16d4bc8151297971fe0d with SHA1 e292d21d32 is in history Change-Id: Id760ad142b895f4daa6d9819512ac615f7f6b081
2019-05-31[automerger] AOSP/UnifiedEmail - bug fix to composing messages. am: ↵Raman Tenneti
8c19e4f8fa am: 09976e5356 am: fabc43ef7e am: 93fc485022 am: 62c0cea734 am: 16addb8f66 am: 3aef2f2371 am: bf3bb73e90 am: a48cf7cf64 Change-Id: I52bd4b6ad654920a03156d55f4fae92548c50aeb
2019-05-31[automerger] AOSP/UnifiedEmail - bug fix to composing messages. am: ↵Raman Tenneti
8c19e4f8fa am: 09976e5356 am: fabc43ef7e am: 93fc485022 am: 62c0cea734 am: 16addb8f66 am: 3aef2f2371 am: bf3bb73e90 Change-Id: I3986a5c4f52a92c632d4a1710fe5952e2b66e5ae
2019-05-31[automerger] AOSP/UnifiedEmail - bug fix to composing messages. am: ↵Raman Tenneti
8c19e4f8fa am: 09976e5356 am: fabc43ef7e am: 93fc485022 am: 62c0cea734 am: 16addb8f66 am: 3aef2f2371 Change-Id: I18eb6bae032a9ccc070fc036e7a23d675e95e5b9
2019-05-31[automerger] AOSP/UnifiedEmail - bug fix to composing messages. am: ↵Raman Tenneti
8c19e4f8fa am: 09976e5356 am: fabc43ef7e am: 93fc485022 am: 62c0cea734 am: 16addb8f66 Change-Id: I73585167f9f9aa7b4bd2508d2a538ea282103fe6
2019-05-22[automerger] AOSP/UnifiedEmail - bug fix to composing messages. am: ↵Android Build Merger (Role)
8c19e4f8fa am: 09976e5356 am: fabc43ef7e am: 93fc485022 am: 62c0cea734 Change-Id: Ic1f94f0da43e1b69e2cdb895d1a80a604ba0c68e
2019-05-22[automerger] AOSP/UnifiedEmail - bug fix to composing messages. am: ↵Android Build Merger (Role)
8c19e4f8fa am: 09976e5356 am: fabc43ef7e am: 93fc485022 Change-Id: I53cbf1262ae551faa1b2338af61a87ec3136233b
2019-05-22[automerger] AOSP/UnifiedEmail - bug fix to composing messages. am: ↵Android Build Merger (Role)
8c19e4f8fa am: 09976e5356 am: fabc43ef7e Change-Id: I149cb3fdef26db097a753cc7d26fb359fcd93c75
2019-05-22[automerger] AOSP/UnifiedEmail - bug fix to composing messages. am: ↵Android Build Merger (Role)
8c19e4f8fa am: 09976e5356 Change-Id: Idf7da00fbd5142d3e2277672b30cd869934b8cb0
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 06:39:01 +0000