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

173065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
c2230a9d1a am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue." 
* commit 'ef417bb7a06b0d58faa21f42599d7dd4fd9e3ff2':
  Prevent AudioService dead lock issue.
 2015-01-16 17:37:29 +00:00
Jean-Michel Trivi
ef417bb7a0 am 6a64a9cd: Merge "Prevent AudioService dead lock issue." 
* commit '6a64a9cd26cb8096f1ea67f7c7eee788370752b0':
  Prevent AudioService dead lock issue.
 2015-01-16 17:30:53 +00:00
Jean-Michel Trivi
6a64a9cd26 Merge "Prevent AudioService dead lock issue." 2015-01-16 17:23:36 +00:00
Alex Klyubin
6c8c19da7b am 950974e4: am 0b486da6: Merge "Remove DSA support from Android KeyStore and KeyChain." 
* commit '950974e40f08bc8f57668d480997f616ea0d3b5f':
  Remove DSA support from Android KeyStore and KeyChain.
 2015-01-16 16:56:09 +00:00
Alex Klyubin
0624b2c8b7 am a2a5d4cd: am 590c068e: Merge "Add KeyPairGenerator.EC backed by Android KeyStore." 
* commit 'a2a5d4cd6b5809756cb5b157de609623e740fcb4':
  Add KeyPairGenerator.EC backed by Android KeyStore.
 2015-01-16 16:56:02 +00:00
Alex Klyubin
950974e40f am 0b486da6: Merge "Remove DSA support from Android KeyStore and KeyChain." 
* commit '0b486da65076c13c98ab3973128c64f452b4c589':
  Remove DSA support from Android KeyStore and KeyChain.
 2015-01-16 16:49:50 +00:00
Alex Klyubin
a2a5d4cd6b am 590c068e: Merge "Add KeyPairGenerator.EC backed by Android KeyStore." 
* commit '590c068e8380ba73a6571ddf797d4ce02b390bcb':
  Add KeyPairGenerator.EC backed by Android KeyStore.
 2015-01-16 16:49:45 +00:00
Alex Klyubin
0b486da650 Merge "Remove DSA support from Android KeyStore and KeyChain." 2015-01-16 16:44:22 +00:00
Alex Klyubin
590c068e83 Merge "Add KeyPairGenerator.EC backed by Android KeyStore." 2015-01-16 16:44:06 +00:00
Narayan Kamath
2488c0ad50 am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars." 
* commit '27d3e79031081ab131d5bc4680b80e46a466db53':
  Fix a property name that's longer than 31 chars.
 2015-01-16 14:16:59 +00:00
Narayan Kamath
27d3e79031 am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars." 
* commit '706f6cf3839cc3e268e108a8e2e1ac0b2a2287a2':
  Fix a property name that's longer than 31 chars.
 2015-01-16 14:11:16 +00:00
Narayan Kamath
706f6cf383 Merge "Fix a property name that's longer than 31 chars." 2015-01-16 14:06:39 +00:00
Narayan Kamath
e5515772af Fix a property name that's longer than 31 chars. 
The name wasn't chosen without much thought and is intended
to be a temporary fix to keep devices booting while a better
name is decided upon.

bug: 18335678
Change-Id: Ic3451255d870f3395cfbcaa08a7764d93defc350
 2015-01-16 14:04:56 +00:00
Kenny Guy
4be433dc0b am 10dd6eef: am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 
* commit '10dd6eeff86a0618fa2984ae14aafde182f9da9d':
  Sync file before using JournaledFile commit.
 2015-01-16 11:31:13 +00:00
Kenny Guy
10dd6eeff8 am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 
* commit 'fd846dfbf1d1e51f8366a473d3b6f5722c06d77c':
  Sync file before using JournaledFile commit.
 2015-01-16 11:24:56 +00:00
