summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-25Don't allow cachedFile Attachments if the content Uri is pointing to ↵android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-5.1.1_r38lollipop-mr1-releaselollipop-mr1-cts-releaseSam Lee
EmailProvider. This is to backport a security fix reported by b/27308057 and b/27335139. Also, add Analytics for these errors. Bug: b/27335139 Change-Id: I75f6d8f5feb9fc611aa2e429e2b22cbd07223ab9
2016-02-26Don't allow file attachment from file:///data.android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r10android-5.1.1_r37Régis Décamps
Commit 24ed2941ab132e4156bd38f0ab734c81dae8fc2e allows file:// attachment on the /data directory if they are from the same process. This was done to work around applications that shared their internal data file. However, this is bad practice, and other apps should share content:// Uri instead. With this change, Email doesn't allow this anymore. This fixes security issue 199888. Also, add Analytics for these errors compose_errors > send_intent_attachment > data_dir https://code.google.com/p/android/issues/detail?id=199888 b/26989185 Change-Id: I7cae3389f4f7cf5f86600a58c6ccdffaf889d1c3
2014-11-08merge in lmp-mr1-release history after reset to ↵android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r2android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-fi-releaseThe Android Automerger
c1b5d359dd97f9e0471694a1b31365902056c7b8
2014-11-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
c1b5d359dd97f9e0471694a1b31365902056c7b8
2014-11-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
c1b5d359dd97f9e0471694a1b31365902056c7b8
2014-11-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
c1b5d359dd97f9e0471694a1b31365902056c7b8
2014-11-03am e757dd81: (-s ours) Import translations. DO NOT MERGEandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devGeoff Mendal
* commit 'e757dd815c686ec066dbd90bf91fa56c8bcfd618': Import translations. DO NOT MERGE
2014-11-03Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I3fa5646ae75f968aea0a65940310ea51df486583 Auto-generated-cl: translation import
2014-11-03Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ie8d1c7591359093d6c15f07e10aa28d33b524f70 Auto-generated-cl: translation import
2014-11-03merge in lmp-mr1-release history after reset to ↵The Android Automerger
9b555157a8ff9c5e4fb47987b18a7fad5c50e3ff
2014-11-02am 1b19a301: resolved conflicts for merge of 41b2d050 to lmp-sprout-devPaul Westbrook
* commit '1b19a301980ea368f0d5cb0507c925eca24abb98':
2014-11-02resolved conflicts for merge of 41b2d050 to lmp-sprout-devPaul Westbrook
Change-Id: I6a0f19c782b21e7abbae2289efec44c4692a958b
2014-11-02am b5bee6f8: (-s ours) am 2d450dfb: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit 'b5bee6f8f6cd83bf3cfc8a5edbd20a2684fd2700': Import translations. DO NOT MERGE
2014-11-02am 77712377: (-s ours) am 3918a915: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '7771237775947a07ca83e1d5322c33c7f0665625': Import translations. DO NOT MERGE
2014-11-02am aab07018: (-s ours) am 96813454: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit 'aab0701867547b70ddbdadda8d238e1cddf70e7d': Import translations. DO NOT MERGE
2014-11-02am 22ef937e: am 43346303: Use borderless ripple for searchJin Cao
* commit '22ef937e896ed1ac92a9788f2c585da8a90323b4': Use borderless ripple for search
2014-11-02am 9d96c776: am 20c3e580: Merge "Combine conv and misc panes into one frame ↵Jin Cao
and animate that instead" into ub-gmail-ur14-dev * commit '9d96c7765a97f92a2f8a66dcb6d0282b2bbd1d59': Combine conv and misc panes into one frame and animate that instead
2014-11-02am fe10eeb0: am 366947ac: Merge "Save the focused conversation via id ↵Jin Cao
instead of position" into ub-gmail-ur14-dev * commit 'fe10eeb0862e66f6a9b0f4aaedc6bf8e0484c833': Save the focused conversation via id instead of position
2014-11-02am 25d70e7d: am 1caa0f28: Merge "Navigate up if up is pressed for nested ↵Jin Cao
folders" into ub-gmail-ur14-dev * commit '25d70e7dd5bc1a91fb24b7001a1c7ba1475a324d': Navigate up if up is pressed for nested folders
2014-11-02am ef36f1c5: am 9f3acef8: Set maxWidth for tablet snackbar action text.Andrew Sapperstein
* commit 'ef36f1c5826be3d19bf65ee8c4c7ae210b7def2f': Set maxWidth for tablet snackbar action text.
2014-11-02am 90ec8e01: am 17553ce2: Merge "Prevent rare NPE" into ub-gmail-ur14-devTony Mantler
* commit '90ec8e01796fcbb16cca0452177bf1ffee53a311': Prevent rare NPE
2014-11-02am 8a819016: am bd16ec75: Merge "Programmatically set selected state to ↵Andy Huang
correspond to peeking conv" into ub-gmail-ur14-dev * commit '8a8190167285f35ae1c68d3b1471e9a2a964b29e': Programmatically set selected state to correspond to peeking conv
2014-11-02am f9c41264: am 547cc85c: restore peeking stateAndy Huang
* commit 'f9c41264894638125e784833fad62a78dca3a4ac': restore peeking state
2014-11-02am bb9554d1: am 80c6dc4c: only auto-close the drawer when selecting from the ↵Andy Huang
list * commit 'bb9554d11c00c19d30203686833fd28861a57238': only auto-close the drawer when selecting from the list
2014-11-02am bf0e30d4: am 7a2a78fa: Merge "Don\'t include the default footer when ↵Jin Cao
there is no content" into ub-gmail-ur14-dev * commit 'bf0e30d43b316fe080f1c303de692f5ecf8cabcf': Don't include the default footer when there is no content
2014-11-02am 793f066c: am f91f88ef: Use guava Objects.equalJin Cao
* commit '793f066c9a4e3e543e81090b5cb17423a66e9208': Use guava Objects.equal
2014-11-02am a4c7e507: am 95298ff5: Merge "Analytics: Remove dimension #10 (account ↵Régis Décamps
type)" into ub-gmail-ur14-dev * commit 'a4c7e507ac134e703c438b2cc196ad42d66579f3': Analytics: Remove dimension #10 (account type)
2014-11-02am 9cfe96d9: am c10a95be: fix occasional blank CV panes on activity startupAndy Huang
* commit '9cfe96d903655a01a328a1267b2ae88438f242d8': fix occasional blank CV panes on activity startup
2014-11-02am c8a31368: am 88feee01: Merge "Revert "Force Show Vector Drawables ↵Rohan Shah
(UnifiedEmail)"" into ub-gmail-ur14-dev * commit 'c8a313687e379fec933eac465457512459cd3099': Revert "Force Show Vector Drawables (UnifiedEmail)"
2014-11-02am 1a6c39d4: am 6ac079b4: Cleanup of drawer dragJin Cao
* commit '1a6c39d4f0b8332e26617a2f93b90bc0cc3be6c1': Cleanup of drawer drag
2014-11-02am 00c22351: am 0c07334f: Merge "Enable hardware acceleration for drawer ↵Jin Cao
drag" into ub-gmail-ur14-dev * commit '00c22351364176b216566d5e1d43256038604c6d': Enable hardware acceleration for drawer drag
2014-11-02am 02bc1163: am f9b88e40: Merge "treat taps in CV in peek mode as marking ↵Andy Huang
the convo seen" into ub-gmail-ur14-dev * commit '02bc1163df48c356bf20c0c3c6579b9d7c06cdef': treat taps in CV in peek mode as marking the convo seen
2014-11-02am 8d9328fe: am 1a120be0: Merge "fix crash when rotating an Ad on tablet" ↵Andy Huang
into ub-gmail-ur14-dev * commit '8d9328fe5ab0d91a7e1f03f0b8ba1573f0047534': fix crash when rotating an Ad on tablet
2014-11-02am bc609061: am 9cd03410: Merge "Force Show Vector Drawables (UnifiedEmail)" ↵Rohan Shah
into ub-gmail-ur14-dev * commit 'bc609061f106222eaa7f63c0c5279402df71dcdb': Force Show Vector Drawables (UnifiedEmail)
2014-11-02am 652b8c69: am 3c8e398e: Merge "Peek mode for 2-pane landscape" into ↵Andy Huang
ub-gmail-ur14-dev * commit '652b8c694e67826f7952551b566f51a2e75f133d': Peek mode for 2-pane landscape
2014-11-02am 53b835c1: am 113cf638: Merge "Reset search button visibility on account ↵Jin Cao
change" into ub-gmail-ur14-dev * commit '53b835c16b77ab9c06004b90eee5358f968999d7': Reset search button visibility on account change
2014-11-02am 6be23e3d: am 8291a8a6: Enable third-party cookies. b/16014255Andrew Sapperstein
* commit '6be23e3dd689742c4e54bdd29867a40586f1a190': Enable third-party cookies. b/16014255
2014-11-02am ec8fc2fa: am 96062c36: Add white backgrounds to CV overlays.Andrew Sapperstein
* commit 'ec8fc2facc2f83245d6cced3b29962f03b1cdbc6': Add white backgrounds to CV overlays.
2014-11-02am 927029c5: am 3983afc4: Merge "Hardware accelerate drawer cross-fade" into ↵Jin Cao
ub-gmail-ur14-dev * commit '927029c5c5e65a622f13bbd662c5ec7f193d28ed': Hardware accelerate drawer cross-fade
2014-11-02am ffd85257: am 76193af1: Merge "Allow dragging the drawer close from CV" ↵Jin Cao
into ub-gmail-ur14-dev * commit 'ffd85257456075a96714edfb147a12927607ba18': Allow dragging the drawer close from CV
2014-11-02am df489aa2: am bbe52eb9: Merge "Use 16sp Roboto Regular for pre-L in ↵Andrew Sapperstein
drawer." into ub-gmail-ur14-dev * commit 'df489aa2a29d3be9b954e0d7d935b0f26caafbc1': Use 16sp Roboto Regular for pre-L in drawer.
2014-11-02am e4af65d7: am 63738811: Fix NPE when folderUri is null.Milos Stankovic
* commit 'e4af65d7d7f18a8955bd809db6d3da9d2315dba8': Fix NPE when folderUri is null.
2014-11-02am cac57f7e: am 08746f5b: Merge "Fix NoClassDefFound in tests with ↵Régis Décamps
proguard-test.flags" into ub-gmail-ur14-dev * commit 'cac57f7e1621684b3bbbd7673ca87011ce88fe94': Fix NoClassDefFound in tests with proguard-test.flags
2014-11-02am f8379db3: am de56df00: Fix NPE when parameter is null in ↵Régis Décamps
NotificationActionUtils * commit 'f8379db36e9cd7d75e34caba0877737c0beb2b1e': Fix NPE when parameter is null in NotificationActionUtils
2014-11-02am 1db21327: (-s ours) am 4c2d0c0f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '1db213273bca0854509c7822a522739274e5c436': Import translations. DO NOT MERGE
2014-11-02am 655a0488: am 612eb328: Allow to resend all notificationsRégis Décamps
* commit '655a04882c9e9483643cb9e6368644080d4693ed': Allow to resend all notifications
2014-11-02am 379898e7: am fbb0c7f6: Cross-fade the drawer on toggle/dragJin Cao
* commit '379898e75bedf2edc0607a1783156661a358dc47': Cross-fade the drawer on toggle/drag
2014-11-02am 3fb1c00d: am 6d136a60: DO NOT MERGE Revert "back to dogfood"Andy Huang
* commit '3fb1c00d3969fb384cd895d8fd0e793889ef2f54': DO NOT MERGE Revert "back to dogfood"
2014-11-02am a617809d: am 74fcd240: Merge "Don\'t allow for drag during mode change" ↵Jin Cao
into ub-gmail-ur14-dev * commit 'a617809ddde8e11fa54be9530303179be2f54d55': Don't allow for drag during mode change
2014-11-02am 86f3ea4f: am 4781f334: Add current focus to MailActivity toStringJin Cao
* commit '86f3ea4f2ad6c5de936865a4070c9bad338d0698': Add current focus to MailActivity toString
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 02:07:04 +0000