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

114193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
5eaac1ce33 am e31f959c: am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit 'e31f959c68a9dfa00daa5b5580ced31badfb1127':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String
 2013-10-03 15:39:30 -07:00
Dianne Hackborn
495fe22d68 am 2d3f995a: am d585f954: Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit '2d3f995a65f2acd60559b1db57ae3ab2346a1df0':
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
 2013-10-03 15:39:27 -07:00
Daniel Sandler
12aea9d797 am 97bc628f: am 0a660528: Merge "Goo goo ga joob." into klp-dev 
* commit '97bc628fa737a87b0b855b76404fd1527eca67f8':
  Goo goo ga joob.
 2013-10-03 15:39:24 -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
John Spurlock
12585551f4 am c4b27478: am 8e0ca288: Window decor rect should not include the nav bar if hidden. 
* commit 'c4b274782793e33d58cb119b3c294bbb31daea14':
  Window decor rect should not include the nav bar if hidden.
 2013-10-03 15:39:15 -07:00
Baligh Uddin
1b7ed578f2 am dd3162d9: (-s ours) am 778c2de0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'dd3162d9407c030036796f61e30eb2ba38ac88df':
  Import translations. DO NOT MERGE
 2013-10-03 15:39:12 -07:00
Baligh Uddin
18dc3d1f0a am 7c15b5f7: (-s ours) am 8e68d5fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7c15b5f753d5fecae0e7a085cb9bcce1c8ce02ac':
  Import translations. DO NOT MERGE
 2013-10-03 15:39:10 -07:00
Baligh Uddin
30d87502bf am a928cfd0: (-s ours) am 65f57e5f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a928cfd0c06f1c1c831e6909fc83e44ba994b30f':
  Import translations. DO NOT MERGE
 2013-10-03 15:39:06 -07:00
Baligh Uddin
608d9db23d am b3186207: (-s ours) am 68e70f9b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b318620758067e60a28624110a5af13fd7810cef':
  Import translations. DO NOT MERGE
 2013-10-03 15:39:04 -07:00
Baligh Uddin
b67ca3634c am 079fe0fb: (-s ours) am a6b90f39: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '079fe0fba31b0781eca73db934dfe2290fea3891':
  Import translations. DO NOT MERGE
 2013-10-03 15:39:01 -07:00
John Spurlock
89862d73ce am c20988e1: am 0ea4a5fb: Merge "Replace linear GradientDrawable with asset-based approach." into klp-dev 
* commit 'c20988e16b5a1129c28ca4d378456bbdc60e19e3':
  Replace linear GradientDrawable with asset-based approach.
 2013-10-03 15:38:58 -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
John Reck
35f2dcd02c am cdc605c6: am b885435c: Merge "Update liblayout" into klp-dev 
* commit 'cdc605c69597649c8e71161791ae64be48ce1f11':
  Update liblayout
 2013-10-03 15:38:50 -07:00
Christopher Tate
64884eef54 am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev 
* commit 'b61c82190d9d16cd4a7dff8af81aff7f43c19cc4':
  Fix cross-process race in initial files/cache dir creation
 2013-10-03 15:38:47 -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
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
8474214925 Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG." 2013-10-03 22:12:36 +00: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
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
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
Alex Klyubin
1a07229bc2 Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes." 2013-10-03 21:34:23 +00: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
Dianne Hackborn
e31f959c68 am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit 'd143d1ffd7656d1ad3ec4fbccd26564035bca787':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String
 2013-10-03 12:20:04 -07:00
Dianne Hackborn
2d3f995a65 am d585f954: Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit 'd585f95406f8b12e36ca436faea7113ecd8704fd':
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
 2013-10-03 12:19:56 -07:00
Daniel Sandler
97bc628fa7 am 0a660528: Merge "Goo goo ga joob." into klp-dev 
* commit '0a660528374f0cf4fc24eb610ea048c99cbd27a1':
  Goo goo ga joob.
 2013-10-03 12:19:51 -07:00
Jeff Sharkey
3adf2172c3 am fe5bf7a7: Merge "Fix mount path prefix checking." into klp-dev 
* commit 'fe5bf7a7c7dcf3353c345d18471b90426d9404a3':
  Fix mount path prefix checking.
 2013-10-03 12:19:48 -07:00