Kenny Guy
fd846dfbf1 Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 2015-01-16 11:21:19 +00:00
Neil Fuller
b3f73dc517 am b55011e4: am f9c04f17: Merge "Removing HttpResponseCacheTest" 
* commit 'b55011e4265f866604ed0c3ffe0241436682c3d2':
  Removing HttpResponseCacheTest
 2015-01-16 10:29:51 +00:00
Jeff Sharkey
75c6a437a5 am 0174cd26: am f24e4900: Merge "Offer to detect non-SSL/TLS network traffic." 
* commit '0174cd26bb1786e6dc7acefd1ae70a0ad2c76543':
 2015-01-16 10:29:49 +00:00
Neil Fuller
b55011e426 am f9c04f17: Merge "Removing HttpResponseCacheTest" 
* commit 'f9c04f17882a61b46f7c6e93cf5f31a2f681c130':
  Removing HttpResponseCacheTest
 2015-01-16 10:23:23 +00:00
Neil Fuller
f9c04f1788 Merge "Removing HttpResponseCacheTest" 2015-01-16 10:19:28 +00:00
Jinsuk Kim
1122d5e760 am 6821efc6: am 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play 
* commit '6821efc66f2550bf9cb0d1067462ea10fafe72b9':
  CEC: Do not send <Active Source> when TV wakes up by one touch play
 2015-01-16 08:29:06 +00:00
Jinsuk Kim
c7f3679416 am 2bf3b2c4: am 964c00dd: CEC: Buffer Cec messages while allocating logical address 
* commit '2bf3b2c49c28d028ff615ba49cc876da8ae02fc3':
  CEC: Buffer Cec messages while allocating logical address
 2015-01-16 08:23:33 +00:00
Jinsuk Kim
6821efc66f am 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play 
* commit '2ab6d9fff36836c71bc0ee4afa25c11b48a9bd99':
  CEC: Do not send <Active Source> when TV wakes up by one touch play
 2015-01-16 08:23:05 +00:00
Jinsuk Kim
2ab6d9fff3 CEC: Do not send <Active Source> when TV wakes up by one touch play 
TV should respect the device that wakes up TV by one touch play
to keep its active source status by not sending <Active Source>.

Bug: 19039773

Change-Id: I0b27e95dcf986df90b25cc2a1891acd82940f13e
 2015-01-16 17:18:36 +09:00
Jinsuk Kim
2bf3b2c49c am 964c00dd: CEC: Buffer Cec messages while allocating logical address 
* commit '964c00dd7b270dcf80aea3450bbfc23502965cce':
  CEC: Buffer Cec messages while allocating logical address
 2015-01-16 08:17:07 +00:00
Jinsuk Kim
964c00dd7b CEC: Buffer Cec messages while allocating logical address 
CEC messages arriving before logical address allocation was being
discarded. Handles them by introducing a message buffer class
to keep them till the address allocation is finished.

Also updated per-device message buffer to use copied version of
messages list for iterating to avoid the possible concurrent
modification exception.

Bug: 18896770
Change-Id: Ifb74fd265510de6dde322e0b3bc5b504fecb4daa
 2015-01-16 16:18:32 +09:00
Jeff Sharkey
c2ae6fb9ad Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmerge 
Change-Id: Id6db8cce3a477572478a1d50f624823200848896
 2015-01-15 21:27:13 -08:00
Jeff Sharkey
0174cd26bb am f24e4900: Merge "Offer to detect non-SSL/TLS network traffic." 
* commit 'f24e490058bc59344f8bd10fb6cbbffa792fbc05':
  Offer to detect non-SSL/TLS network traffic.
 2015-01-16 01:34:03 +00:00
Jeff Sharkey
f24e490058 Merge "Offer to detect non-SSL/TLS network traffic." 2015-01-16 01:11:27 +00:00
Jeff Sharkey
605eb79c95 Offer to detect non-SSL/TLS network traffic. 
Introduces new module that provides network-related features for
the StrictMode developer API.  The first feature offers to detect
sockets sending data not wrapped inside a layer of SSL/TLS
encryption.

