Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aart Bik
a0c8b340be Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 am: 278cad4793 
am: 7eb917d5eb

Change-Id: I7ea739ac873ce3e5a2252666394db2b3199ec42a
 2016-12-08 02:08:23 +00:00
Svetoslav Ganov
6023fd1800 Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa 
am: 557858b9c0

Change-Id: Ia6b6b59be28f938f4c3a7c4aecb035fd4c6607f6
 2016-12-08 02:08:23 +00:00
Aart Bik
7eb917d5eb Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 
am: 278cad4793

Change-Id: Ib58a5a1e7506327b690df9c1a98c2fa8b895d216
 2016-12-08 02:01:06 +00:00
Adrian Roos
c1afd37135 Merge "EmergencyCryptkeeperText: Make sure we update if airplane mode changes" into nyc-mr2-dev 
am: 1e1d5b07a6

Change-Id: I47b86760bab79c447cfbe23ad163e8864da05eb1
 2016-12-08 02:01:04 +00:00
Adrian Roos
889c64a30b EmergencyCryptkeeperText: Make sure we update if airplane mode changes 
am: 72abcdaec7

Change-Id: I1784384d0a38c39efe14047c6986337b4526495b
 2016-12-08 02:00:59 +00:00
Aart Bik
116a4e883d Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 
am: 278cad4793

Change-Id: I545ba917e74f34716fe773250468e06b1dfd8312
 2016-12-08 02:00:56 +00:00
Svetoslav Ganov
557858b9c0 Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb 
am: 138a541eaa

Change-Id: I659d82f39cab9f6d73ceb118cdc74307ee995dfb
 2016-12-08 02:00:55 +00:00
Svetoslav Ganov
138a541eaa Fix vulnerability in MemoryIntArray am: 4694cad511 
am: ec40a70ffb

Change-Id: I5d03aaa04fe13b3af20bcc61e9bb925b471ab825
 2016-12-08 01:56:24 +00:00
Aart Bik
278cad4793 Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f 
am: 65cf055ad9

Change-Id: Iae6e4fe6eada607d71a20b8ea588ee8efd56a8e0
 2016-12-08 01:52:51 +00:00
TreeHugger Robot
1e1d5b07a6 Merge "EmergencyCryptkeeperText: Make sure we update if airplane mode changes" into nyc-mr2-dev 2016-12-08 01:50:14 +00:00
Svetoslav Ganov
ec40a70ffb Fix vulnerability in MemoryIntArray 
am: 4694cad511

Change-Id: I64257a851c06e4a333056ee132ff8a2ea29aef5c
 2016-12-08 01:49:21 +00:00
Aart Bik
65cf055ad9 Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 
am: 86699f980f

Change-Id: I7876874ba0d6815920f21021a47e3fe1b3e1c42f
 2016-12-08 01:44:54 +00:00
TreeHugger Robot
66ebaf7ff5 Merge "Fix vulnerability in MemoryIntArray" 2016-12-08 01:39:52 +00:00
Aart Bik
86699f980f Revert "Fix vulnerability in MemoryIntArray" 
am: 29139a8ae5

Change-Id: I3975cfc51bd03a65855c113dfdb827d24471e0ba
 2016-12-08 01:36:50 +00:00
Svetoslav Ganov
4694cad511 Fix vulnerability in MemoryIntArray 
MemoryIntArray was using the size of the undelying
ashmem region to mmap the data but the ashmem size
can be changed until the former is memory mapped.
Since we use the ashmem region size for boundary
checking and memory unmapping if it does not match
the size used while mapping an attacker can force
the system to unmap memory or to access undefined
memory and crash.

Also we were passing the memory address where the
ashmem region is mapped in the owner process to
support cases where the client can pass back the
MemoryIntArray instance. This allows an attacker
to put invalid address and cause arbitrary memory
to be freed.

Now we no longer support passing back the instance
to the owner process (the passed back instance is
read only), so no need to pass the memory adress
of the owner's mapping, thus not allowing freeing
arbitrary memory.

Further, we now check the memory mapped size against
the size of the underlying ashmem region after we do
the memory mapping (to fix the ahsmem size) and if
an attacker changed the size under us we throw.

Tests: Updated the tests and they pass.

bug:33039926
bug:33042690

Change-Id: Id7f0e8a4c861b0b9fa796767e0c22d96633b14d1
 2016-12-08 01:35:08 +00:00
TreeHugger Robot
45cf37aa27 Merge "Fixing NPE when updating controller state." 2016-12-08 01:31:34 +00:00
Android Build Merger (Role)
b7e7eb2e0f Merge "Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014 am: 9aed2f6f53" into nyc-mr2-dev-plus-aosp 2016-12-08 01:12:52 +00:00
Aart Bik
29139a8ae5 Revert "Fix vulnerability in MemoryIntArray" 
This reverts commit 86dfa094de.


