Commit Graph

14660 Commits

Author SHA1 Message Date
Christopher Ferris 3f5fdc3522 Fix incorrect check of descsz value. am: d917514bd6
am: 69406d904a

* commit '69406d904abffcfd5addf14dc96584f73ab04ff5':
  Fix incorrect check of descsz value.
2015-10-29 19:20:52 +00:00
Christopher Ferris 69406d904a Fix incorrect check of descsz value.
am: d917514bd6

* commit 'd917514bd6b270df431ea4e781a865764d406120':
  Fix incorrect check of descsz value.
2015-10-29 19:12:37 +00:00
Christopher Ferris d917514bd6 Fix incorrect check of descsz value.
Bug: 25187394

(cherry picked from commit 1fa55234d6)

Change-Id: Idbc9071e8b2b25a062c4e94118808d6e19d443d9
2015-10-22 17:54:24 -07:00
Paul Lawrence ba1d268273 Merge "Don\'t show UI on default encryption" into mnc-dr-dev
am: 2b216aa89b

* commit '2b216aa89b76dbadb315322e4fd31aa37059b262':
  Don't show UI on default encryption
2015-10-21 14:58:50 +00:00
Paul Lawrence 2b216aa89b Merge "Don't show UI on default encryption" into mnc-dr-dev 2015-10-21 14:27:38 +00:00
Tim Murray e56b566401 Reorder init.rc to avoid a kernel warning.
am: f429d37807

* commit 'f429d37807a005c1de38a7616669bf1834d45432':
  Reorder init.rc to avoid a kernel warning.
2015-10-20 22:08:36 +00:00
Tim Murray f429d37807 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
2015-10-15 12:38:15 -07:00
Ruchi Kandoi 43ed8e1522 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.
2015-10-12 21:53:10 +00:00
Ruchi Kandoi 08cf0e55a7 Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev 2015-10-12 21:40:39 +00:00
Ruchi Kandoi 42a981ddee 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>
2015-10-12 14:31:58 -07:00
Sami Tolvanen e2d2c1cb30 am 4ae302af: fs_mgr: trigger dm-verity error handling for invalid signatures
* commit '4ae302af7d0f72559ffb8dd521f290b02fed3072':
  fs_mgr: trigger dm-verity error handling for invalid signatures
2015-09-24 09:51:02 +00:00
Sami Tolvanen 4ae302af7d 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 47caa5c386)
2015-09-22 08:09:37 +00:00
Tim Murray 5caca3dd89 am a3f45684: Merge "add system-background cpuset" into mnc-dr-dev
* commit 'a3f45684bda7b3a479e480ccb90cc745f8852efd':
  add system-background cpuset
2015-09-21 20:00:56 +00:00
Tim Murray a3f45684bd Merge "add system-background cpuset" into mnc-dr-dev 2015-09-21 19:40:03 +00:00
Narayan Kamath f5db0689a0 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.
2015-09-20 01:25:06 +00:00
Narayan Kamath 5ce847b261 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
2015-09-20 01:25:06 +00:00
Brian Carlstrom 742d0173e8 am 661600dd: am 110f705e: resolved conflicts for 832a0d1c to mnc-dev
* commit '661600dd0f0bf48289f69915c6b9844436702a90':
  libutils: Fix integer overflows in VectorImpl.
2015-09-20 01:12:26 +00:00
Narayan Kamath 7fc499bb7c 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.
2015-09-20 01:10:10 +00:00
Narayan Kamath 222a15622a 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
2015-09-20 01:10:09 +00:00
Brian Carlstrom 661600dd0f am 110f705e: resolved conflicts for 832a0d1c to mnc-dev
* commit '110f705e1077b388a69814e9cdd2907a6ad7d5bb':
  libutils: Fix integer overflows in VectorImpl.
2015-09-20 01:02:27 +00:00
Narayan Kamath 3f7a33a529 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.
2015-09-20 01:00:25 +00:00
Narayan Kamath dd0932e831 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
2015-09-20 01:00:24 +00:00
Brian Carlstrom 110f705e10 resolved conflicts for 832a0d1c to mnc-dev
Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9
2015-09-19 17:29:42 -07:00
Narayan Kamath 26d47f2671 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.
2015-09-20 00:08:45 +00:00
Narayan Kamath 81b428f27a 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
2015-09-20 00:08:44 +00:00
Brian Carlstrom 832a0d1c64 resolved conflicts for cf676a86 to lmp-mr1-ub-dev
Change-Id: Ifd9a44777a472ae893f894391bff7ef81456d92c
2015-09-19 16:13:00 -07:00
Tim Murray cba6ad7449 add system-background cpuset
add a new cpuset for system services that should not run on
larger cores

bug 24144797

Change-Id: I21a54f0d6b46b3b8bd8c4564b8685c88cfc4a57d
2015-09-18 13:18:49 -07:00
Narayan Kamath 491035ce1c 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.
2015-09-17 23:03:11 +00:00
Narayan Kamath db7d8e963c 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
2015-09-17 23:03:10 +00:00
Narayan Kamath cf676a8686 am 52edd8bd: am 419e6c3c: libutils: Fix integer overflows in VectorImpl.
* commit '52edd8bdf3e83f41f4df4bb5e9e44d0bc0c56a37':
  libutils: Fix integer overflows in VectorImpl.
2015-09-17 23:01:45 +00:00
Mark Salyzyn f24699f0f4 am 93807d47: Merge "logd: worst uid record watermark part five" into mnc-dr-dev
* commit '93807d472d7c3745cae539af881aefbf5e211d5f':
  logd: worst uid record watermark part five