When a developer enables, we ask netd to watch all outgoing traffic
from our UID, and penalize us accordingly if cleartext sockets are
detected.  When enabled, netd captures the offending packet and
passes it back to the owning process to aid investigations.  When
death penalty is requested, all future traffic on the socket is
blocked, which usually results in a useful stacktrace before the
app is actually killed.

Bug: 18335678
Change-Id: I3adbc974efd8d3766b4b1a23257563bb82d53c29
 2015-01-15 15:59:03 -08:00
Geoff Mendal
6ba9c529fd am d3403e45: (-s ours) am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd3403e45d6d89d0307c0fc9427cc84792ac6ee83':
  Import translations. DO NOT MERGE
 2015-01-15 23:51:22 +00:00
Geoff Mendal
d3403e45d6 am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'faf92d725649337a29312603dc8c10a3f0ee103a':
  Import translations. DO NOT MERGE
 2015-01-15 23:45:54 +00:00
Geoff Mendal
faf92d7256 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-15 23:39:49 +00:00
Craig Mautner
b523c55d76 am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '41d54237380d5f3c06ab2a71715e22f048278ecf':
  Debug for bug 18201239.
 2015-01-15 23:30:41 +00:00
Craig Mautner
41d5423738 am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '92cf3608b8f171f84f74ab1f7193a6a816063d14':
  Debug for bug 18201239.
 2015-01-15 23:24:40 +00:00
Craig Mautner
92cf3608b8 Merge "Debug for bug 18201239." into lmp-mr1-dev 2015-01-15 23:18:40 +00:00
Chris Craik
04b633c526 am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '0de2eca5fc439e2622cc0cc5a54cd9a5938f67c6':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-15 23:15:56 +00:00
Geoff Mendal
116f90c895 Import translations. DO NOT MERGE 
Change-Id: I4580b358133cd261985459a26a1c4bc36a14d630
Auto-generated-cl: translation import
 2015-01-15 15:14:15 -08:00
Chris Craik
0de2eca5fc am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '112e35b4641a1a8cad3616c8209ab47f03f9ab67':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-15 23:08:11 +00:00
Chris Craik
112e35b464 Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 2015-01-15 23:04:15 +00:00
Craig Mautner
9776ad41b9 Debug for bug 18201239. 
Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae
 2015-01-15 14:38:39 -08:00
Alan Viverette
78dfb182d2 am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit 'dbe54533499571f34ddc126ea21379932ea1d6d7':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:37:40 +00:00
Alan Viverette
dbe5453349 am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '77e1f7a27bfdd040b00d7ec97440d3cb1e5b79a1':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:32:27 +00:00
Alan Viverette
77e1f7a27b Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 2015-01-15 22:25:08 +00:00
Eric Laurent
c3fb94caf0 am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit '4772f8b841dc1ad50999e2cca3f1d366b325b915':
  AudioManager: make AudioPortEventHandler static
 2015-01-15 22:21:58 +00:00
Eric Laurent
4772f8b841 am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit '16cfa8ddfd6c18577f5d38e545597a63889d9779':
  AudioManager: make AudioPortEventHandler static
 2015-01-15 22:16:28 +00:00
Eric Laurent
16cfa8ddfd Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 2015-01-15 22:10:53 +00:00
Alan Viverette
03748a5707 Ensure scroll assets are drawn with correct opacity 
Bug: 18903443
Change-Id: I5a7e738b1a09c22857683e2540c96a050b82866e
 2015-01-15 13:00:21 -08:00
Eino-Ville Talvala
31028fa621 am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 
* commit '1334a6f34296094baddc0d4c0c93357532b2a96d':
  Camera: Clarify JNI exception message
 2015-01-15 20:13:11 +00:00
Eino-Ville Talvala
1334a6f342 am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 
* commit '8d47bc97e642cd0d0caf31d09efe05d8dc233f27':
  Camera: Clarify JNI exception message
 2015-01-15 20:06:34 +00:00