BROKE BUILD (as shown in some treehugger builds)

frameworks/base/core/java/android/util/MemoryIntArray.java:84: error: cannot find symbol
        mCloseGuard.open("close");
        ^
        
       
bug:33039926
bug:33042690

Change-Id: Ief875e543ec849fe55c747fb1ed5253f0cd9a122
 2016-12-08 01:12:48 +00:00
Svetoslav Ganov
5c465313aa Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014 
am: 9aed2f6f53

Change-Id: I06c98d9d380ba76cec80fd76c5a602a09cc523b2
 2016-12-08 01:11:54 +00:00
Svetoslav Ganov
cd92cc49d2 Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014 
am: 63499946b0

Change-Id: Ib9f5aabdf4e96b250a66f4dab7f3a90bd27a773f
 2016-12-08 01:11:51 +00:00
Selim Cinek
378053af93 Enforcing padding on the bottom of the keyguard 
When calculating the maximum padding, we need to require
some padding such that the indication text isn't overlapped

Test: add 6 notifications on sailfish, see no overlap
Bug: 32437839
Change-Id: I25effa3e971d4a0bfaef70615c8a6e29c906a6ed
 2016-12-07 17:09:00 -08:00
Selim Cinek
355652a6c8 Fixes that notifications were sometimes clipped on the lockscreen 
When dragging down a notification into the bottom, the top notification
could become clipped.

Test: add notifications, pull down on last notification on lockscreen
Bug: 32437839
Change-Id: Ibb58d1aa7575fbe9d84b8542ac57ffae494bb127
 2016-12-07 17:08:59 -08:00
Selim Cinek
61190fb7e7 Don't reset the velocity when flinging down just because of falsing 
The velocity was reset even if the direction was correct.

Test: collapse on the lockscreen and then fling down, observe no jitter
Bug: 32437839
Change-Id: I92454a1bb3d8156c8c3c537b266d061b16c82c7b
 2016-12-07 17:08:59 -08:00
Selim Cinek
727903ce56 Don't do icon animations if we are scrolling fast 
We are now not doing any icon animations anymore
in case we are scrolling fast.

Change-Id: I878d20a8e6114dc58c3908d18cc5ba20e59972cf
Test: add notifications, scroll fast
Bug: 32437839
 2016-12-07 17:08:55 -08:00
Svetoslav Ganov
63499946b0 Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 
am: b317e60014

Change-Id: Ieb3bf25ec225a0d3c5e568ff9c9e753a95be297c
 2016-12-08 01:04:53 +00:00
Daniel Nishi
161bba61a1 Merge "Add methods to query the private storage." into nyc-mr2-dev am: 652276ca3f 
am: fa29b71078

Change-Id: I5181051fceb98dc1aa297738dc9ad381fe1d1419
 2016-12-08 01:04:52 +00:00
Selim Cinek
01a73f9d0c Don't translate the notification content while scrolling 
While scrolling we don't translate the notification content
anymore and only have it while expanding.

Test: add notifications, scroll
Bug: 32437839
Change-Id: I21037b40ec92c20f2cd775815dcf5d8399348223
 2016-12-07 17:04:49 -08:00
Svetoslav Ganov
9aed2f6f53 Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 
am: b317e60014

Change-Id: I550293e05ce1d1039e3f22f72002e69df919f735
 2016-12-08 01:04:48 +00:00
TreeHugger Robot
55abee314c Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" 2016-12-08 01:00:10 +00:00
Daniel Nishi
fa29b71078 Merge "Add methods to query the private storage." into nyc-mr2-dev 
am: 652276ca3f

Change-Id: I09488ba9034d12113fd6bb4252069dedce3dbb6a
 2016-12-08 00:57:27 +00:00
Daniel Nishi
ffba913de5 Add methods to query the private storage. am: 845740e6e3 
am: 69264a1815

Change-Id: I87e61307c4aa91f2db33de17adcd2d8e467f2db7
 2016-12-08 00:57:24 +00:00
Svetoslav Ganov
b317e60014 Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e 
am: e123f41553

Change-Id: Id5cd6072d972b5d03512e83dc342a7c78341ffeb
 2016-12-08 00:57:21 +00:00
Hugo Benichi
74264329da Unit tests for NetworkNotificationManager 
Test: new unit test, no functional changes.
Bug: 32198726
Change-Id: I7c371ee547b36531924df34846c26f56a7f2dd7a
 2016-12-08 09:54:49 +09:00
Daniel Nishi
69264a1815 Add methods to query the private storage. 
am: 845740e6e3

