drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
298,960 Commits 1 Branch 0 Tags
Commit Graph

298960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
012932e059 Import translations. DO NOT MERGE 
Change-Id: Iafe4d2feadf4e7ecbb6efc8fb7bd3158a570208d
Auto-generated-cl: translation import
 2016-12-08 23:57:59 -08:00
TreeHugger Robot
1ee9d38a6b Merge "Add system API to install ephemeral apps" 2016-12-09 00:37:40 +00:00
Svetoslav Ganov
e362784a6f Merge "Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029 am: 5250d90637 am: 49e3ce4800" into nyc-mr2-dev-plus-aosp 
am: d2b34ce8cf

Change-Id: I630e9d4aece166075fdd55ed18466071b734ebf7
 2016-12-09 00:17:53 +00:00
Svetoslav Ganov
d415d5e8e5 Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029 am: 5250d90637 am: 49e3ce4800 
am: ca657b7e95

Change-Id: I960f369712984b460e06f219145816d3ba6d749d
 2016-12-09 00:17:42 +00:00
Svetoslav Ganov
7f88e79dbd Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029 am: 5250d90637 am: e812cd0379 
am: 9db8a68022  -s ours

Change-Id: Ie5eeda144c295e6f6366819f5cdf3a02a90b43aa
 2016-12-09 00:16:32 +00:00
Jorim Jaggi
c7613cb184 Merge "Light navigation bar support (1/2)" 2016-12-09 00:07:51 +00:00
TreeHugger Robot
f2079a293e Merge "Do not call buildInputMethodListLocked twice" 2016-12-08 23:22:37 +00:00
Todd Kennedy
b771768249 Add system API to install ephemeral apps 
Test: manual; install using "adb install --ephemeral"
Change-Id: Idce214779fea5f3c4a0121542319044f9f0e0a42
 2016-12-08 14:51:43 -08:00
Android Build Merger (Role)
d2b34ce8cf Merge "Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029 am: 5250d90637 am: 49e3ce4800" into nyc-mr2-dev-plus-aosp 2016-12-08 21:56:37 +00:00
Svetoslav Ganov
ca657b7e95 Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029 am: 5250d90637 
am: 49e3ce4800

Change-Id: Ic4794d1bdc5411efd6e38d1b0b8b1703ba956bf0
 2016-12-08 21:55:39 +00:00
Svetoslav Ganov
9db8a68022 Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029 am: 5250d90637 
am: e812cd0379

Change-Id: I9d4b3974063c19262bfad58d4f71e535dfa24f0e
 2016-12-08 21:55:33 +00:00
Jorim Jaggi
40db029cfe Light navigation bar support (1/2) 
Test: Open an app that has this flag set.

Test: android.systemui.cts.LightBarTests

Bug: 29058491
Change-Id: Idaff65fdd5c59b68ae9920726c9ea50b53f96675
 2016-12-08 13:52:41 -08:00
Svetoslav Ganov
e812cd0379 Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029 
am: 5250d90637

Change-Id: I20c20bee05321d722e83ee47ad6d13e308178e02
 2016-12-08 21:51:05 +00:00
Svetoslav Ganov
49e3ce4800 Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029 
am: 5250d90637

Change-Id: I08c3a670598d8d26694b7d282d0bd18ffb4faf9b
 2016-12-08 21:51:00 +00:00
Svetoslav Ganov
5250d90637 Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f 
am: a5ee109029

Change-Id: If1b852faa812b0bcb7419ae0f75a3e2349926de0
 2016-12-08 21:46:34 +00:00
Svetoslav Ganov
a5ee109029 Fix vulnerability in MemoryIntArray am: a97171ec49 
am: fb12dd509f

Change-Id: I269ec7d61ebdc9f485d759d1398d5fa4eacf868f
 2016-12-08 21:42:05 +00:00
Jorim Jaggi
5686ade06c Merge "Fix sysui crashlooping" 2016-12-08 21:42:03 +00:00
Svetoslav Ganov
fb12dd509f Fix vulnerability in MemoryIntArray 
am: a97171ec49

Change-Id: Ifa2221a9b8ca705ef0239d61772938ac11761ce2
 2016-12-08 21:37:33 +00:00
