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

14989 Commits

Author SHA1 Message Date
Wink Saville
0cbc781134 am e7329140: am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'e7329140c0ff846acf5bc8749f525b18880177ef':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-04 11:10:16 -07:00
Vinit Deshapnde
2ecde96ad4 am c9ed4e98: am 78624d61: am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev 
* commit 'c9ed4e98b880926d0621f10f8a9ce7a6b5f2016b':
  Set P2p statemachine's network manager before starting Wifi
 2013-10-04 11:10:11 -07:00
Michael Wright
1626ea51a8 am 4138766a: am 448a1f6f: am cf5b34b0: Merge "Ensure WallpaperEngine has correct size information" into klp-dev 
* commit '4138766ab6fbbc1e010609f85fe5941405d23fa4':
  Ensure WallpaperEngine has correct size information
 2013-10-04 11:08:15 -07:00
Craig Mautner
ff942d6d83 am 3ab914cf: am 63c375d3: am 27b82632: Merge "Retain IME assignment if no windows accept input." into klp-dev 
* commit '3ab914cfa504c758ecac4fd8272da36893b8e85c':
  Retain IME assignment if no windows accept input.
 2013-10-04 11:08:10 -07:00
Vinit Deshapnde
1e9863f06a am 90a5192c: am e72aa641: am 3eb6e4b4: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 
* commit '90a5192cd4af89a1b363ca25be2a63d0e57010d4':
  Fix EAP-TLS reconnect after reboot issue
 2013-10-04 11:08:06 -07:00
Jeff Sharkey
612fddebaa am 9701c4ef: am 3adf2172: am fe5bf7a7: Merge "Fix mount path prefix checking." into klp-dev 
* commit '9701c4ef1d72f731f3519cfb2036315b5f1f4f1e':
  Fix mount path prefix checking.
 2013-10-04 09:10:56 -07:00
Marco Nelissen
2a0a5d1022 am d9ff894e: am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit 'd9ff894eae0b3acd3c89585a80ebd2039ed1de8c':
  Add PowerManager method to assign blame to a single uid
 2013-10-04 09:10:53 -07:00
Craig Mautner
a015e9d850 am 71bbf108: am b690557c: am 02fa2332: Merge "Make DimLayer size dependent on stack layout." into klp-dev 
* commit '71bbf1086db0303ee8e5f8bea6bde68d25fcc57a':
  Make DimLayer size dependent on stack layout.
 2013-10-04 09:10:26 -07:00
John Spurlock
b7ba2630bd am bee8af82: am c3752cfb: am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev 
* commit 'bee8af8207938fb0d29b38d915be1803edc64d69':
  Store decor rects per window for transition cropping.
 2013-10-04 09:10:17 -07:00
Wink Saville
e7329140c0 am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'fe587dba3a70c658140eac1b13996b7d8e6eeda2':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-03 21:30:29 -07:00
Vinit Deshapnde
c9ed4e98b8 am 78624d61: am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev 
* commit '78624d61f1a138610bdbffe3d1c6ddf89f3472c8':
  Set P2p statemachine's network manager before starting Wifi
 2013-10-03 21:30:26 -07:00
Alan Viverette
913949dbd6 Merge "Simplify matrix calculations for display adjustment" 2013-10-04 01:05:10 +00:00
Wink Saville
a48ccdd6fb Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 2013-10-04 00:52:59 +00:00
Vinit Deshapnde
5eb2b0ca76 Merge "Set P2p statemachine's network manager before starting Wifi" into klp-dev 2013-10-04 00:40:32 +00:00
Alan Viverette
36f4b08341 Simplify matrix calculations for display adjustment 
Removes MatrixUtils, which is now unused.

Change-Id: Ifa809d2aeafa415d3861e59e4c7a8b115e76a2df
 2013-10-03 16:46:04 -07:00
Adam Lesinski
38dc2ad85e am b2db2fbc: am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev 
* commit 'b2db2fbce33dbcfa52ccb20267ad4897c558c34f':
  Private flags are masked in correct variable
 2013-10-03 16:43:17 -07:00
Svetoslav
9bc6cdaed3 am a0867328: am 36f38f4e: am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev 
* commit 'a0867328db32884d0791435da04ecdeb297d0246':
  Fix screen magnifier scaling due to ScaleGestureDetector changes.
 2013-10-03 16:43:13 -07:00
John Reck
eebcc0ff60 am cd6a2d30: am 47dc3248: am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev 
* commit 'cd6a2d3079ee67658535773021c16787b9adba6e':
  Reduce max recents on lowram
 2013-10-03 16:43:09 -07:00