Change-Id: I614a590d9c9dbc2982b0e44f97f1749259018526
 2016-12-08 00:51:08 +00:00
Svetoslav Ganov
e123f41553 Fix vulnerability in MemoryIntArray am: 86dfa094de 
am: 367023218e

Change-Id: I38d3f7089b9678210772f79215b44198b262e922
 2016-12-08 00:49:48 +00:00
Lei Yu
837a2aff65 Merge "Add tint for cellular icon." 2016-12-08 00:49:34 +00:00
Adrian Roos
8e73e66f84 Merge "Notifications: Fix bad layout for long texts" into nyc-mr2-dev am: 8f250c13d7 
am: 5b75958b0e

Change-Id: Iecd7e41a38b449ac4711633a56220306f5fc1a57
 2016-12-08 00:45:33 +00:00
Adrian Roos
c6a43b1e0b Notifications: Fix bad layout for long texts am: 62be439d26 
am: 52e364e4ba

Change-Id: I299401ef2627cbf55332cc0648398e19f25b594f
 2016-12-08 00:44:27 +00:00
Adrian Roos
dee593ab48 Merge "Revert "Direct Reply: Add back emoji button" This reverts commit 713fed9226a411d1ba83f925c10bc56fec4f2b70." into nyc-mr2-dev am: 3e3bb0d08f 
am: 4bc6d41f10

Change-Id: I4951dd2f74d7d23b6b9bc4de7369dc745961174b
 2016-12-08 00:43:27 +00:00
Adrian Roos
36ae71194f Revert "Direct Reply: Add back emoji button" This reverts commit 713fed9226. am: d575d88d8e 
am: 4613f571e4

Change-Id: Id44dcbf9e30da53011e3021b58d0ddea89a7820d
 2016-12-08 00:42:26 +00:00
Daniel Nishi
652276ca3f Merge "Add methods to query the private storage." into nyc-mr2-dev 2016-12-08 00:42:25 +00:00
Svetoslav Ganov
367023218e Fix vulnerability in MemoryIntArray 
am: 86dfa094de

Change-Id: I664782bea6e2b941ba94e51c65afd7e9b0f95f8d
 2016-12-08 00:42:18 +00:00
Adrian Roos
5b75958b0e Merge "Notifications: Fix bad layout for long texts" into nyc-mr2-dev 
am: 8f250c13d7

Change-Id: I308e580aeadeafd3d694b9e0d38ba25d62170ef4
 2016-12-08 00:36:07 +00:00
Adrian Roos
52e364e4ba Notifications: Fix bad layout for long texts 
am: 62be439d26

Change-Id: Ia0f6fe64cc853dcdaf84910055cf5a8b1e163ddd
 2016-12-08 00:35:59 +00:00
Adrian Roos
4bc6d41f10 Merge "Revert "Direct Reply: Add back emoji button" This reverts commit 713fed9226a411d1ba83f925c10bc56fec4f2b70." into nyc-mr2-dev 
am: 3e3bb0d08f

Change-Id: Ia1753e322ce9c0f77bf728abb9124fcce8797e56
 2016-12-08 00:34:24 +00:00
Adrian Roos
4613f571e4 Revert "Direct Reply: Add back emoji button" This reverts commit 713fed9226. 
am: d575d88d8e

Change-Id: Ia9e4c3942a4605d9520b833493bf7957e7a985c1
 2016-12-08 00:34:18 +00:00
Adrian Roos
8f250c13d7 Merge "Notifications: Fix bad layout for long texts" into nyc-mr2-dev 2016-12-08 00:30:08 +00:00
jackqdyulei
38fc3c7bd8 Remove qs_tile_text and qs_dual_tile_caret 
1. Replace the qs_tile_text with textColorSecondary
2. Remove the qs_dual_tile_caret because cannot find
usage about it.

Bug: 33413513
Test: Manual
Change-Id: Ib7a8be74b6e39de9a4cda0b6de887598f4a9621b
 2016-12-07 16:27:21 -08:00
Adrian Roos
3e3bb0d08f Merge "Revert "Direct Reply: Add back emoji button" This reverts commit 713fed9226a411d1ba83f925c10bc56fec4f2b70." into nyc-mr2-dev 2016-12-08 00:25:21 +00:00
Shuzhen Wang
71e6d62d23 Camera2: Consolidate the overriding of PRIVATE format 
We had overriding of PRIVATE format scattered at multiple places.
Consolidate them into one place.

Test: Camera preview/capture, and camcorder recording
Change-Id: I098ce93bba2000760a20c0297fcf0cb9d8c6caab
 2016-12-07 16:22:37 -08:00