2015-09-14 14:31:13 +00:00
Mark Salyzyn 93807d472d Merge "logd: worst uid record watermark part five" into mnc-dr-dev 2015-09-14 14:16:49 +00:00
Narayan Kamath 8253cb0436 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.
2015-09-12 09:46:19 +00:00
Narayan Kamath 68a7837088 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
2015-09-12 09:46:18 +00:00
Narayan Kamath 0cc468dc2a am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
* commit 'fef9dffd96e8bc6f2283a57cd0b29df4be43eb46':
  Follow up to change b638126ed DO NOT MERGE.
2015-09-12 08:49:20 +00:00
Narayan Kamath 2e64e9590a am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
* commit 'a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-12 08:49:15 +00:00
Narayan Kamath 52edd8bdf3 am 419e6c3c: libutils: Fix integer overflows in VectorImpl.
* commit '419e6c3c68413bd6dbb6872340b2ae0d69a0fd60':
  libutils: Fix integer overflows in VectorImpl.
2015-09-12 06:30:18 +00:00
Mark Salyzyn 33eb1ca3b4 am 805ef688: logd: klogd and Mediatek
* commit '805ef688af4035ac45e79428a1b6328bd0b465d2':
  logd: klogd and Mediatek
2015-09-11 16:35:35 +00:00
Mark Salyzyn 805ef688af logd: klogd and Mediatek
(cherry pick from commit 46d159d462)

- sniff for PID in kernel log messages if available
- properly deal with klogd watermark in face of modified output
- deal more stringently with priority tag, must have [ following
- suppress process-name stutter in tag that can happen
- do not use : to demark tag if within [ ]

Mediatek-special change that adds <printk_state>(<cpu>)[<pid>:<comm>]
as a prefix to the printk messages. Along the lines of (simplified
for entertainment purposes, YMMV):

    char tbuf[50]; /* printk prefix */
    int this_cpu = smp_processor_id();
    char state = __raw_get_cpu_var(printk_state);
    unsigned tlen = snprintf(tbuf, sizeof(tbuf), "%c(%x)[%d:%s]",
               state, this_cpu, current->pid, current->comm);

Bug: 23517551
Change-Id: I568e25c5aa6d8474835454a0e83b19c2921b7985
2015-09-11 14:51:41 +00:00
Narayan Kamath fef9dffd96 am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
* commit '6c53de92cf7e759488538280788325fac6ccdea2':
  Follow up to change b638126ed DO NOT MERGE.
2015-09-11 09:50:09 +00:00
Narayan Kamath a82d6dc3bf resolved conflicts for b638126e to klp-modular-dev
Change-Id: If5062b01afa95279ab25fe86aaafa89d4d74eaa1
2015-09-10 22:00:26 +01:00
Narayan Kamath 6c53de92cf Follow up to change b638126ed DO NOT MERGE.
Resolves delta between the kitkat and L version of this patch.
Fixes the molly build on klp-dev.

bug: 22953624
Change-Id: I696a506320f30d3d5cd95f6da35361244986cb36
2015-09-10 20:30:59 +00:00
Mark Salyzyn 04827ab02a logd: worst uid record watermark part five
(cherry pick from commit 5bb2972dce)

A regression that resulted in increased memory consumption for some
logging patterns because we rarely did merge or leading checks, and
age-out checking. On the last prune cycle, we reset for a full scan.

Add some comments describing the pruning processes.

Bug: 23327476
Bug: 23681639
Bug: 23685592
Change-Id: I22b0f339c9269b006831fda9cefe295a263ebb92
2015-09-10 09:38:07 -07:00
Badhri Jagan Sridharan c939c61c71 am a6c377b2: init: usb: Add configfs commands for USB gadget
* commit 'a6c377b2f62175d6d5268c63885de3d882edbe2b':
  init: usb: Add configfs commands for USB gadget
2015-09-10 00:42:43 +00:00
Paul Lawrence 751dfddc19 Don't show UI on default encryption
Bug: 22989588
Change-Id: I8e7023767f1da80c872adc45871be1f8851926ad
2015-09-09 12:10:58 -07:00
Narayan Kamath 419e6c3c68 libutils: Fix integer overflows in VectorImpl.
Use external/safe-iop to check for overflows on arithmetic
operations.

Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.

Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.

bug: 22953624

(cherry picked from commit c609c31fb5)

Change-Id: I61644633db6b54fa230683615de9724f7fabf6fb
2015-09-09 12:05:06 +01:00
Narayan Kamath b638126ed3 libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Use external/safe-iop to check for overflows on arithmetic
operations.

Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.

Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.

bug: 22953624

(cherry picked from commit c609c31fb5)

Change-Id: I673b7ab142bed4fcba9159a00a65cf6bca6b1f6c
2015-09-09 11:20:13 +01:00
Badhri Jagan Sridharan a6c377b2f6 init: usb: Add configfs commands for USB gadget
Adds init support for:
accessory
audio_source
midi
adb
rndis

Bug=23633457

Change-Id: I12e68e25969adafcf3170769f91ae939d08b7dbc
2015-09-08 20:13:37 -07:00
Narayan Kamath 32d86587f3 am cdf094f6: am c609c31f: libutils: Fix integer overflows in VectorImpl.
* commit 'cdf094f667a251ddb03f95a4aa099e3acdaf9c4d':
  libutils: Fix integer overflows in VectorImpl.
2015-09-08 12:52:22 +00:00
Narayan Kamath cdf094f667 am c609c31f: libutils: Fix integer overflows in VectorImpl.
* commit 'c609c31fb56ae434caa2d0153cd0a2f74a715071':
  libutils: Fix integer overflows in VectorImpl.
2015-09-08 12:40:52 +00:00