Sergio Giro
0cc9a6e6e1
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
(cherry picked from commit 66b6eb9490
)
Change-Id: Ic71dd0025b9a7588c4f3bb1c7be1bd13d2ff5105
2015-08-25 16:18:16 +01:00
Sergio Giro
25592fbea0
am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit 'ca15dfd05cdeea7ed57578aa569831698324b2a0':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:19:08 +00:00
Sergio Giro
ca15dfd05c
am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '3fe4051430be1da4c1f119c165a4bb8b3a9dd499':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:11:49 +00:00
Sergio Giro
3fe4051430
am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '66b6eb9490beeeabc804d790c1c4060ce047afd4':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:06:38 +00:00
Tim Murray
3985dda1c3
Add foreground/boost cpuset.
...
This is used for app launches (and maybe other high priority tasks
in the future). It's to be set to whatever cores should be used
for short term high-priority tasks.
bug 21915482
Change-Id: Id0ab0499146c09e860b97f4cb8095834cb12dd50
2015-08-25 00:31:54 -07:00
Jack Pham
47c3ce56ed
adbd: enable USB SuperSpeed (again)
...
The descriptors to enable USB 3.0 SuperSpeed support had previously
been added in commit d6ee9f26a5
but were removed when the v1/v2 descriptor handling was refactored
in commits ab3446dd34
and again in
c49f51c451
. Now that the dust has
settled, add back the SS descriptors to re-enable USB 3.0.
Bug: 23385314
Change-Id: I8de7c7e50d9216a7492ce7863e3aaf92ff805eff
(cherry picked from commit a190c800bf
)
2015-08-24 18:03:03 +00:00
Mark Salyzyn
77e27d8c2a
Merge changes I9f21ce95,Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4, ... into mnc-dr-dev
...
* changes:
logd: worst uid record watermark
logd: log buffer switch to std::list
logd: white and black switch to std::list
logd: logtimes switch to std::list
logd: prune 10% or 256 entries max
logd: sizes > 1M prune in smaller batches
2015-08-24 14:19:12 +00:00
Sergio Giro
66b6eb9490
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
(cherry picked from commit 7987b83553
)
Change-Id: I3cac87185f209dc79678ae702aa18afbdf4190df
2015-08-21 20:36:19 +01:00
Abhishek Arya
a77a048752
am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit '219a006f89a5448a9a6eeb1f37ad0088e85bd3f8':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 07:14:31 +00:00
Abhishek Arya
219a006f89
am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'fc5fdc85683f87c42d5ce7bcee4e2b70ef0acdd0':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 07:05:07 +00:00
Abhishek Arya
fc5fdc8568
am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'e45d96d6bf592f0ae20bb021ea529acc94e0cb55':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:54:21 +00:00
Abhishek Arya
e45d96d6bf
am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit '19398a712c53d27aaa2122cfae5d54168b8df0c9':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:36:01 +00:00
Abhishek Arya
19398a712c
am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'd34846b70b7f6eb167722d45e0c717fa64116e90':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:29:00 +00:00
Abhishek Arya
d34846b70b
am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'cd407a17fe326f3e18866ddddb1c747b06a45fc0':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:23:50 +00:00
Abhishek Arya
cd407a17fe
am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'e0dce90b0de2b2b7c2baae8035f810a55526effb':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:18:47 +00:00
Abhishek Arya
e0dce90b0d
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
Bug: 23290056
Change-Id: If6e22b0159de6635a8ca5305895b7718f15becc7
2015-08-20 21:55:55 -07:00
Sergio Giro
d1b59bb48e
am 3fa8b550: am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit '3fa8b550eadeef21e2ca996c44e37f84b1418f95':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 23:14:08 +00:00
Sergio Giro
3fa8b550ea
am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit '93f106b8d0207ce685ad56704df8a568f3edebb6':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 23:04:53 +00:00
Sergio Giro
93f106b8d0
am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit 'e97682be0634fe773f70097bc518e5d034efe8f7':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:58:19 +00:00
Sergio Giro
e97682be06
am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit 'a1a22b5736d5ad71531fd07d5c4103585e8e8977':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:44:57 +00:00
Sergio Giro
a1a22b5736
am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit 'e67b584869eea8d4e955e82de1e38ede080a2ed4':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:38:33 +00:00
Sergio Giro
e67b584869
am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit '4956c0fe1e582a8497aff34a41aeb8bf4748eef0':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:28:53 +00:00
Sergio Giro
4956c0fe1e
am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit '5b85b1d40d619c2064d321364f212ebfeb6ba185':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:23:47 +00:00
Christopher Ferris
1892918992
am e0ab2322: Display the map offset for each frame.
...
* commit 'e0ab23223a1c3110c9550136b8a119b4c30ec066':
Display the map offset for each frame.
2015-08-20 21:44:08 +00:00
Mark Salyzyn
0c5ab13a72
logd: worst uid record watermark
...
(cherry pick from commit c892ea3fa8
)
Hold on to last worst uid watermark and bypass a spike to O(n*n*x)
(n=samples, x=number of spammers) wrt chatty trimming.
Bug: 23327476
Change-Id: I9f21ce95e969b67e576417a760f75c4d86acf364
2015-08-20 11:33:57 -07:00
Mark Salyzyn
c2f7eee26b
logd: log buffer switch to std::list
...
(cherry pick from commit 94a89c42fe
)
Bug: 23350706
Bug: 23327476
Change-Id: Ib0530b9dd5842c6d05c84d7a66f2531c97461067
2015-08-20 11:32:25 -07:00
Mark Salyzyn
dc1c936139
logd: white and black switch to std::list
...
(cherry pick from commit e0ed16c6db
)
Bug: 23350706
Change-Id: I981d9fa63a0d87eb309485cca93cfc44fc0506cc
2015-08-20 11:31:46 -07:00
Mark Salyzyn
a68a5167bc
logd: logtimes switch to std::list
...
(cherry pick from commit 98dca2d0b1
)
Bug: 23350706
Change-Id: Icc60dd06119ea20a22610644ff880d5135363aba
2015-08-20 11:30:49 -07:00
Mark Salyzyn
edc6f52a89
logd: prune 10% or 256 entries max
...
(cherry pick from commit b39ed0c992
)
Bug: 22351810
Bug: 23327476
Change-Id: I902ba6b431d8b7cee2d65ee2f76e9f7c4f30b152
2015-08-20 11:29:52 -07:00
Mark Salyzyn
8894c395bf
logd: sizes > 1M prune in smaller batches
...
(cherry pick from commit 62ab0fd4ef
)
Switch to 1% batch sizes from 10% when individual buffer size > 1M
Bug: 22351810
Change-Id: Ifee570a54643ceb0ba767e1787e937f70cc90b72
2015-08-20 11:28:53 -07:00
Christopher Ferris
e0ab23223a
Display the map offset for each frame.
...
The dlopen of a shared library in an apk results in large map offsets.
Unfortunately, the current way that the frame data is printed, it's
impossible to tell what the relative pc is relative to. With the
addition of the offset, it's possible to figure out what the relative
pc actually references.
Bug: 23348999
Change-Id: Ia51b669ea3f810158cfd0d71d9ae89bf9a3170d3
2015-08-20 11:16:54 -07:00
Sergio Giro
5b85b1d40d
libutils: fix overflow in String8::allocFromUTF8
...
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908
Bug: 23290056
(cherry picked from commit 4eeacbeec0
)
Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
(cherry picked from commit ebabef2752
)
2015-08-18 20:52:25 +00:00
Tim Kilbourn
946533648c
Merge "Use init to write usb typec props" into mnc-dr-dev
2015-08-18 19:54:35 +00:00
Sergio Giro
2bfde57237
am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
...
* commit '29c1275519ef85fa3f30be351f19dc6e7eedbee9':
libutils: fix overflow in String8::allocFromUTF8
2015-08-18 17:20:00 +00:00
Sergio Giro
29c1275519
Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
2015-08-18 17:15:11 +00:00
Sergio Giro
ebabef2752
libutils: fix overflow in String8::allocFromUTF8
...
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908
Bug: 23290056
(cherry picked from commit 4eeacbeec0
)
Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-18 18:06:38 +01:00
Tim Kilbourn
8c12fdf4ab
Use init to write usb typec props
...
The sysfs nodes are owned by root, so use init to write role changes.
Bug: 21615151
Change-Id: I39ad03a23af0be9ac859d4fb79a46edc27e30f4e
2015-08-17 14:56:57 -07:00
Andres Morales
fe1b462765
am 19f223f3: Merge "[gatekeeperd] Check parent profile for SID lookups" into mnc-dev
...
* commit '19f223f3cfe43a4ded903a5d6a5f07bbadf115f5':
[gatekeeperd] Check parent profile for SID lookups
2015-08-06 22:30:53 +00:00
Andres Morales
19f223f3cf
Merge "[gatekeeperd] Check parent profile for SID lookups" into mnc-dev
2015-08-06 22:22:18 +00:00
Jeff Sharkey
779a38a5cd
am b9f438ff: Protect runtime storage mount points.
...
* commit 'b9f438ff841f87c8ffbca85b13a533718a18e15f':
Protect runtime storage mount points.
2015-08-06 19:35:56 +00:00
Jeff Sharkey
b9f438ff84
Protect runtime storage mount points.
...
We have a bunch of magic that mounts the correct view of storage
access based on the runtime permissions of an app, but we forgot to
protect the real underlying data sources; oops.
This series of changes just bumps the directory heirarchy one level
to give us /mnt/runtime which we can mask off as 0700 to prevent
people from jumping to the exposed internals.
Also add CTS tests to verify that we're protecting access to
internal mount points like this.
Bug: 22964288
Change-Id: I32068e63a3362b37e8ebca1418f900bb8537b498
2015-08-06 11:45:31 -07:00
Andres Morales
1cf7d259e8
[gatekeeperd] Check parent profile for SID lookups
...
Bug: 22257554
Change-Id: I1a363729b449a2bc8594b48dada719fd79da7036
2015-08-05 10:32:13 -07:00
Jeff Sharkey
d3a5e857e4
am d57125af: Merge "Give secondary users read-only physical cards." into mnc-dev
...
* commit 'd57125af1a81f34b162ecd5de81e6f1365aff588':
Give secondary users read-only physical cards.
2015-07-29 01:34:37 +00:00
Jeff Sharkey
d57125af1a
Merge "Give secondary users read-only physical cards." into mnc-dev
2015-07-29 01:19:43 +00:00
Jeff Sharkey
10a239b971
Give secondary users read-only physical cards.
...
Long ago, we mounted secondary physical cards as readable by all
users on the device, which enabled the use-case of loading media on
a card and viewing it from all users.
More recently, we started giving write access to these secondary
physical cards, but this created a one-directional channel for
communication across user boundaries; something that CDD disallows.
This change is designed to give us the best of both worlds: the
package-specific directories are writable for the user that mounted
the card, but access to those "Android" directories are blocked for
all other users. Other users remain able to read content elsewhere
on the card.
Bug: 22787184
Change-Id: I4a04a1a857a65becf5fd37d775d927af022b40ca
2015-07-28 14:42:21 -07:00
Jeffrey Vander Stoep
4b70dd4c8f
am 26f0f657: Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
...
* commit '26f0f657ec027430bde7d2237890ba59b3fd174a':
init.rc: add healthd to system group to allow write to /dev/cpuset
2015-07-28 20:07:55 +00:00
Jeffrey Vander Stoep
26f0f657ec
Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
2015-07-28 19:54:40 +00:00
Jeff Vander Stoep
a30a8e02dd
init.rc: add healthd to system group to allow write to /dev/cpuset
...
Also add to root group to avoid introducting new bugs.
Bug: 22699101
Change-Id: I9da31e0cc955efd711df3f4c6b17e39d74c01549
2015-07-28 12:27:36 -07:00
Erik Kline
9c298f820a
am cc451785: Fix incorrectly sized buffer.
...
* commit 'cc451785fe4426566f6c4a6a5156d4fb40bcc22d':
Fix incorrectly sized buffer.
2015-07-28 10:08:17 +00:00
Erik Kline
cc451785fe
Fix incorrectly sized buffer.
...
Also: use a more correct size type.
Bug: 21562630
Bug: 21764392
Bug: 22464419
Change-Id: I9a9cf64f0481670828fac707e00196e222d0311e
2015-07-28 17:56:06 +09:00