Yifan Hong
43f731ae45
healthd: Remove access to /sys/class/power_supply/battery/batt_vol and batt_temp
...
These are custom paths from early Android devices that the framework used to
read, and that code was copied into healthd. Removed because this is not
defined in upstream kernel.
Change-Id: I375a8a62610c1235d82c1f27568437b16e0f96a8
Fixes: 72824944
Test: health 2.0 VTS test
2018-02-01 13:51:04 -08:00
Christopher Ferris
9e2465f52f
Merge "Use new unwinder for offline in libbacktrace." am: 01ba115732 am: 1a3f73c586
...
am: 2bce860b2e
Change-Id: I8a56fcd790acd8870fb31390efaa4457bbf0e123
2018-01-30 16:02:04 +00:00
Christopher Ferris
2bce860b2e
Merge "Use new unwinder for offline in libbacktrace." am: 01ba115732
...
am: 1a3f73c586
Change-Id: I9822d4883c4f357bfc1cd78fae9369c01619cbad
2018-01-30 15:53:31 +00:00
Christopher Ferris
1a3f73c586
Merge "Use new unwinder for offline in libbacktrace."
...
am: 01ba115732
Change-Id: Ib5c0bc398ab1788ddc5ec1bd49fab3516da2fe8d
2018-01-30 15:44:36 +00:00
Jorim Jaggi
7dee827f4f
Merge "Revert "Add UID parameter to authentication token""
2018-01-30 15:36:28 +00:00
Christopher Ferris
01ba115732
Merge "Use new unwinder for offline in libbacktrace."
2018-01-30 15:33:56 +00:00
Brian Young
16b8434935
Revert "Add UID parameter to authentication token"
...
This reverts commit 58ce81349a .
Reason for revert: Build breakages on elfin, gce_x86_phone.
Bug: 72679761
Bug: 67752510
Change-Id: Ia27d6a7aa0195e49d0f132e7b77c81d780248a4c
2018-01-30 15:31:32 +00:00
TreeHugger Robot
b17ce35c04
Merge "Functions to log stats log from LMKD."
2018-01-30 01:27:33 +00:00
Rajeev Kumar
f0216a8ac5
Functions to log stats log from LMKD.
...
Bug: 72177881
Test: Manual
Change-Id: I0f618013e242fabae785b62eb39f9bfbcaac16da
2018-01-29 15:18:04 -08:00
TreeHugger Robot
c1b0e813b7
Merge "Add UID parameter to authentication token"
2018-01-29 23:16:02 +00:00
Christopher Ferris
c8bec5aa91
Use new unwinder for offline in libbacktrace.
...
libbbacktrace changes:
- Completely rewrite the BacktraceOffline class to use the new unwinder.
- Modify the test data to save ucontext_t data instead of unw_context data.
- Convert the previous tests from unw_context data to ucontext_t data.
Bug: 65682279
Test: New unit tests pass in libunwindstack.
Test: All offline tests continue to pass.
Change-Id: I540345c304b20199d46deeb0349a0638a0f3ab2f
2018-01-29 10:41:11 -08:00
Bowgo Tsai
6d6cff4c74
Merge "sepolicy: renames nonplat_* to vendor_*" am: 8abe4e2638 am: 9714474d65
...
am: b07c0c10b2
Change-Id: Ia99fdbbdb4f5a17e048afcf3ded1815802702118
2018-01-28 02:48:52 +00:00
Bowgo Tsai
b07c0c10b2
Merge "sepolicy: renames nonplat_* to vendor_*" am: 8abe4e2638
...
am: 9714474d65
Change-Id: Idb9364f221776c789f358c51988ad0cdc358eabe
2018-01-28 02:46:13 +00:00
Bowgo Tsai
9714474d65
Merge "sepolicy: renames nonplat_* to vendor_*"
...
am: 8abe4e2638
Change-Id: I8c568c92912348f1c90ac4477e043926ba2b384d
2018-01-28 02:43:08 +00:00
Treehugger Robot
8abe4e2638
Merge "sepolicy: renames nonplat_* to vendor_*"
2018-01-28 02:39:28 +00:00
Christopher Ferris
ee70b42674
Merge "Fix frame numbering regression." am: 91837d7efe am: 7cbaae26ed
...
am: 7050682367
Change-Id: I5550c613939e60ea4fbdbd887a8d04a91005791c
2018-01-27 00:49:31 +00:00
James Hawkins
ea75bb945a
Merge "bootstat: Add more boot reasons." am: 4b69be3013 am: f609df2475
...
am: 83acb19860
Change-Id: Iedadec30de2515a0a31ee6cdba029d7947d3c983
2018-01-27 00:48:58 +00:00
Christopher Ferris
7050682367
Merge "Fix frame numbering regression." am: 91837d7efe
...
am: 7cbaae26ed
Change-Id: I698520ecd5c44fb34a53708ce58cbdec56a3e1e2
2018-01-27 00:41:10 +00:00
James Hawkins
83acb19860
Merge "bootstat: Add more boot reasons." am: 4b69be3013
...
am: f609df2475
Change-Id: I11bb41a1947e60d45c561de0e525d94df078d127
2018-01-27 00:40:40 +00:00
Christopher Ferris
7cbaae26ed
Merge "Fix frame numbering regression."
...
am: 91837d7efe
Change-Id: I406f8fc76b8097cd05aa44946c56774c3745e68f
2018-01-27 00:39:02 +00:00
James Hawkins
f609df2475
Merge "bootstat: Add more boot reasons."
...
am: 4b69be3013
Change-Id: I794f18767a8f5fe759f1c5e659f30cc365b34172
2018-01-27 00:38:34 +00:00
Elliott Hughes
3abbdaf93a
Merge "Doxygen format <android/log.h>." am: 969539c5c8 am: 3d9706ea36
...
am: 12f01fb386
Change-Id: I878270c4e9ed0526d7544ae7c5a52229bf7da953
2018-01-27 00:31:08 +00:00
Christopher Ferris
91837d7efe
Merge "Fix frame numbering regression."
2018-01-27 00:30:43 +00:00
Treehugger Robot
4b69be3013
Merge "bootstat: Add more boot reasons."
2018-01-27 00:27:26 +00:00
Elliott Hughes
12f01fb386
Merge "Doxygen format <android/log.h>." am: 969539c5c8
...
am: 3d9706ea36
Change-Id: Ie98f31f5811f66a8dc58f2f9d62fdad87bb61065
2018-01-27 00:09:26 +00:00
Elliott Hughes
3d9706ea36
Merge "Doxygen format <android/log.h>."
...
am: 969539c5c8
Change-Id: I4a8f17d666da7084790b99d79fcd289896416f45
2018-01-27 00:01:24 +00:00
James Hawkins
79a4ee260b
bootstat: Add more boot reasons.
...
Bug: none
Test: none
Change-Id: I483e4e2c6ea4219ac21b64a24bfac58c2919a40b
2018-01-26 14:31:04 -08:00
Christopher Ferris
8fe5836c02
Fix frame numbering regression.
...
Test: All unit tests now pass.
Change-Id: I280dfbbed3f835c826788b80ff4abb22bea7dc59
2018-01-26 14:26:13 -08:00
Elliott Hughes
969539c5c8
Merge "Doxygen format <android/log.h>."
2018-01-26 21:23:09 +00:00
Ruchi Kandoi
838c985416
Merge "Add AID for Secure Element Application" am: d3e7e31d28 am: 66c3eb0e45
...
am: f9ae0b10e0
Change-Id: I81e91a74c81a8e9854b1f4bab26ed03f033801c6
2018-01-26 20:02:54 +00:00
Ruchi Kandoi
f9ae0b10e0
Merge "Add AID for Secure Element Application" am: d3e7e31d28
...
am: 66c3eb0e45
Change-Id: I650d8ca9171aba487f883bde5cbea3e7a3e0c145
2018-01-26 19:49:01 +00:00
Ruchi Kandoi
66c3eb0e45
Merge "Add AID for Secure Element Application"
...
am: d3e7e31d28
Change-Id: I7b5fc105e82956751faa29a39dccd85a633adef8
2018-01-26 19:38:25 +00:00
Ruchi Kandoi
d3e7e31d28
Merge "Add AID for Secure Element Application"
2018-01-26 19:17:09 +00:00
Elliott Hughes
65725ac464
Doxygen format <android/log.h>.
...
Bug: N/A
Test: ran doxygen manually.
Change-Id: I164de255dbbc6c0312e656ddd886dcac231c893a
2018-01-26 10:57:57 -08:00
Christopher Ferris
e0124600b8
Merge "Add a global elf cache." am: bb4d172f70 am: 93a3aa1e57
...
am: 2fc0d5690b
Change-Id: I61f886295c5a10d2f1f19b832455add33b11a889
2018-01-26 15:05:20 +00:00
Christopher Ferris
2fc0d5690b
Merge "Add a global elf cache." am: bb4d172f70
...
am: 93a3aa1e57
Change-Id: I8c795ada6b40ee8f437fb04890bc4d738f9193cf
2018-01-26 15:02:15 +00:00
Christopher Ferris
93a3aa1e57
Merge "Add a global elf cache."
...
am: bb4d172f70
Change-Id: I9991ebc9a2527e1b1b53b3e0b24c620415784f14
2018-01-26 14:59:42 +00:00
Christopher Ferris
bb4d172f70
Merge "Add a global elf cache."
2018-01-26 14:55:15 +00:00
Logan Chien
1519e3c9b3
Merge "ld.config.txt: Link vendor vndk ns to default ns" am: 1e11f5f709 am: 161efac4f0
...
am: f20d8a1f1e
Change-Id: I915c4409df864bbb69ccb9b8f684c98ce3a3892d
2018-01-26 05:02:45 +00:00
Logan Chien
f20d8a1f1e
Merge "ld.config.txt: Link vendor vndk ns to default ns" am: 1e11f5f709
...
am: 161efac4f0
Change-Id: Iec8be20ea3c353e567b5982e0ca7b7228b079f18
2018-01-26 04:56:15 +00:00
Logan Chien
161efac4f0
Merge "ld.config.txt: Link vendor vndk ns to default ns"
...
am: 1e11f5f709
Change-Id: I29feaf1e0dd723fb271f1a641f39fbc9188a6d1f
2018-01-26 04:54:24 +00:00
Logan Chien
1e11f5f709
Merge "ld.config.txt: Link vendor vndk ns to default ns"
2018-01-26 04:45:26 +00:00
Jiyong Park
7888aab40f
Merge "Don't shared oem-defined libs to vendor apks" am: b6e957a6e7 am: 77a41b2562
...
am: 727281980d
Change-Id: Ia9fa3d3d719cd02eb597cdffded51c6c1bfc1bfe
2018-01-26 03:55:43 +00:00
Christopher Ferris
fdeefc50d3
Merge "Remove DwarfError.h that moved." am: d42e093793 am: 228de8a7b0
...
am: 4eb7b8824e
Change-Id: I4d7d4b1e87c2d304087d3a47f96d02f5dbbbd915
2018-01-26 03:55:10 +00:00
Jiyong Park
727281980d
Merge "Don't shared oem-defined libs to vendor apks" am: b6e957a6e7
...
am: 77a41b2562
Change-Id: Ic8a9ca281473cef1820685630c58fe47b38099a3
2018-01-26 03:45:46 +00:00
Christopher Ferris
4eb7b8824e
Merge "Remove DwarfError.h that moved." am: d42e093793
...
am: 228de8a7b0
Change-Id: Id590ef1dc53a074c429c620cf8ccd77ed9fe6b5c
2018-01-26 03:45:19 +00:00
Jiyong Park
77a41b2562
Merge "Don't shared oem-defined libs to vendor apks"
...
am: b6e957a6e7
Change-Id: Ib8f178769b411be2c4764348ccbc5a14a8d3443a
2018-01-26 03:34:06 +00:00
Christopher Ferris
228de8a7b0
Merge "Remove DwarfError.h that moved."
...
am: d42e093793
Change-Id: I8c7d736c47a9e04824eb62c558b1ffbaf07bc1ac
2018-01-26 03:33:38 +00:00
Treehugger Robot
b6e957a6e7
Merge "Don't shared oem-defined libs to vendor apks"
2018-01-26 03:23:40 +00:00
Christopher Ferris
d42e093793
Merge "Remove DwarfError.h that moved."
2018-01-26 01:55:08 +00:00