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

180195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
d28f0fee61 am 2488c0ad: am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars." 
* commit '2488c0ad505846f7655a7434006edea4515b02d0':
  Fix a property name that's longer than 31 chars.
 2015-01-16 14:23:44 +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
2dc53c560b am 4be433dc: am 10dd6eef: am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 
* commit '4be433dc0b817fd4129e2bd99edb4c484f980600':
  Sync file before using JournaledFile commit.
 2015-01-16 11:36:46 +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
d3ef970ca8 am b3f73dc5: am b55011e4: am f9c04f17: Merge "Removing HttpResponseCacheTest" 
* commit 'b3f73dc5179532d587f743a9831faff3584c7c5b':
  Removing HttpResponseCacheTest
 2015-01-16 10:35:30 +00:00
Jeff Sharkey
53edaeafd8 am 75c6a437: am 0174cd26: am f24e4900: Merge "Offer to detect non-SSL/TLS network traffic." 
* commit '75c6a437a58d820025ad4cd489a9228c81e46708':
 2015-01-16 10:35:27 +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
b713c61ad7 am 1122d5e7: am 6821efc6: am 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play 
* commit '1122d5e760230290d051da54aba1ab8c44d446d5':
  CEC: Do not send <Active Source> when TV wakes up by one touch play
 2015-01-16 08:34:37 +00:00
Jinsuk Kim
81335395a7 am c7f36794: am 2bf3b2c4: am 964c00dd: CEC: Buffer Cec messages while allocating logical address 
* commit 'c7f367941664d734d2085ee9781711cb865a5d44':
  CEC: Buffer Cec messages while allocating logical address
 2015-01-16 08:30:22 +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
0ec9c29fb7 am c2ae6fb9: Merge commit \'605eb79c9519307147fc1795d0eb155638a7f542\' into manualmerge 
* commit 'c2ae6fb9ada52e9c990542a6d1cae80085318f31':
  Offer to detect non-SSL/TLS network traffic.
 2015-01-16 06:09:05 +00:00
Jeff Sharkey
c2ae6fb9ad Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmerge 
Change-Id: Id6db8cce3a477572478a1d50f624823200848896
 2015-01-15 21:27:13 -08:00
Craig Mautner
8ec2f1f04e Merge "Replace waitingVisible and other refactors" 2015-01-16 02:01:13 +00:00
Craig Mautner
8667eff6b8 Merge "Remove unused method moveTaskToBack." 2015-01-16 01:54:59 +00:00
Craig Mautner
8c14c15aad Replace waitingVisible and other refactors 
- ActivityRecord.waitingVisible is identical to
ActivityStackSupervisor.mWaitingVisibleActivities.contains(). This
ArrayList is never very large so much code can be simplified by
eliminating the waitingVisible member.

- The processStoppingActivityLocked() method can eliminate a lot of
variables by traversing the list top down. This makes the code
simpler to analyze and maintain.

- Declarations of ArrayLists do not need parameterization in the new
constructor. These have been removed in ActivityStackSupervisor.

Fixes item #5 of bug 18088522.

Change-Id: Ib9d648c5fa32c8dd7313882864886c929e1ebc21
 2015-01-15 17:39:28 -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
Craig Mautner
428ecf2966 Remove unused method moveTaskToBack. 
Everyone uses moveActivityTaskToBack() instead.

Fixes item #3 of bug 18088522.

Change-Id: I16028335fe1eef8a2aa47804f46536e395a16d8c
 2015-01-15 17:20:40 -08:00
Jeff Sharkey
f24e490058 Merge "Offer to detect non-SSL/TLS network traffic." 2015-01-16 01:11:27 +00:00
Andy Hung
84a6d9e609 Merge "Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers" 2015-01-16 00:21:17 +00:00
Mike Lockwood
61369de03e Merge "MidiManager bug fixing:" 2015-01-16 00:09:57 +00:00
Mike Lockwood
98cc8e5a64 MidiManager bug fixing: 
- fix off by one error that caused failure handling one byte messages

- poll thread now terminates properly in UsbMidiDevice

- fix cleanup logic in MidiDeviceServer

Change-Id: I0c13a98b6542cfb271b51678e81d1822c8da2985
 2015-01-15 16:07:28 -08:00
Geoff Mendal
58b859163c am 6ba9c529: (-s ours) am d3403e45: (-s ours) am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '6ba9c529fda8aba5f1157b4ff3feb1a494e673ad':
  Import translations. DO NOT MERGE
 2015-01-16 00:06:36 +00:00
Craig Mautner
c62d355b3f am b523c55d: am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit 'b523c55d76ef3215538158a65bdea70c9897993e':
  Debug for bug 18201239.
 2015-01-16 00:06:29 +00:00
Chris Craik
d5049e2f74 am 04b633c5: am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '04b633c526b3ea72cb13f0c0472673f3baf07625':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-16 00:06:14 +00:00
Alan Viverette
f6e92936c7 am 78dfb182: am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '78dfb182d29259630277ee40d51c7350df1e7dac':
  Ensure scroll assets are drawn with correct opacity
 2015-01-16 00:05:51 +00:00
Eric Laurent
1eadf93d99 am c3fb94ca: am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit 'c3fb94caf0d5a4b8f6a3c9bbc6ce31cbfd0ef2f0':
  AudioManager: make AudioPortEventHandler static
 2015-01-16 00:05:38 +00:00
Eino-Ville Talvala
950597d032 am 31028fa6: am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 
* commit '31028fa621b0f182f39b1f6d391963e8e6f627fe':
  Camera: Clarify JNI exception message
 2015-01-16 00:05:04 +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
Todd Kennedy
28432f0360 Merge "Rename the binder call createActivityContainer" 2015-01-15 23:37:22 +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
Todd Kennedy
ca4d842205 Rename the binder call createActivityContainer 
Change the call to createVirtualActivityContainer to better describe what's
actually being created with the call.

Change-Id: Id3a32df19a5bb6740cbabcd65897349e9f2f2946
 2015-01-15 15:22:17 -08: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