Yoshinori Hirano
ae563e99c9 Merge "Don't include front most excluded task in Multi-Window mode" am: a8c2c229d7 am: 435db7e690 am: 14ea407321 
am: aa6018c735

Change-Id: Ibb292f07718a9782404a84502e475abf0c26c8aa
 2016-12-08 21:26:51 +00:00
Yoshinori Hirano
aa6018c735 Merge "Don't include front most excluded task in Multi-Window mode" am: a8c2c229d7 am: 435db7e690 
am: 14ea407321

Change-Id: I90bd2c3fe52c4f3b82a1b8794176716cdafbe9ea
 2016-12-08 21:18:07 +00:00
Yoshinori Hirano
14ea407321 Merge "Don't include front most excluded task in Multi-Window mode" am: a8c2c229d7 
am: 435db7e690

Change-Id: Iedb0b93fd599170132ddd545490a3564e575cdc0
 2016-12-08 21:13:10 +00:00
Yoshinori Hirano
435db7e690 Merge "Don't include front most excluded task in Multi-Window mode" 
am: a8c2c229d7

Change-Id: If5c1a8de2cc951d8ec97b40c57cbbc8313137a37
 2016-12-08 21:05:16 +00:00
Treehugger Robot
a8c2c229d7 Merge "Don't include front most excluded task in Multi-Window mode" 2016-12-08 20:52:15 +00:00
Jason Monk
89377bb609 Fix sysui crashlooping 
Fix startup lifecycle on header.

Test: runtest systemui
Change-Id: I732cc2fb6693b9857c14534154d02a9b18e7d44a
 2016-12-08 15:32:07 -05:00
Svetoslav Ganov
a97171ec49 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: I1004579181ff7a223ef659e85c46100c47ab2409
 2016-12-08 11:51:26 -08:00
TreeHugger Robot
eddb8b0cf4 Merge "Don't accidentally delete renamed packages" 2016-12-08 19:44:57 +00:00
TreeHugger Robot
ac30b3bb5f Merge "Replace Toast-based cheat sheets with tooltips" 2016-12-08 19:25:53 +00:00
Selim Cinek
e67e2a28ed Merge changes I25effa3e,Ibb58d1aa,I92454a1b,I878d20a8,I21037b40, ... 
* changes:
  Enforcing padding on the bottom of the keyguard
  Fixes that notifications were sometimes clipped on the lockscreen
  Don't reset the velocity when flinging down just because of falsing
  Don't do icon animations if we are scrolling fast
  Don't translate the notification content while scrolling
  Fixed the scrim drawing in seascape
  Placed the overflow indicator perfectly in the collapsed center
  Improved the low priority behavior with the shelf
  Improved the performance of the notification shelf
  Fixed a bug where heads up notifications had no icon
  Added possibility to use canned animation for icons
 2016-12-08 18:48:49 +00:00
Android Build Merger (Role)
ff81661002 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: 462d9a3335 -s ours" into nyc-mr2-dev-plus-aosp am: 7892ea03f2 -s ours" 2016-12-08 18:39:01 +00:00
Android Build Merger (Role)
d41f53d296 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: 462d9a3335 -s ours am: b598499070 -s ours" 2016-12-08 18:38:36 +00:00
TreeHugger Robot
e3a3524dac Merge changes I6477b6d1,Ieb11345f 
* changes:
  Adding ability for an app to request auto-enter picture-in-picture.
  Only allowed visible, non-stopped activities to enter PIP.
 2016-12-08 18:37:45 +00:00
Bill Yi
61e096c9cc Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: 462d9a3335 -s ours" into nyc-mr2-dev-plus-aosp 
am: 7892ea03f2  -s ours

Change-Id: I339f03cf28bb17f366dc418ff4dd258f71f952c4
 2016-12-08 18:37:35 +00:00
Bill Yi
dcb8431521 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: 462d9a3335 -s ours 
am: b598499070  -s ours

Change-Id: I068769db6c3d6579f6b6b2a44b408673e31922dc
 2016-12-08 18:37:29 +00:00