Vinit Deshapnde
04675f6ae9 Set P2p statemachine's network manager before starting Wifi 
Wifi statemachine starts P2p statemachine; which uses network management
service to (i.e. netd) to start p2p0 interface. But it only gets a
reference to network management service in conenctivityServiceReady().
Calling that later means there's a chance of a race between this
thread's setting of the network manager, and P2p statemachine thread's
usage of the same.

Bug: 11048296
Change-Id: If151026ed5fbb12db57ee7f9bdd47c67dd7142e5
 2013-10-03 16:18:56 -07:00
Michael Wright
4138766ab6 am 448a1f6f: am cf5b34b0: Merge "Ensure WallpaperEngine has correct size information" into klp-dev 
* commit '448a1f6fed1d16578527500157da4ed3c72f2b90':
  Ensure WallpaperEngine has correct size information
 2013-10-03 15:42:08 -07:00
Craig Mautner
3ab914cfa5 am 63c375d3: am 27b82632: Merge "Retain IME assignment if no windows accept input." into klp-dev 
* commit '63c375d325c8b89111551c8d236fc46ff1304ff2':
  Retain IME assignment if no windows accept input.
 2013-10-03 15:42:01 -07:00
Vinit Deshapnde
90a5192cd4 am e72aa641: am 3eb6e4b4: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 
* commit 'e72aa641d38911ed57c81ff4769ebe2c7ebb1397':
  Fix EAP-TLS reconnect after reboot issue
 2013-10-03 15:41:58 -07:00
Jeff Sharkey
9701c4ef1d am 3adf2172: am fe5bf7a7: Merge "Fix mount path prefix checking." into klp-dev 
* commit '3adf2172c35b1fae86244641c6bb051c8ba39041':
  Fix mount path prefix checking.
 2013-10-03 15:39:21 -07:00
Marco Nelissen
d9ff894eae am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit '05f56fc121e176ef4e227639a7b636a875f38037':
  Add PowerManager method to assign blame to a single uid
 2013-10-03 15:39:18 -07:00
Craig Mautner
71bbf1086d am b690557c: am 02fa2332: Merge "Make DimLayer size dependent on stack layout." into klp-dev 
* commit 'b690557c84b33aa04d6fecf3e2c9fb737291a564':
  Make DimLayer size dependent on stack layout.
 2013-10-03 15:38:55 -07:00
John Spurlock
bee8af8207 am c3752cfb: am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev 
* commit 'c3752cfb6d5381795433ccdbcd8f84cada832790':
  Store decor rects per window for transition cropping.
 2013-10-03 15:38:52 -07:00
Adam Lesinski
b2db2fbce3 am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev 
* commit '6d90862f2387d24c28e9d1c8f080cb9a4ff15011':
  Private flags are masked in correct variable
 2013-10-03 15:38:44 -07:00
Svetoslav
a0867328db am 36f38f4e: am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev 
* commit '36f38f4efc52f195a7f30f986ed3e6633aa179f4':
  Fix screen magnifier scaling due to ScaleGestureDetector changes.
 2013-10-03 15:38:42 -07:00
John Reck
cd6a2d3079 am 47dc3248: am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev 
* commit '47dc3248e09002a5a55dc427f752da8ebd623868':
  Reduce max recents on lowram
 2013-10-03 15:38:38 -07:00
Alex Klyubin
87e385effb am aa947f15: am a9bce468: am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG." 
* commit 'aa947f15314a4239de91a1cd0bea085e3399d43e':
  Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
 2013-10-03 15:23:23 -07:00
Alex Klyubin
aa947f1531 am a9bce468: am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG." 
* commit 'a9bce46876d6f1f82727ab6922748fcc6b43c767':
  Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
 2013-10-03 15:21:08 -07:00
Alex Klyubin
a9bce46876 am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG." 
* commit '84742149257554e804b155d15b0af762d6f737ca':
  Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
 2013-10-03 15:17:49 -07:00
Alex Klyubin
6ab3d20d3c Make EntropyMixer mix in output of Hardware RNG into Linux RNG. 
On devices with Hardware RNG (HW RNG), this makes EntropyMixer
periodically (every three hours) read 512 bytes from HW RNG and mix
them into the Linux RNG.

This is done without increasing Linux RNG's entropy estimates to
avoid having to trust the quality of the HW RNG. This approach cannot
reduce the quality of the Linux RNG output, but may increase it.

