OSDN Git Service
Mark Salyzyn [Wed, 16 Sep 2015 22:34:00 +0000 (15:34 -0700)]
logd: clearAll by UID speedup
(cherry pick from commit
2b25c66070f73413013caa48e1c171cb895869b5)
- If doing a clear, skip accounting
- Ensure for busy checking, behind a region lock for instance, only
break out if there was something to do. Basically move the filter
actions first, and defer checking the region lock to the ends of
the loops.
Bug:
23711431
Change-Id: Icc984f406880633516fb17dda84188a30d092e01
Mark Salyzyn [Wed, 16 Sep 2015 22:34:00 +0000 (15:34 -0700)]
logd: clear return and deal with busy if readers locked
(cherry pick from commit
c5dc970edc202f89ecdd0c2fe988c7e2b8408bef)
- Propagate to caller the clearing errors, busy blocked by reader.
- For clear, perform retries within logd with a one second lul each,
telling readers to skip, but on final retry to kill all readers if
problem still persists due to block reader (or high volume logspammer).
Bug:
23711431
Change-Id: Ie4c46bc9480a7f49b96a81fae25a95c603270c33
Mark Salyzyn [Wed, 16 Sep 2015 22:34:00 +0000 (15:34 -0700)]
logd: update region lock after entry has passed to reader socket
(cherry pick from commit
de4bb9c1a704d0eab3320b43c3964342f4b662df)
- The reader region level indicates the location to protect, but once
it has been passed to the calling reader, then allow us to go
one beyond so that a clear or prune thread can remove the entry.
Bug:
23711431
Change-Id: I0f2389858dd8c83366c034360f67d7c363625b56
Mark Salyzyn [Tue, 1 Sep 2015 15:40:39 +0000 (08:40 -0700)]
logd: clientHasLogCredentials false negatives
(cherry pick from commit
86eb38f3caaddbd54c0339e6b2abeab254ae98fb)
Vote three times in /proc/pid/status to look for AID_LOG group
If not, we may default to the callers UID, and the net result is
to perform the task related to that UID. For adb logcat and
shell logcat, the UID is AID_SHELL which typically has no logs,
leaving no net action taken.
Bug:
23711431
Change-Id: I2b5900a2d37173bd995eb308ee9ecafa20602b62
Mark Salyzyn [Fri, 21 Aug 2015 23:44:30 +0000 (16:44 -0700)]
logd: object layer format statistics
(cherry pick from commit
758058ffd8820df71c27db7675c50a90a5fa02b4)
Simplify table generation by placing the line and header formatting
into each type's (UID, PID, TID) object. Switch to const return
values for the ownership passing functions (*ToName() functions
and methods). Use longer variable names to reduce confusion.
Switch from LINES To NUM for pruned column as that more accurately
reflects what is dropped since one entry can contain several lines.
Bug:
22855208
Change-Id: Ib110dce98a68cf5f844eb30f8a192a1f691eeba2
Mark Salyzyn [Fri, 2 Oct 2015 16:22:52 +0000 (09:22 -0700)]
logd: optimize code hotspots
(cherry pick from commit
ddda212faa81d62f637926680cd8163345120f71)
Discovered that we had a few libc hotspots. Adjust code to generally
reduce or nullify the number of calls to malloc, free, strlen,
strcmp, strncmp, memcmp & strncasecmp. Total gain looks to be about
3% of logd's processing time. malloc still contributes to 3%, but all
others are now total 0.5%.
Bug:
23685592
Change-Id: Ife721121667969260cdb8b055524ae90f5911278
Mark Salyzyn [Fri, 28 Aug 2015 15:02:59 +0000 (08:02 -0700)]
logd: Add LogUtils.h
(cherry pick from commit
5ac5c6b19364b5b3061a59db796b2357c95c3b64)
Move prototypes from LogBufferElement.h to LogUtils.h
Change-Id: I55e42e17e6c997e35b2b78b87fd2f84f8f393282
Mark Salyzyn [Fri, 4 Sep 2015 18:37:42 +0000 (11:37 -0700)]
logd: klogd deal with nuls in dmesg
(cherry pick from commit
151beac76d372c5c1bd71e656a6cfbd177e36509)
Switch to using string and length in all transactions, treating
trailing nuls the same as spaces.
ToDo: change dumpstate (bugreport) to use logcat -b printable _regardless_
Bug:
23517551
Change-Id: I42162365e6bf8ed79d356e7b689a673902116fdb
Mark Salyzyn [Wed, 2 Sep 2015 14:39:53 +0000 (07:39 -0700)]
logd: log_strtok_r deal with nuls
(cherry pick from commit
ea1a24110767d6d5666fda8a19dd0b3f954068d6)
Rename to log_strntok_r and change from dealing with strings
to dealing with a string and an associated length.
Bug:
23517551
Change-Id: Ia72f1305a53f55eeef9861ac378fb8205fd2378e
Mark Salyzyn [Tue, 8 Sep 2015 14:57:27 +0000 (07:57 -0700)]
liblog: logprint: printable nul
(cherry pick from commit
faa92e99151ccec81073cb7ded2d49458468a02d)
Change-Id: I57d1f86ce040ad196c558bb72ac0464af793c214
Mark Salyzyn [Tue, 1 Sep 2015 20:09:23 +0000 (13:09 -0700)]
logd: klogd: sniff for time correction on Mediatek
(cherry pick from commit
2d159bf3b597eb6defbb9e74c60a003bc9387a0a)
Need some more flexibility when parsing kernel messages
cluttered with extra fluff. This is the minimal relaxation
we can do to the rules to ensure that we work on all
possible devices and kernels when sniffing for time
correction information.
We want to minimize any future maintenance, keep in mind
klogd is a "userdebug" or "eng" feature and is disabled
in "user" builds. Manage expectations.
Bug:
23517551
Change-Id: I026d074e14fb2550e728683e85a973bd87e78a9c
Mark Salyzyn [Wed, 26 Aug 2015 16:30:00 +0000 (09:30 -0700)]
logd: klogd and Mediatek part deux
(cherry pick from commit
47dba71f240624fc0fc9d39e2b91dc82ef164b39)
- switch to an open coded strnrchr
- validity checking on n, taglen and b values.
Bug:
23517551
Change-Id: I568e25c5aa6d8474835454a0e83b19c2921b7986
Mark Salyzyn [Mon, 31 Aug 2015 15:01:33 +0000 (08:01 -0700)]
liblog: logcat: Add year and zone to date on each line
(cherry pick from commit
f28f6a9ba228803b402ebaccb59f1b2f2fd4af92)
- '-v year' modifier adds the four digit year prefix
- '-v <timezone>' modifier sets and prints the timezone suffix
- Only promise in logcat to support UTC as a timezone since
all others are based on the configured environment
- '-v zone' modifier toggles the timezone suffix on or off
- '-T YYYY-MM-DD HH:MM:SS.mmm...' format is added
Bug:
23668700
Change-Id: I7521c1efb7455dc9a25434fce72a69a65dcf72ea
Mark Salyzyn [Thu, 20 Aug 2015 17:01:44 +0000 (10:01 -0700)]
logd: switch asprintf to std::string
(cherry pick from commit
73160acc5cb5236b30327569e6b51dbfe73e4a0f)
Bug:
23350706
Change-Id: I715cdd4563a09de3680081947a3439f0cac623be
Mark Salyzyn [Wed, 19 Aug 2015 20:53:20 +0000 (13:53 -0700)]
logd: white and black switch to std::string
(cherry pick commit from
b332f1c427938453ae2c41fc96aad1ed8e461b65)
Bug:
23350706
Change-Id: I92f21aee0a9702f63e8465851d0f35007b0469a7
Mark Salyzyn [Wed, 19 Aug 2015 22:33:01 +0000 (15:33 -0700)]
logd: statistics switch to std::string
(cherry pick from commit
decbcd9c418a4d076965971e74fd51fab497414b)
Bug:
23350706
Change-Id: I5564898c4f67b8fcc43cee64604855f789409482
Andreas Gampe [Mon, 27 Jul 2015 18:04:37 +0000 (11:04 -0700)]
Logd: Handle unused variable and fields
(cherry pick from commit
d75564f9b88437446b44ce1035f82c005828ae9b)
For build-system CFLAGS clean-up.
Bug:
18632512
Change-Id: If81d6705b44e9a29f64c44c56ea633c031e831b7
Daniel Rosenberg [Wed, 28 Oct 2015 20:13:37 +0000 (13:13 -0700)]
rootdir: Allow board specific folders and symlinks in root directory
Building without ramdisk requires a way to specify board specific
directoryies and symlinks in the root directory at build time.
Change-Id: I11301e98228bc4761f3aee177a546146651b9f25
Daniel Rosenberg [Tue, 30 Jun 2015 00:30:28 +0000 (17:30 -0700)]
Fix "adb remount" for when the root directory is in system.img
When the root directory has been built into system.img, it is
mounted at /.
Change-Id: If01d12efeaa53b4ae59e801a6e9b802a9ae5882d
Tao Bao [Sun, 19 Jul 2015 02:46:16 +0000 (19:46 -0700)]
Set mode bits for /system/etc/recovery.img.
/system/etc/recovery.img defaults to 0644. Change it to 0440.
Bug:
22641135
Change-Id: I45cdb0cc1b58f35fbcd0f16e7cc6c4eef63b0b74
(cherry picked from commit
b602e6f9a3ad25e034e42fd6dc5dc28e52c1c3e5)
Daniel Rosenberg [Thu, 27 Aug 2015 20:42:20 +0000 (13:42 -0700)]
fs_mgr: Add support for A/B partitions
Allow partitions to be marked as A/B partitions
using the slotselect flag in fstab. The partitions
can be identified by appending the correct suffix
to the block device listed in the fstab. The suffix
is provided by the bootloader through a command line
parameter or the device tree, and can be found in
ro.boot.slot_suffix or read from the boot_control HAL.
Change-Id: I6846d80e857f95bfb8f282f4ab81167394613bbe
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Daniel Rosenberg [Tue, 28 Jul 2015 22:14:39 +0000 (15:14 -0700)]
rootdir: Create symlinks in Android.mk
system.img may contain the root directory as well. In that case, we
need to create some symlinks init.rc would during the build.
Change-Id: I4e7726f38c0f9cd9846c761fad1446738edb52c0
Daniel Rosenberg [Tue, 30 Jun 2015 00:33:05 +0000 (17:33 -0700)]
Skip mounting /, just mark block device as ro if needed.
Change-Id: I7fbb636d296abc1caab6c7bf88017684c9df7759
Daniel Rosenberg [Wed, 8 Jul 2015 23:30:22 +0000 (16:30 -0700)]
Remove creation of root directory folders
Folders in the root directory are now created during the build,
as we may be building without a ramdisk, and when we do that,
the root directory will be read-only. With those changes,
these mkdirs will never need to run.
Change-Id: I49c63e8bfc71d28e3f938ed41f81d108359fa57a
Daniel Rosenberg [Wed, 15 Jul 2015 00:15:57 +0000 (17:15 -0700)]
rootdir: Create cache folder in Android.mk
system.img may contain the root directory as well. In that case, we
need to create some folders init.rc would during the build.
Change-Id: I312104ff926fb08d98ac8256b76d01b0a90ea5e5
Daniel Rosenberg [Sat, 6 Jun 2015 01:11:53 +0000 (18:11 -0700)]
rootdir: Create folders in Android.mk
system.img may contain the root directory as well. In that case, we
need to create some folders init.rc would during the build.
Change-Id: I157ccbebf36bee9916f3f584551704ec481ae1d1
Daniel Rosenberg [Fri, 12 Jun 2015 22:00:54 +0000 (15:00 -0700)]
libcutils: fs_config: Add folders normally created in init.rc
When the ramdisk is built into the system image, we need to create
those folders during the build.
Change-Id: I40881940c75e379d7599dc1f743b35fbc7cc66e8
Todd Kjos [Mon, 26 Oct 2015 23:22:11 +0000 (16:22 -0700)]
Actively mangage EAS schedtune nodes
Move foreground tasks to /sys/fs/cgroup/stune/boost/tasks (boosted
weight in EAS scheduler). Move background tasks to
/sys/fs/cgroup/stune/tasks (default weight). For services started
with init, set "foreground" services to boosted.
Change-Id: I0e489fad9510727c13e6754dabaf311c2391f395
Mark Salyzyn [Thu, 12 Nov 2015 23:44:18 +0000 (23:44 +0000)]
logcat: continue where we left off
am:
5b0d59dde8
* commit '
5b0d59dde85162fa9ef3a32464c0f1b81d7e05cb':
logcat: continue where we left off
Mark Salyzyn [Tue, 6 Oct 2015 15:59:02 +0000 (08:59 -0700)]
logcat: continue where we left off
Issue introduced as part of new logcatd functionality in
commit
f3555d9427425c2cba9600ceffb49305c440aa4a
Faulty logic, add a gTest to confirm.
Bug:
19608716
Change-Id: Ic1b97def25e03e69faae4398a3dff2ff0f88545e
Jon Larimer [Wed, 11 Nov 2015 20:52:49 +0000 (20:52 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am:
809d5a0158 am:
fd56dc41c7 -s ours am:
362f13d74a am:
702fe6d486 -s ours am:
ea1e6a59e7 am:
088639a20f -s ours am:
55263d2ae3
am:
99cd21ef5c
* commit '
99cd21ef5c3548613d8a614551b858a5c47985fc':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:52:44 +0000 (20:52 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am:
5280061b56 am:
442a830e9b -s ours am:
93a3871abb am:
089ad5e98a -s ours am:
2f1562eb10
am:
9f1b1caa78
* commit '
9f1b1caa787fdb9f66f32eda38d46f1b4e75b209':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:52:38 +0000 (20:52 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am:
f84eef3fca -s ours am:
d0ed7943b8 -s ours am:
a1da204980
am:
7755770ac9
* commit '
7755770ac930c8a7bf14a140e92330cee382fd16':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:45:04 +0000 (20:45 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am:
809d5a0158 am:
fd56dc41c7 -s ours am:
362f13d74a am:
702fe6d486 -s ours am:
ea1e6a59e7 am:
088639a20f -s ours
am:
55263d2ae3
* commit '
55263d2ae3696baaa574ee896e3a8b0546aa5628':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:44:57 +0000 (20:44 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am:
5280061b56 am:
442a830e9b -s ours am:
93a3871abb am:
089ad5e98a -s ours
am:
2f1562eb10
* commit '
2f1562eb10279531524f54ca7c129ead66ab3673':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:44:50 +0000 (20:44 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am:
f84eef3fca -s ours am:
d0ed7943b8 -s ours
am:
a1da204980
* commit '
a1da204980891f9e59a41d7a41d510f3f05d34bf':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:41:08 +0000 (20:41 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am:
809d5a0158 am:
fd56dc41c7 -s ours am:
362f13d74a am:
702fe6d486 -s ours am:
ea1e6a59e7
am:
088639a20f -s ours
* commit '
088639a20fc388e8d4dcf1ed471b31086c43bc83':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:41:02 +0000 (20:41 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am:
5280061b56 am:
442a830e9b -s ours am:
93a3871abb
am:
089ad5e98a -s ours
* commit '
089ad5e98ab8a4b2d4ea00c6a88d61b963797c90':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:40:55 +0000 (20:40 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am:
f84eef3fca -s ours
am:
d0ed7943b8 -s ours
* commit '
d0ed7943b8a2f3d0000391f18899c77566a0be1a':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:37:57 +0000 (20:37 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am:
809d5a0158 am:
fd56dc41c7 -s ours am:
362f13d74a am:
702fe6d486 -s ours
am:
ea1e6a59e7
* commit '
ea1e6a59e7dd8d4674a2116ec5893cdf801e6339':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:37:51 +0000 (20:37 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am:
5280061b56 am:
442a830e9b -s ours
am:
93a3871abb
* commit '
93a3871abbd16a3e0dee6ab8e7e87356620efeac':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 20:37:43 +0000 (20:37 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev
am:
f84eef3fca -s ours
* commit '
f84eef3fca156cd9a9f2f09f305a6fd6c898f14b':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 14:02:59 +0000 (14:02 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am:
809d5a0158 am:
fd56dc41c7 -s ours am:
362f13d74a
am:
702fe6d486 -s ours
* commit '
702fe6d486d2bdd920010d681b046a3396b4021a':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 13:59:19 +0000 (13:59 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am:
809d5a0158 am:
fd56dc41c7 -s ours
am:
362f13d74a
* commit '
362f13d74a5c57f4e2ba4f0de341896e79732dcf':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 13:55:57 +0000 (13:55 +0000)]
Merge "Add macro to call event logger for errors." into mnc-dev am:
d028c6fa7f
am:
bc1ef58505
* commit '
bc1ef5850501c5694f262c3ab844df4cc4846bcc':
Add macro to call event logger for errors.
Jon Larimer [Wed, 11 Nov 2015 13:55:57 +0000 (13:55 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am:
809d5a0158
am:
fd56dc41c7 -s ours
* commit '
fd56dc41c70a58541b9ed25f4c97ffe3fea19536':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 13:50:40 +0000 (13:50 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev
am:
809d5a0158
* commit '
809d5a01586d00ee91d13fb8d034d12584ba3314':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 13:50:39 +0000 (13:50 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am:
5280061b56
am:
442a830e9b -s ours
* commit '
442a830e9b0415460749016394b3a71b9df2af13':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 13:46:21 +0000 (13:46 +0000)]
Merge "Add macro to call event logger for errors." into mnc-dev
am:
d028c6fa7f
* commit '
d028c6fa7fe135a3b454a1773ba59cafbba4b49e':
Add macro to call event logger for errors.
Jon Larimer [Wed, 11 Nov 2015 13:46:21 +0000 (13:46 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev
am:
5280061b56
* commit '
5280061b5668d87b99ff4f9ef883a3fed944bce4':
Add macro to call event logger for errors. DO NOT MERGE
Jon Larimer [Wed, 11 Nov 2015 13:42:38 +0000 (13:42 +0000)]
Merge "Add macro to call event logger for errors." into mnc-dev
Jon Larimer [Wed, 11 Nov 2015 13:42:37 +0000 (13:42 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev
Jon Larimer [Wed, 11 Nov 2015 13:42:35 +0000 (13:42 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev
Jon Larimer [Wed, 11 Nov 2015 13:42:33 +0000 (13:42 +0000)]
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev
William Luh [Thu, 13 Aug 2015 17:41:58 +0000 (10:41 -0700)]
Add macro to call event logger for errors.
Bug:
23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
William Luh [Thu, 13 Aug 2015 17:41:58 +0000 (10:41 -0700)]
Add macro to call event logger for errors. DO NOT MERGE
Bug:
23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
William Luh [Thu, 13 Aug 2015 17:41:58 +0000 (10:41 -0700)]
Add macro to call event logger for errors. DO NOT MERGE
Bug:
23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
William Luh [Thu, 13 Aug 2015 17:41:58 +0000 (10:41 -0700)]
Add macro to call event logger for errors. DO NOT MERGE
Bug:
23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
Mark Salyzyn [Wed, 4 Nov 2015 18:41:13 +0000 (18:41 +0000)]
Merge "logd: pruning time horizon" into mnc-dr-dev
am:
dfbe85ec8b
* commit '
dfbe85ec8bc9fee87d7eb3378253bc7cf9890199':
logd: pruning time horizon
Mark Salyzyn [Wed, 4 Nov 2015 18:27:25 +0000 (18:27 +0000)]
Merge "logd: pruning time horizon" into mnc-dr-dev
Mark Salyzyn [Mon, 12 Oct 2015 20:45:51 +0000 (13:45 -0700)]
logd: pruning time horizon
Estimate a time horizon of ten fold for worst UID pruning
Bug:
25453210
Bug:
24782000
Change-Id: I7118deb6d42531c68ed2ac2a59c57b0580b942cc
Dan Willemsen [Tue, 3 Nov 2015 19:39:33 +0000 (19:39 +0000)]
Remove __DATE__/__TIME__ from init and debuggerd
am:
36b24a4a20
* commit '
36b24a4a20d7d1e9fee5ff14f21e9876e57db2ca':
Remove __DATE__/__TIME__ from init and debuggerd
Dan Willemsen [Thu, 22 Oct 2015 20:04:22 +0000 (13:04 -0700)]
Remove __DATE__/__TIME__ from init and debuggerd
Keeping these means that every build has different init and debuggerd
binaries, even if the source was the same. So OTAs that don't touch
these sources would still need to update the binaries.
Both of these messages are only informational, so can be safely removed.
Bootchart already encodes build-specific information from the system
properties.
Bug:
24204119
Change-Id: I7ebd65a20a3e031e7528c9f741616e20b3cd7446
(cherry picked from commit
30622bbb209db187f6851e4cf0cdaa147c2fca9f)
Christopher Ferris [Thu, 29 Oct 2015 19:20:52 +0000 (19:20 +0000)]
Fix incorrect check of descsz value. am:
d917514bd6
am:
69406d904a
* commit '
69406d904abffcfd5addf14dc96584f73ab04ff5':
Fix incorrect check of descsz value.
Christopher Ferris [Thu, 29 Oct 2015 19:12:37 +0000 (19:12 +0000)]
Fix incorrect check of descsz value.
am:
d917514bd6
* commit '
d917514bd6b270df431ea4e781a865764d406120':
Fix incorrect check of descsz value.
Christopher Ferris [Thu, 22 Oct 2015 20:34:48 +0000 (13:34 -0700)]
Fix incorrect check of descsz value.
Bug:
25187394
(cherry picked from commit
1fa55234d6773e09e3bb934419b5b6cc0df981c9)
Change-Id: Idbc9071e8b2b25a062c4e94118808d6e19d443d9
Paul Lawrence [Wed, 21 Oct 2015 14:58:50 +0000 (14:58 +0000)]
Merge "Don\'t show UI on default encryption" into mnc-dr-dev
am:
2b216aa89b
* commit '
2b216aa89b76dbadb315322e4fd31aa37059b262':
Don't show UI on default encryption
Paul Lawrence [Wed, 21 Oct 2015 14:27:38 +0000 (14:27 +0000)]
Merge "Don't show UI on default encryption" into mnc-dr-dev
Tim Murray [Tue, 20 Oct 2015 22:08:36 +0000 (22:08 +0000)]
Reorder init.rc to avoid a kernel warning.
am:
f429d37807
* commit '
f429d37807a005c1de38a7616669bf1834d45432':
Reorder init.rc to avoid a kernel warning.
Tim Murray [Thu, 15 Oct 2015 19:38:15 +0000 (12:38 -0700)]
Reorder init.rc to avoid a kernel warning.
3.18 has a warning in dmesg that appears when the parent cpuset's cpus
and mems are changed to something other than what the child has. Reorder
init.rc to prevent this warning from appearing.
bug
24941443
Change-Id: I49d8394063b23dce03222dcc9ddccdc32bb97ea2
Ruchi Kandoi [Mon, 12 Oct 2015 21:53:10 +0000 (21:53 +0000)]
am
08cf0e55: Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev
* commit '
08cf0e55a7c7e968d5f500d1ba01b9665077f0d4':
healthd: Adds fake battery properties for devices with no battery.
Ruchi Kandoi [Mon, 12 Oct 2015 21:40:39 +0000 (21:40 +0000)]
Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev
Ruchi Kandoi [Mon, 28 Sep 2015 20:35:59 +0000 (13:35 -0700)]
healthd: Adds fake battery properties for devices with no battery.
Devices which have no battery and are always plugged in will not have
any battery property initialized. This causes the 'stable power' to
never be switched which is required for updating apps.
This change recognizes such a device and manually sets the battery to
100% and charger status to connected to AC mains. It will also fake the
battery temperature.
Bug:
24258855
Change-Id: I98e5ed0dbeb7f2ab6d3802cd7e0f3a269bd8f31f
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Sami Tolvanen [Thu, 24 Sep 2015 09:51:02 +0000 (09:51 +0000)]
am
4ae302af: fs_mgr: trigger dm-verity error handling for invalid signatures
* commit '
4ae302af7d0f72559ffb8dd521f290b02fed3072':
fs_mgr: trigger dm-verity error handling for invalid signatures
Sami Tolvanen [Mon, 21 Sep 2015 14:12:29 +0000 (15:12 +0100)]
fs_mgr: trigger dm-verity error handling for invalid signatures
Currently, the device doesn't mount verified partitions if the
verity table signature is invalid, which usually means it fails to
boot. This change instead sets up dm-verity with an invalid root
hash and triggers device-specific error handling to recover from
the corruption.
Bug:
24256506
Change-Id: I6d693306fa0e7459c5500b028e433df61ecea6fb
(cherry picked from commit
47caa5c386b436ba13de9f2ef356380f39afaf3f)
Tim Murray [Mon, 21 Sep 2015 20:00:56 +0000 (20:00 +0000)]
am
a3f45684: Merge "add system-background cpuset" into mnc-dr-dev
* commit '
a3f45684bda7b3a479e480ccb90cc745f8852efd':
add system-background cpuset
Tim Murray [Mon, 21 Sep 2015 19:40:03 +0000 (19:40 +0000)]
Merge "add system-background cpuset" into mnc-dr-dev
Narayan Kamath [Sun, 20 Sep 2015 01:25:06 +0000 (01:25 +0000)]
am
7fc499bb: am
3f7a33a5: am
26d47f26: (-s ours) am
491035ce: am
8253cb04: am
0cc468dc: am
fef9dffd: (-s ours) am
6c53de92: Follow up to change
b638126ed DO NOT MERGE.
* commit '
7fc499bb7c060d2382517b4d0688a8c76198c0a8':
Follow up to change
b638126ed DO NOT MERGE.
Narayan Kamath [Sun, 20 Sep 2015 01:25:06 +0000 (01:25 +0000)]
am
222a1562: am
dd0932e8: am
81b428f2: am
db7d8e96: am
68a78370: am
2e64e959: am
a82d6dc3: (-s ours) resolved conflicts for
b638126e to klp-modular-dev
* commit '
222a15622a63d11783bbc998c2c261adb3ad1bd1':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Brian Carlstrom [Sun, 20 Sep 2015 01:12:26 +0000 (01:12 +0000)]
am
661600dd: am
110f705e: resolved conflicts for
832a0d1c to mnc-dev
* commit '
661600dd0f0bf48289f69915c6b9844436702a90':
libutils: Fix integer overflows in VectorImpl.
Narayan Kamath [Sun, 20 Sep 2015 01:10:10 +0000 (01:10 +0000)]
am
3f7a33a5: am
26d47f26: (-s ours) am
491035ce: am
8253cb04: am
0cc468dc: am
fef9dffd: (-s ours) am
6c53de92: Follow up to change
b638126ed DO NOT MERGE.
* commit '
3f7a33a5294cd59c331d5d036021141b6f1aef1e':
Follow up to change
b638126ed DO NOT MERGE.
Narayan Kamath [Sun, 20 Sep 2015 01:10:09 +0000 (01:10 +0000)]
am
dd0932e8: am
81b428f2: am
db7d8e96: am
68a78370: am
2e64e959: am
a82d6dc3: (-s ours) resolved conflicts for
b638126e to klp-modular-dev
* commit '
dd0932e831551d0a57a8af646ac0f9f386e4f579':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Brian Carlstrom [Sun, 20 Sep 2015 01:02:27 +0000 (01:02 +0000)]
am
110f705e: resolved conflicts for
832a0d1c to mnc-dev
* commit '
110f705e1077b388a69814e9cdd2907a6ad7d5bb':
libutils: Fix integer overflows in VectorImpl.
Narayan Kamath [Sun, 20 Sep 2015 01:00:25 +0000 (01:00 +0000)]
am
26d47f26: (-s ours) am
491035ce: am
8253cb04: am
0cc468dc: am
fef9dffd: (-s ours) am
6c53de92: Follow up to change
b638126ed DO NOT MERGE.
* commit '
26d47f2671e67968ea408417f03844681faf9455':
Follow up to change
b638126ed DO NOT MERGE.
Narayan Kamath [Sun, 20 Sep 2015 01:00:24 +0000 (01:00 +0000)]
am
81b428f2: am
db7d8e96: am
68a78370: am
2e64e959: am
a82d6dc3: (-s ours) resolved conflicts for
b638126e to klp-modular-dev
* commit '
81b428f27a74f693b7c19b873c3a5a9af69da641':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Brian Carlstrom [Sun, 20 Sep 2015 00:26:28 +0000 (17:26 -0700)]
resolved conflicts for
832a0d1c to mnc-dev
Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9
Narayan Kamath [Sun, 20 Sep 2015 00:08:45 +0000 (00:08 +0000)]
am
491035ce: am
8253cb04: am
0cc468dc: am
fef9dffd: (-s ours) am
6c53de92: Follow up to change
b638126ed DO NOT MERGE.
* commit '
491035ce1ceec310f98347654ea17cafa6ccb520':
Follow up to change
b638126ed DO NOT MERGE.
Narayan Kamath [Sun, 20 Sep 2015 00:08:44 +0000 (00:08 +0000)]
am
db7d8e96: am
68a78370: am
2e64e959: am
a82d6dc3: (-s ours) resolved conflicts for
b638126e to klp-modular-dev
* commit '
db7d8e963c54246a2792e91c678bbe00fb2cc3aa':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Brian Carlstrom [Sat, 19 Sep 2015 23:09:53 +0000 (16:09 -0700)]
resolved conflicts for
cf676a86 to lmp-mr1-ub-dev
Change-Id: Ifd9a44777a472ae893f894391bff7ef81456d92c
Tim Murray [Fri, 18 Sep 2015 20:18:49 +0000 (13:18 -0700)]
add system-background cpuset
add a new cpuset for system services that should not run on
larger cores
bug
24144797
Change-Id: I21a54f0d6b46b3b8bd8c4564b8685c88cfc4a57d
Narayan Kamath [Thu, 17 Sep 2015 23:03:11 +0000 (23:03 +0000)]
am
8253cb04: am
0cc468dc: am
fef9dffd: (-s ours) am
6c53de92: Follow up to change
b638126ed DO NOT MERGE.
* commit '
8253cb0436a09dcb325dbdecf4689b0a18b25644':
Follow up to change
b638126ed DO NOT MERGE.
Narayan Kamath [Thu, 17 Sep 2015 23:03:10 +0000 (23:03 +0000)]
am
68a78370: am
2e64e959: am
a82d6dc3: (-s ours) resolved conflicts for
b638126e to klp-modular-dev
* commit '
68a7837088c40e367ebf16959adc9d20d06ef0ea':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Narayan Kamath [Thu, 17 Sep 2015 23:01:45 +0000 (23:01 +0000)]
am
52edd8bd: am
419e6c3c: libutils: Fix integer overflows in VectorImpl.
* commit '
52edd8bdf3e83f41f4df4bb5e9e44d0bc0c56a37':
libutils: Fix integer overflows in VectorImpl.
Mark Salyzyn [Mon, 14 Sep 2015 14:31:13 +0000 (14:31 +0000)]
am
93807d47: Merge "logd: worst uid record watermark part five" into mnc-dr-dev
* commit '
93807d472d7c3745cae539af881aefbf5e211d5f':
logd: worst uid record watermark part five
Mark Salyzyn [Mon, 14 Sep 2015 14:16:49 +0000 (14:16 +0000)]
Merge "logd: worst uid record watermark part five" into mnc-dr-dev
Narayan Kamath [Sat, 12 Sep 2015 09:46:19 +0000 (09:46 +0000)]
am
0cc468dc: am
fef9dffd: (-s ours) am
6c53de92: Follow up to change
b638126ed DO NOT MERGE.
* commit '
0cc468dc2a1420d5c9dac563cc6c5d11b862ff47':
Follow up to change
b638126ed DO NOT MERGE.
Narayan Kamath [Sat, 12 Sep 2015 09:46:18 +0000 (09:46 +0000)]
am
2e64e959: am
a82d6dc3: (-s ours) resolved conflicts for
b638126e to klp-modular-dev
* commit '
2e64e9590a36511eaaf655b24002d24afe927f04':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Narayan Kamath [Sat, 12 Sep 2015 08:49:20 +0000 (08:49 +0000)]
am
fef9dffd: (-s ours) am
6c53de92: Follow up to change
b638126ed DO NOT MERGE.
* commit '
fef9dffd96e8bc6f2283a57cd0b29df4be43eb46':
Follow up to change
b638126ed DO NOT MERGE.
Narayan Kamath [Sat, 12 Sep 2015 08:49:15 +0000 (08:49 +0000)]
am
a82d6dc3: (-s ours) resolved conflicts for
b638126e to klp-modular-dev
* commit '
a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Narayan Kamath [Sat, 12 Sep 2015 06:30:18 +0000 (06:30 +0000)]
am
419e6c3c: libutils: Fix integer overflows in VectorImpl.
* commit '
419e6c3c68413bd6dbb6872340b2ae0d69a0fd60':
libutils: Fix integer overflows in VectorImpl.
OSDN Git Service