Marco Nelissen
05f56fc121 am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit '95867a652410b5f0193cf301f5737381bcbd3a88':
  Add PowerManager method to assign blame to a single uid
 2013-10-03 12:19:42 -07:00
John Spurlock
c4b2747827 am 8e0ca288: Window decor rect should not include the nav bar if hidden. 
* commit '8e0ca288fe3f7bbb7d25751fa00be218b3940f18':
  Window decor rect should not include the nav bar if hidden.
 2013-10-03 12:19:39 -07:00
Baligh Uddin
dd3162d940 am 778c2de0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '778c2de060473636ba7237a460b53a2f03f50f05':
  Import translations. DO NOT MERGE
 2013-10-03 12:19:08 -07:00
Baligh Uddin
7c15b5f753 am 8e68d5fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8e68d5fceb11446f3b9f87f73d1d4a10def45b76':
  Import translations. DO NOT MERGE
 2013-10-03 12:18:50 -07:00
Baligh Uddin
a928cfd0c0 am 65f57e5f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '65f57e5f49674b91cbf70c5f1aed6a5d16f5c0a8':
  Import translations. DO NOT MERGE
 2013-10-03 12:18:47 -07:00
Baligh Uddin
b318620758 am 68e70f9b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '68e70f9b144f474b3d63e1fbb04711a9e6bc9d19':
  Import translations. DO NOT MERGE
 2013-10-03 12:18:45 -07:00
Baligh Uddin
079fe0fba3 am a6b90f39: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a6b90f39f1372e45b6026517d3b7085e0448e765':
  Import translations. DO NOT MERGE
 2013-10-03 12:18:41 -07:00
John Spurlock
c20988e16b am 0ea4a5fb: Merge "Replace linear GradientDrawable with asset-based approach." into klp-dev 
* commit '0ea4a5fb8de62acb057651a4821af9b8699d9fcf':
  Replace linear GradientDrawable with asset-based approach.
 2013-10-03 12:18:36 -07:00
Craig Mautner
b690557c84 am 02fa2332: Merge "Make DimLayer size dependent on stack layout." into klp-dev 
* commit '02fa2332ac9f2972a0c651229ae456641f519363':
  Make DimLayer size dependent on stack layout.
 2013-10-03 12:18:33 -07:00
John Spurlock
c3752cfb6d am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev 
* commit 'e660ecc436c6bb9d3476298e97976a24b432482e':
  Store decor rects per window for transition cropping.
 2013-10-03 12:18:31 -07:00
John Reck
cdc605c695 am b885435c: Merge "Update liblayout" into klp-dev 
* commit 'b885435c7c77d0610f449e413766d30780eeda37':
  Update liblayout
 2013-10-03 12:18:28 -07:00
Christopher Tate
b61c82190d am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev 
* commit 'ef4f8222fc671d2453e4bcb35978afdfa9734b78':
  Fix cross-process race in initial files/cache dir creation
 2013-10-03 12:18:26 -07:00
Adam Lesinski
6d90862f23 am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev 
* commit 'd65825ab1cdbfd88122beaaad8cf815434cbf46d':
  Private flags are masked in correct variable
 2013-10-03 12:18:23 -07:00
Svetoslav
36f38f4efc am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev 
* commit '9907a109ced54cffc7b4f5e9e81365c78df1f1a9':
  Fix screen magnifier scaling due to ScaleGestureDetector changes.
 2013-10-03 12:18:17 -07:00
John Reck
47dc3248e0 am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev 
* commit '9a93f6f039920c2e24cdef172c9cbd39586b949c':
  Reduce max recents on lowram
 2013-10-03 12:18:14 -07:00
Dianne Hackborn
d143d1ffd7 Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 2013-10-03 17:44:18 +00:00
Dianne Hackborn
d585f95406 Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 2013-10-03 17:23:04 +00:00
Daniel Sandler
0a66052837 Merge "Goo goo ga joob." into klp-dev 2013-10-03 17:20:21 +00:00
Dianne Hackborn
4a7d824c3b Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle... 
...fails from KRS84 across all platforms

My fix for issue #10807048 was wrong, wrong, wrong.  The problem was
actually just a stupid mistake in ArrayMap.erase().  This makes it
all right.

Change-Id: I762f7a2d5100bceb86a091ab3d6368edc21b4266
 2013-10-03 10:19:20 -07:00