Change-Id: Ifde851004301ffd41b2189151a64a0c5989c630f
 2013-10-03 15:07:37 -07:00
Alex Klyubin
6981a92433 am 3e64aa11: am 6a603e7b: am 1a07229b: Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes." 
* commit '3e64aa117ad52c71d9676761b8f6a6947cb7ac15':
  Reduce EntropyMixer seed size from 4096 to 512 bytes.
 2013-10-03 15:00:45 -07:00
Alex Klyubin
3e64aa117a am 6a603e7b: am 1a07229b: Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes." 
* commit '6a603e7be9036c22d61a4977afd17bb227cf6ea2':
  Reduce EntropyMixer seed size from 4096 to 512 bytes.
 2013-10-03 14:57:20 -07:00
Michael Wright
cf5b34b0c4 Merge "Ensure WallpaperEngine has correct size information" into klp-dev 2013-10-03 21:51:59 +00:00
Alex Klyubin
6a603e7be9 am 1a07229b: Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes." 
* commit '1a07229bc2042676c866051938ebe35d9cded900':
  Reduce EntropyMixer seed size from 4096 to 512 bytes.
 2013-10-03 14:36:49 -07:00
Craig Mautner
27b826325c Merge "Retain IME assignment if no windows accept input." into klp-dev 2013-10-03 21:28:38 +00:00
Vinit Deshapnde
3eb6e4b4e4 Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 2013-10-03 21:19:52 +00:00
Michael Wright
5203a8b50b Ensure WallpaperEngine has correct size information 
Currently it's possible for the WallpaperManagerService to receive a
request to change the desired wallpaper size between when it attaches
to the WallpaperService and when the Engine attaches back to it. This
means that the Engine will be created with the prior dimensions and
won't receive the update. Check to see if we're in this state and
make note to update the Engine once it attaches to ensure that the
Engine always has the correct dimensions.

Bug: 10853302
Change-Id: I8d5cd3371b269dbb4c0ff2d75c68529b69028ae5
 2013-10-03 14:16:42 -07:00
Craig Mautner
ae87962e3e Retain IME assignment if no windows accept input. 
Was skipping over the default assignment due to new null value for
windows (ag/361266).

Fixes bug 10987178.

Change-Id: I89efd41ab54b42de384eec84c5e937cc2a59d099
 2013-10-03 14:07:45 -07:00
Alex Klyubin
3c2ae2f4ed Reduce EntropyMixer seed size from 4096 to 512 bytes. 
The suggested seed size from Linux drivers/char/random.c is 512 bytes
rather than the 4096 bytes currently used.

Change-Id: I3dd55105f0a95ce9cda34b4cf08987b8a28c4ac9
 2013-10-03 13:56:09 -07:00
Ben Gruver
b70c534900 Merge "Check the return value of listFiles on the ifw directory" 2013-10-03 20:45:58 +00:00
Jeff Sharkey
fe5bf7a7c7 Merge "Fix mount path prefix checking." into klp-dev 2013-10-03 17:18:38 +00:00
Marco Nelissen
95867a6524 Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 2013-10-03 16:34:57 +00:00
Jeff Sharkey
5786a278a5 Fix mount path prefix checking. 
Uncovered as part of writing CTS tests.

Bug: 10577541
Change-Id: I7832bcd551bedeea0b2ee5d6926aba6ac9bd0fd2
 2013-10-03 09:32:01 -07:00
Marco Nelissen
d983ba5cac Add PowerManager method to assign blame to a single uid 
Currently used by audioflinger to account for recording wakelocks.
b/10985160

Change-Id: I18fc8487f2a197bf02b5269a4bcae9e75b6c2207
 2013-10-03 08:49:36 -07:00
Wink Saville
3ec8e7fb79 Use networkType to display wifi and mobile notification separately. 
There are two bugs one is I was clearing the notification in
CaptivePortalTracker when entering the ActivateState. (double check
according to bug 5021626 we should be calling enter)

Second is we could have the need to display both icons but can't
because we only allow one.

The solution I'm proposing here is to allow two notifications and
have then controlled separately.

Bug: 10886908
Change-Id: I30e7130bc542535492d175640a4990c592f32806
 2013-10-03 08:34:46 -07:00
Craig Mautner
02fa2332ac Merge "Make DimLayer size dependent on stack layout." into klp-dev 2013-10-03 02:49:31 +00:00
John Spurlock
e660ecc436 Merge "Store decor rects per window for transition cropping." into klp-dev 2013-10-03 02:28:58 +00:00