Android Build Merger (Role)
795dc62cd6 Merge "Merge "Import translations. DO NOT MERGE am: b004945727 -s ours am: f1a5ffbf99 -s ours" into nyc-mr2-dev-plus-aosp am: 314938f9bd -s ours" 2016-12-08 18:37:01 +00:00
Android Build Merger (Role)
3f09dda090 Merge "Import translations. DO NOT MERGE am: b004945727 -s ours am: f1a5ffbf99 -s ours am: 2781850054 -s ours" 2016-12-08 18:36:34 +00:00
Bill Yi
997b9410bc Merge "Import translations. DO NOT MERGE am: b004945727 -s ours am: f1a5ffbf99 -s ours" into nyc-mr2-dev-plus-aosp 
am: 314938f9bd  -s ours

Change-Id: If04db51de38abc16a4f6813cc79409c44ae7d8a9
 2016-12-08 18:35:42 +00:00
Bill Yi
f69418c699 Import translations. DO NOT MERGE am: b004945727 -s ours am: f1a5ffbf99 -s ours 
am: 2781850054  -s ours

Change-Id: I85e2a5088a29ff269c3f87b8568621e899962cb5
 2016-12-08 18:35:35 +00:00
Android Build Merger (Role)
6fb415e9a4 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours am: f014d755a1 -s ours" into nyc-mr2-dev-plus-aosp am: 9861c20962 -s ours" 2016-12-08 18:35:08 +00:00
Android Build Merger (Role)
99718574b6 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours am: f014d755a1 -s ours am: 54ba91b55e -s ours" 2016-12-08 18:34:41 +00:00
Bill Yi
cbe8da6381 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours am: f014d755a1 -s ours" into nyc-mr2-dev-plus-aosp 
am: 9861c20962  -s ours

Change-Id: I9fe438ee15beb1613798e45d59112040d4ac00b7
 2016-12-08 18:33:48 +00:00
Bill Yi
78229c3b0f Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours am: f014d755a1 -s ours 
am: 54ba91b55e  -s ours

Change-Id: I7faf029bfd36a76b4d270b7827f6d5fb46c5d288
 2016-12-08 18:33:42 +00:00
Android Build Merger (Role)
7a983c1d91 Merge "Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: a40b64efdd -s ours" into nyc-mr2-dev-plus-aosp am: f65de74901 -s ours" 2016-12-08 18:31:27 +00:00
Android Build Merger (Role)
94982c7203 Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: a40b64efdd -s ours am: 4f294c5d90 -s ours" 2016-12-08 18:31:02 +00:00
Bill Yi
5e7c1ba9de Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: a40b64efdd -s ours" into nyc-mr2-dev-plus-aosp 
am: f65de74901  -s ours

Change-Id: I029e8716b8904ac91ef36346fa5bf668f1f2def7
 2016-12-08 18:30:08 +00:00
Bill Yi
4a6c20b1a1 Import translations. DO NOT MERGE am: c30efc0214 -s ours am: a40b64efdd -s ours 
am: 4f294c5d90  -s ours

Change-Id: I2dd78b1c67859ccb39965f1179a1741c7edf32e3
 2016-12-08 18:30:04 +00:00
Android Build Merger (Role)
b1d8b592e5 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: d6c831513f -s ours" into nyc-mr2-dev-plus-aosp am: 0d31f6d669 -s ours" 2016-12-08 18:29:41 +00:00
Android Build Merger (Role)
907cdb326a Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: d6c831513f -s ours am: b3eebe072c -s ours" 2016-12-08 18:29:16 +00:00
Bill Yi
e3d7e20388 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: d6c831513f -s ours" into nyc-mr2-dev-plus-aosp 
am: 0d31f6d669  -s ours

Change-Id: I444fc8d832d8415b3599ff8f91828d1af554f995
 2016-12-08 18:28:24 +00:00
Bill Yi
16d5d0b13f Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: d6c831513f -s ours 
am: b3eebe072c  -s ours

Change-Id: I49963006c9728adb2e6875338548f296cc3e5253
 2016-12-08 18:28:18 +00:00
Android Build Merger (Role)
459a9f955d Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: a62eff1f94 -s ours" into nyc-mr2-dev-plus-aosp am: 1aec82e5ba -s ours" 2016-12-08 18:27:50 +00:00