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

180222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
21d940c3cf resolved conflicts for merge of 20e7ab86 to master 
Change-Id: I346419455a1a97c3eddb639188bcd81593887e97
 2015-01-16 11:56:55 -08:00
Rich Slogar
20e7ab8667 am d6ed0384: am d15015d2: am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'd6ed0384bf75f23f4184eb92297a4ff8b7f5c090':
  docs: studio sample procedure update
 2015-01-16 18:17:33 +00:00
Chris Craik
98f6bf4c1c am a2e1630b: am 996d3974: am ed35f5c7: Merge "Fast loadInverse() implementation for the common case" 
* commit 'a2e1630b1e82f19c8e58882ab484ed21c3508692':
  Fast loadInverse() implementation for the common case
 2015-01-16 18:14:01 +00:00
Rich Slogar
d6ed0384bf am d15015d2: am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'd15015d206cc3feb3c5a8f6327f71d16432ceca0':
  docs: studio sample procedure update
 2015-01-16 18:10:40 +00:00
Chris Craik
a2e1630b1e am 996d3974: am ed35f5c7: Merge "Fast loadInverse() implementation for the common case" 
* commit '996d39743a73cc37fb888779d52323743f50c666':
  Fast loadInverse() implementation for the common case
 2015-01-16 18:07:23 +00:00
Rich Slogar
d15015d206 am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'f38122dae0a344bc8abe3eaed7322ea3675b05f5':
  docs: studio sample procedure update
 2015-01-16 18:03:23 +00:00
Chris Craik
996d39743a am ed35f5c7: Merge "Fast loadInverse() implementation for the common case" 
* commit 'ed35f5c788d263c0b4754908b6d5cbb2f5a48caa':
  Fast loadInverse() implementation for the common case
 2015-01-16 18:01:39 +00:00
Chris Craik
ed35f5c788 Merge "Fast loadInverse() implementation for the common case" 2015-01-16 17:55:40 +00:00
Jean-Michel Trivi
a47d85e8dc am c2230a9d: am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue." 
* commit 'c2230a9d1a7bba12b78630a0dfbad7be5c97050f':
  Prevent AudioService dead lock issue.
 2015-01-16 17:43:20 +00:00
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
1b69655d7d am 6c8c19da: am 950974e4: am 0b486da6: Merge "Remove DSA support from Android KeyStore and KeyChain." 
* commit '6c8c19da7b631ee6647c1655e737004d71deeb38':
  Remove DSA support from Android KeyStore and KeyChain.
 2015-01-16 17:02:00 +00:00
Alex Klyubin
bd124f9d55 am 0624b2c8: am a2a5d4cd: am 590c068e: Merge "Add KeyPairGenerator.EC backed by Android KeyStore." 
* commit '0624b2c8b75c13b7cdffe84bda3e5a1afd368220':
  Add KeyPairGenerator.EC backed by Android KeyStore.
 2015-01-16 17:01:55 +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
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