OSDN Git Service
Yifan Hong [Thu, 26 Jan 2017 18:25:56 +0000 (18:25 +0000)]
Add an lshal command. am:
85dd3ad89f
am:
a763ae7121
Change-Id: I627e16e1216e09dccbc96db26dfba844e073d403
Yifan Hong [Thu, 26 Jan 2017 18:23:02 +0000 (18:23 +0000)]
Add an lshal command.
am:
85dd3ad89f
Change-Id: I43be1cd548f30d7d6e954411fc3db8b13e20f3c0
Jeff Sharkey [Thu, 26 Jan 2017 17:43:07 +0000 (17:43 +0000)]
Merge "Fix two bugs in external storage accounting." am:
d1361ceb0c
am:
e4dc5d4ec5
Change-Id: I61ec7deb5d7196259e83de0a141ef23d198b9f1e
Jeff Sharkey [Thu, 26 Jan 2017 17:40:36 +0000 (17:40 +0000)]
Merge "Fix two bugs in external storage accounting."
am:
d1361ceb0c
Change-Id: I6f661104fbe8527bfbb1f9599beb395e5bc9d218
Treehugger Robot [Thu, 26 Jan 2017 17:37:23 +0000 (17:37 +0000)]
Merge "Fix two bugs in external storage accounting."
Yifan Hong [Wed, 25 Jan 2017 22:20:34 +0000 (14:20 -0800)]
Add an lshal command.
lshal lists services registered to the binderized
IServiceManager and all services available to the
passthrough IServiceManager as *.so libraries. It
also dumps the reference count for each service.
Bug:
34712252
Test: adb shell lshal
Change-Id: I9436a033cf736b8a8c307a2e87549c9db6379f3f
Jeff Sharkey [Thu, 26 Jan 2017 05:15:42 +0000 (22:15 -0700)]
Fix two bugs in external storage accounting.
When doing a manual tree walk, we always want to inherit fts_number
from the parent fts node.
For create_data_media_package_path(), two of the arguments had been
swapped.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug:
27948817,
30927649
Change-Id: Ic3cbf387cf119aa82af6e380bde9d9b069f6bfb0
George Burgess IV [Thu, 26 Jan 2017 01:34:39 +0000 (01:34 +0000)]
Merge "Add mode to open call with O_CREAT" am:
af78fe13a0
am:
f6b468db7b
Change-Id: I6ec7cd3bfa79ac95a042e26455073cb3cbec60c3
George Burgess IV [Thu, 26 Jan 2017 01:32:36 +0000 (01:32 +0000)]
Merge "Add mode to open call with O_CREAT"
am:
af78fe13a0
Change-Id: I488ffb3be9152532fd3e7eddd7bc78d311673420
Treehugger Robot [Thu, 26 Jan 2017 01:25:52 +0000 (01:25 +0000)]
Merge "Add mode to open call with O_CREAT"
George Burgess IV [Wed, 25 Jan 2017 21:51:53 +0000 (13:51 -0800)]
Add mode to open call with O_CREAT
This change was already applied internally. For us to submit FORTIFY, we
need to push it out here. Otherwise, we get compile-time errors about
this.
Bug:
32073964
Test: Builds with FORTIFY.
Change-Id: Ib500aca933468c06f7ceb796a9bb6a16c118e366
Merged-In: I63eb3d5499ae7e9ff9a77393763e39b747fd4611
Stephen Hines [Tue, 24 Jan 2017 01:21:35 +0000 (01:21 +0000)]
Merge "Properly align a packed structure." am:
24257dda48
am:
7e500210be
Change-Id: If09a200e9efa35ecc8611d087a7ba63f99f2a330
Stephen Hines [Tue, 24 Jan 2017 01:20:04 +0000 (01:20 +0000)]
Merge "Properly align a packed structure."
am:
24257dda48
Change-Id: I66d07aab4dfa72afe44270d866514102f660aab6
Treehugger Robot [Tue, 24 Jan 2017 01:15:06 +0000 (01:15 +0000)]
Merge "Properly align a packed structure."
Paul Lawrence [Mon, 23 Jan 2017 18:31:12 +0000 (18:31 +0000)]
Merge "Update atrace to work with tracefs, not debugfs" am:
a92616ecfe
am:
ea7c1845ee
Change-Id: I5e31ed34bbaf173577b3b33bbda0f4e4c6a67f92
Paul Lawrence [Mon, 23 Jan 2017 18:26:56 +0000 (18:26 +0000)]
Merge "Update atrace to work with tracefs, not debugfs"
am:
a92616ecfe
Change-Id: I139cd33d0a943bff3385cbd3ebc52eb47bc82be5
Treehugger Robot [Mon, 23 Jan 2017 18:20:51 +0000 (18:20 +0000)]
Merge "Update atrace to work with tracefs, not debugfs"
Steven Moreland [Sat, 21 Jan 2017 21:20:28 +0000 (21:20 +0000)]
Merge "dumpsys: add option to list hardware services." am:
4d741ebedc
am:
57d82aa9fd
Change-Id: Ife39a9b63ccf7a8fd83ad9b142c68cb0b0f321e4
Steven Moreland [Sat, 21 Jan 2017 21:15:29 +0000 (21:15 +0000)]
Merge "dumpsys: add option to list hardware services."
am:
4d741ebedc
Change-Id: I78070b7363e0562a0b236035989dcb9ae666d6d6
Treehugger Robot [Sat, 21 Jan 2017 21:11:50 +0000 (21:11 +0000)]
Merge "dumpsys: add option to list hardware services."
Steven Moreland [Fri, 20 Jan 2017 23:24:51 +0000 (15:24 -0800)]
dumpsys: add option to list hardware services.
This gives a convenient way to dump information about hidl services.
When hidl services dump information themselves as well, that dump will
be made here as well.
Bug:
33382892
Test: dumpsys_test, dumpsys --hw works as expected
Change-Id: Ib08b5d052e63ed6260035ee8d3ad3dac296202b1
Paul Lawrence [Tue, 17 Jan 2017 17:50:18 +0000 (09:50 -0800)]
Update atrace to work with tracefs, not debugfs
When tracefs is mounted, tracing is under /sys/kernel/tracing not
/sys/kernel/debug/tracing. Modify atrace to detect this situation and
get the right files.
Bug:
31856701
Test: Run atrace, check output is same where ever tracefs is mounted
Change-Id: I78df0da91d9f56c56077d1b8b9dba7b0126b2d8d
Jeff Sharkey [Fri, 20 Jan 2017 22:56:56 +0000 (22:56 +0000)]
Merge "Add Binder support for Parcelable exceptions." am:
7ebfeb9d1c
am:
fa418b2b15
Change-Id: I59c64df526ae8ba0c07532f983a224b72b427060
Jeff Sharkey [Fri, 20 Jan 2017 22:49:47 +0000 (22:49 +0000)]
Merge "Add Binder support for Parcelable exceptions."
am:
7ebfeb9d1c
Change-Id: Ia9fe213e51fef0fe2b000ed188b943079f9c9535
Jeff Sharkey [Fri, 20 Jan 2017 22:45:03 +0000 (22:45 +0000)]
Merge "Add Binder support for Parcelable exceptions."
Michael Wright [Fri, 20 Jan 2017 20:12:55 +0000 (20:12 +0000)]
Merge "Add i2c tracing support to atrace" am:
2630e78f53
am:
8b6f035960
Change-Id: Ie9ec292bfaa8f2ea6f29daeca624edda6c5e18af
Michael Wright [Fri, 20 Jan 2017 20:10:25 +0000 (20:10 +0000)]
Merge "Add i2c tracing support to atrace"
am:
2630e78f53
Change-Id: Icc06121228858c35b90ef5ad0d4a0ecc470a3909
Treehugger Robot [Fri, 20 Jan 2017 20:07:13 +0000 (20:07 +0000)]
Merge "Add i2c tracing support to atrace"
Polina Bondarenko [Fri, 20 Jan 2017 20:03:12 +0000 (20:03 +0000)]
Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers" am:
c4fc77792c
am:
969f4742f4
Change-Id: I7e755924f2a3e1556fcdc47068c0a863276ce984
Polina Bondarenko [Fri, 20 Jan 2017 20:01:12 +0000 (20:01 +0000)]
Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers"
am:
c4fc77792c
Change-Id: I4368431b3537bde427d8bb68f33fc8b6cf876f15
Treehugger Robot [Fri, 20 Jan 2017 19:55:15 +0000 (19:55 +0000)]
Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers"
Michael Wright [Thu, 18 Aug 2016 18:56:43 +0000 (19:56 +0100)]
Add i2c tracing support to atrace
Cherry-picking from internal master
Test: None
Change-Id: Iaf0daa0982bd8d2355d3590d43ad78711e764ee0
Jeff Sharkey [Thu, 19 Jan 2017 22:06:49 +0000 (22:06 +0000)]
Merge "Measure external storage using new GIDs." am:
f5a21ba425
am:
973d5aeb17
Change-Id: If3e585b5a35faa1f0151351affa23b382976dc4a
Jeff Sharkey [Thu, 19 Jan 2017 22:04:19 +0000 (22:04 +0000)]
Merge "Measure external storage using new GIDs."
am:
f5a21ba425
Change-Id: Id8f48276b4768a9e49b943e7142c33d7a365374a
Jeff Sharkey [Thu, 19 Jan 2017 22:00:50 +0000 (22:00 +0000)]
Merge "Measure external storage using new GIDs."
Jeff Sharkey [Thu, 19 Jan 2017 16:25:10 +0000 (16:25 +0000)]
Merge "First pass at updated cache clearing logic." am:
45270e18cc
am:
fe40750da2
Change-Id: I54afc93c8d39857a63906b0cb8ec72f4aba4f6d4
Jeff Sharkey [Thu, 19 Jan 2017 16:21:36 +0000 (09:21 -0700)]
Measure external storage using new GIDs.
We just defined a new range of GIDs that will be used to mark per-app
data files stored on external storage, so start measuring them.
Also measure all OBB files using another new GID that was defined.
Note that we're relying on the per-app cache GIDs to track cache
usage on *both* internal and external storage, which means that stats
and extStats won't always add up. (The framework already combines
these values together, and we didn't want to waste precious GID
space on explicitly tracking cache files on external storage.)
Test: builds, boots
Bug:
27948817,
34263266
Change-Id: Ife087df299ff8ee1a75fce1e39b4b737cf9375d5
Jeff Sharkey [Thu, 19 Jan 2017 16:20:50 +0000 (16:20 +0000)]
Merge "First pass at updated cache clearing logic."
am:
45270e18cc
Change-Id: Icade9c982866bb45c63cc484b77820fb9c1b77ea
Jeff Sharkey [Thu, 19 Jan 2017 16:16:02 +0000 (16:16 +0000)]
Merge "First pass at updated cache clearing logic."
Peng Xu [Thu, 19 Jan 2017 01:21:12 +0000 (01:21 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am:
29280addfd
am:
4925ffcbec
Change-Id: Id48ac0e29a62e17495ae0ae7f4b5741e89e93121
Peng Xu [Thu, 19 Jan 2017 01:17:56 +0000 (01:17 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
am:
29280addfd
Change-Id: I45ad2448abf8da0ab2d1cdc4e29c7d2d30d3affe
Peng Xu [Thu, 19 Jan 2017 01:11:49 +0000 (01:11 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
Calin Juravle [Wed, 18 Jan 2017 23:57:34 +0000 (23:57 +0000)]
Merge "Clean up and simplify the logic in dexopt" am:
57eb11ed2d
am:
617b5a2bf9
Change-Id: I296990f67265262156b96d9b1353ce5d24e744ec
Calin Juravle [Wed, 18 Jan 2017 23:52:24 +0000 (23:52 +0000)]
Merge "Clean up and simplify the logic in dexopt"
am:
57eb11ed2d
Change-Id: I9571ed4171d592d78e76278ffbeee9f978d4de43
Calin Juravle [Wed, 18 Jan 2017 23:49:13 +0000 (23:49 +0000)]
Merge "Clean up and simplify the logic in dexopt"
Josh Gao [Wed, 18 Jan 2017 23:45:52 +0000 (23:45 +0000)]
Merge changes from topic 'kill_debuggerd' am:
134a7193a0
am:
b1a94fb6e5
Change-Id: I62a2dee60f16c47be0614b9688e92a290e4f45c7
Josh Gao [Wed, 18 Jan 2017 23:45:40 +0000 (23:45 +0000)]
dumpstate: use O_APPEND for anr file. am:
989b812dcd
am:
b0f08f67fd
Change-Id: Ic0fb8b7a328edcaa62c725d84aea74d9404e6ee9
Josh Gao [Wed, 18 Jan 2017 23:39:44 +0000 (15:39 -0800)]
resolve merge conflicts of
f79a82d6a to nyc-mr1-dev-plus-aosp
Change-Id: I5a9fbde2637d746bfd32d5b7546777708746e6d9
Josh Gao [Wed, 18 Jan 2017 23:19:49 +0000 (23:19 +0000)]
Merge changes from topic 'kill_debuggerd'
am:
134a7193a0
Change-Id: Icb705df114dc073ef66507c59884e77ea1cf828b
Josh Gao [Wed, 18 Jan 2017 23:19:31 +0000 (23:19 +0000)]
dumpstate: use O_APPEND for anr file.
am:
989b812dcd
Change-Id: Ibaa04b99195886df0ff14b2f6569e37918373619
Josh Gao [Wed, 18 Jan 2017 23:16:29 +0000 (23:16 +0000)]
dumpstate: switch to using libdebuggerd_client.
am:
d2db024a86
Change-Id: I219627b359a88b8a694b4f4cd46de9cea9767655
Amit Pundir [Wed, 18 Jan 2017 23:06:20 +0000 (23:06 +0000)]
Merge "libGLES_android: Add generic 32bpp BGRA EGLConfig" am:
0233bd47ed
am:
190197d914
Change-Id: I2136f3da54052e56344d6c491bbe94e9303d01b9
Amit Pundir [Wed, 18 Jan 2017 23:04:54 +0000 (23:04 +0000)]
Merge "libGLES_android: Add generic 32bpp BGRA EGLConfig"
am:
0233bd47ed
Change-Id: Ie6f7c202ceb22e76e28ad5973cf668bddd3b8552
Josh Gao [Wed, 18 Jan 2017 23:04:08 +0000 (23:04 +0000)]
Merge changes from topic 'kill_debuggerd'
* changes:
dumpstate: use O_APPEND for anr file.
dumpstate: switch to using libdebuggerd_client.
Treehugger Robot [Wed, 18 Jan 2017 23:00:41 +0000 (23:00 +0000)]
Merge "libGLES_android: Add generic 32bpp BGRA EGLConfig"
Calin Juravle [Sun, 15 Jan 2017 00:23:30 +0000 (16:23 -0800)]
Clean up and simplify the logic in dexopt
Make some order in dexopt logic by extracting independent parts in their
own helpers.
It will make further updates of dexopt simpler and easier to reason
about (e.g. for secondary dex files).
Test: device boots
adb shell cmd package compile -m speed|speed-profile packageName
install new packages
Bug:
32871170
(cherry picked from commit
4a391f80601d7f65d7e63353363e6d32868161d5)
Change-Id: If0c96174e904519a4332e54553690b691ff63149
Jeff Sharkey [Wed, 18 Jan 2017 01:05:54 +0000 (18:05 -0700)]
First pass at updated cache clearing logic.
The old clearing algorithm is very naive and it sorts all cached files
globally by modified time. This sadly lets apps gamify the system by
setting their modified times far in the future, and it's very
expensive because it requires a global filesystem traversal to free
up even the smallest amount of data.
Instead, this CL introduces a much more fair cache clearing algorithm
that deletes files from specific UIDs based on how much cache space
that UID is using proportional to the space allocated to them. This
new design has several nice properties:
-- It uses the recently added quotactl() feature to rapidly target
the apps that are using the most space.
-- We only need to traverse the filesystem for UIDs that actively
enter the crosshairs of the clearing algorithm.
-- Disciplined apps who stay under their allocated quota will be
the last to have their cached data cleared.
-- This design can be easily adapted to support additional features
such as atomic purging and tombstones.
In summary, the new algorithm is extremely efficient when freeing up
the typical small-to-medium amounts of disk space, and is only
moderately less efficient than the old algorithm when forced to clear
all cached data.
Test: builds, boots, clearing strategy looks sane
Bug:
33965858
Change-Id: I66f95089cb33f1add3f31fcf1082ab2469870fda
Polina Bondarenko [Thu, 12 Jan 2017 20:14:14 +0000 (21:14 +0100)]
Add feature flag for TelephonyManager#get/setAllowedCarriers
Add android.hardware.telephony.carrierlock feature flag declaration.
Bug:
33480084
Test: cts
Change-Id: Ib6ede97d7ee8d6e924c1483ee51f52bdfa09950b
Jeff Sharkey [Wed, 18 Jan 2017 01:22:27 +0000 (01:22 +0000)]
Merge "Add systrace details to storage measurements." am:
a693382d94
am:
b0858a472e
Change-Id: I37efa4372b36d97e0fbbac362d74e66957eca569
Jeff Sharkey [Wed, 18 Jan 2017 01:17:47 +0000 (01:17 +0000)]
Merge "Add systrace details to storage measurements."
am:
a693382d94
Change-Id: I4bdc09bd3e62dfbc522b527537bcd526a391fbaf
Jeff Sharkey [Wed, 18 Jan 2017 01:10:59 +0000 (01:10 +0000)]
Merge "Add systrace details to storage measurements."
Sandeep Patil [Wed, 18 Jan 2017 00:46:46 +0000 (00:46 +0000)]
Merge "servicemanager: selinux: set selinux callbacks early" am:
bfbe2d711c
am:
a7575ec40f
Change-Id: Id220cef18e1b003f5c0edd3a8da4d2871d2055a9
Sandeep Patil [Wed, 18 Jan 2017 00:41:34 +0000 (00:41 +0000)]
Merge "servicemanager: selinux: set selinux callbacks early"
am:
bfbe2d711c
Change-Id: I0e3e088eb3d8404d1707ac61aa18eda5f0cbad8d
Treehugger Robot [Wed, 18 Jan 2017 00:36:55 +0000 (00:36 +0000)]
Merge "servicemanager: selinux: set selinux callbacks early"
Jeff Sharkey [Tue, 17 Jan 2017 22:25:01 +0000 (15:25 -0700)]
Add systrace details to storage measurements.
Can be used to find bottlenecks, and confirm that quota stuff is
being used when expected.
Test: builds, boots
Bug:
34341727
Change-Id: Ifefc155e5d3b0c74245e0d287e84df699ce09d16
Josh Gao [Sat, 14 Jan 2017 06:09:40 +0000 (22:09 -0800)]
dumpstate: use O_APPEND for anr file.
Bug: http://b/
30705528
Test: ran dumpstate, grepped dmesg for new selinux denials
Change-Id: I28814edcf37a7edbde79279feff0e7def64316f2
Josh Gao [Fri, 6 Jan 2017 02:27:33 +0000 (18:27 -0800)]
dumpstate: switch to using libdebuggerd_client.
Bug: http://b/
30705528
Test: manual inspection of dumpstate output
Change-Id: I8f9822f67f1a81fcfa2b3a9120e6631b19b29854
Jeff Sharkey [Tue, 17 Jan 2017 20:53:04 +0000 (13:53 -0700)]
Add Binder support for Parcelable exceptions.
Follow the new framework changes that support sending EX_PARCELABLE
exception types.
Test: builds, boots
Bug:
33749182
Change-Id: I7a856fa89f23aab4f782c4e5ae2beb8166fa8da4
Jeff Sharkey [Tue, 17 Jan 2017 17:47:16 +0000 (17:47 +0000)]
Merge "Handle devices without quota, speed up lookup." am:
36ba03a248
am:
411ae16a91
Change-Id: Icb7deaa5e60880d783fc4c434bbd0e70ad2c188b
Jeff Sharkey [Tue, 17 Jan 2017 17:27:14 +0000 (17:27 +0000)]
Merge "Handle devices without quota, speed up lookup."
am:
36ba03a248
Change-Id: I38d4e01057e3cd65f4362056336294e8136df459
Jeff Sharkey [Tue, 17 Jan 2017 16:54:00 +0000 (16:54 +0000)]
Merge "Handle devices without quota, speed up lookup."
Sandeep Patil [Tue, 27 Dec 2016 20:40:45 +0000 (12:40 -0800)]
servicemanager: selinux: set selinux callbacks early
SELinux library error logs are never be shown in logcat if
there's a failure before the callbacks are set. We missed
all logs from service context initialization because of this.
Bug:
33746484
Test: Restart new service manager to make sure context init logs
show up in logcat.
Change-Id: I5479cf5fe10ceb1a210eda26946b6ea344792e24
Signed-off-by: Sandeep Patil <sspatil@google.com>
Jeff Sharkey [Tue, 17 Jan 2017 04:13:56 +0000 (04:13 +0000)]
Merge changes Ic746ea89,Iebaa8063 am:
950e3f5696
am:
f1d87ca9b8
Change-Id: Icdbfc562c9aad5ed0253e04b215d88cb666c94c1
Jeff Sharkey [Tue, 17 Jan 2017 04:13:46 +0000 (04:13 +0000)]
Wrap all installd operations in lock. am:
7a9059e8ed
am:
b940bdae84
Change-Id: I494c59b015dac7dd301c1666ef95a9c28a00f7e3
Jeff Sharkey [Tue, 17 Jan 2017 04:13:37 +0000 (04:13 +0000)]
Mask st_mode before comparing it. am:
24ef15bd00
am:
0e636867b5
Change-Id: Ic8968f123759d36d49bf9bd65ec17e7f6024b888
Jeff Sharkey [Tue, 17 Jan 2017 04:08:16 +0000 (04:08 +0000)]
Merge changes Ic746ea89,Iebaa8063
am:
950e3f5696
Change-Id: I61d240c0345e7b0a5a5d499c003230396aa469ec
Jeff Sharkey [Tue, 17 Jan 2017 04:08:14 +0000 (04:08 +0000)]
Wrap all installd operations in lock.
am:
7a9059e8ed
Change-Id: Ide1ef93a041ee5ff683babb865e382d1cb7a7356
Jeff Sharkey [Tue, 17 Jan 2017 04:08:06 +0000 (04:08 +0000)]
Mask st_mode before comparing it.
am:
24ef15bd00
Change-Id: I2b9ec79a679428cb6018798110bf4c3aa2936ae0
Treehugger Robot [Tue, 17 Jan 2017 04:02:45 +0000 (04:02 +0000)]
Merge changes Ic746ea89,Iebaa8063
* changes:
Wrap all installd operations in lock.
Mask st_mode before comparing it.
Jeff Sharkey [Tue, 17 Jan 2017 03:57:45 +0000 (20:57 -0700)]
Handle devices without quota, speed up lookup.
Start tracking which block devices have quota support, and gracefully
clear FLAG_USE_QUOTA when no support is present.
Also build a cached map of mounted volumes that support quota, which
halves the average quota calculation speed from 0.70ms to 0.35ms,
since we're no longer parsing procfs every time.
Test: builds, boots, common operations work
Bug:
34249218
Change-Id: Ie791df7801b67495331f3eea256c018860c9b4f6
Jeff Sharkey [Tue, 17 Jan 2017 02:07:18 +0000 (19:07 -0700)]
Wrap all installd operations in lock.
Historically installd has a single lock up in the framework, but
we're starting to call in from multiple locations, so installd needs
to protect itself.
This specifically applies to any disk measurement requests, which
use the optimized fts(3) mode which uses chdir() internally.
Test: builds, boots, common operations work
Bug:
34330051
Change-Id: Ic746ea890ebcc7b2bf923404874b04dbc19d42ad
Jeff Sharkey [Fri, 13 Jan 2017 02:27:03 +0000 (19:27 -0700)]
Mask st_mode before comparing it.
Otherwise it will never match the requested mode_t.
Test: builds, boots, skips when matching
Bug:
34201111
Change-Id: Iebaa8063a72eb6eaf2e773c1d35204617d0f16b8
Mark Salyzyn [Thu, 12 Jan 2017 22:06:58 +0000 (22:06 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros" am:
9a30f044ca
am:
70a969c6fc
Change-Id: I5b2e4fa842edf56ab85c6bcb24997e537c02d5de
Mark Salyzyn [Thu, 12 Jan 2017 22:04:58 +0000 (22:04 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros"
am:
9a30f044ca
Change-Id: Ibf35cc60eeb53bc421a2f886fa63b37ffa2083c1
Mark Salyzyn [Thu, 12 Jan 2017 21:59:57 +0000 (21:59 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros"
Mark Salyzyn [Thu, 12 Jan 2017 21:57:51 +0000 (13:57 -0800)]
liblog: use log/log.h when utilizing ALOG macros
Audit dropout because ALOG is behind MYLOG ...
Test: compile
Bug:
34250038
Change-Id: I009478157d2267e10f8c09a7faa4b8f7c7c4a1e7
Martijn Coenen [Thu, 12 Jan 2017 21:27:25 +0000 (21:27 +0000)]
Merge "Don't print error if we can't talk to hwservicemanager." am:
53d36e4476
am:
c144b7da38
Change-Id: Ib2b9c2e285bd0dddab59b4ee40599d9fed63fd49
Martijn Coenen [Thu, 12 Jan 2017 21:24:56 +0000 (21:24 +0000)]
Merge "Don't print error if we can't talk to hwservicemanager."
am:
53d36e4476
Change-Id: I3a524a89d8d6b022b4a825197e29b6a69687c8d9
Treehugger Robot [Thu, 12 Jan 2017 21:20:15 +0000 (21:20 +0000)]
Merge "Don't print error if we can't talk to hwservicemanager."
Martijn Coenen [Thu, 12 Jan 2017 16:16:31 +0000 (17:16 +0100)]
Don't print error if we can't talk to hwservicemanager.
This currently fails as a non-root user due to SEPolicy,
and is causing CTS test failures. Until we figure out
the policy on b/
34242478, don't print an error to allow
the test to pass again.
Test: cts-tradefed run cts --module CtsAtraceHostTestCases --test
android.atrace.cts.AtraceHostTest#testSimpleRun
Bug:
33814619
Change-Id: Ie5578639028e7890284d71bbf1b753f5803ca4af
Mark Salyzyn [Thu, 12 Jan 2017 15:48:18 +0000 (15:48 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am:
d655e61a22
am:
16a30c1ac8
Change-Id: I697418fbab0dbbd447d0dca2eda5b1545cc2522e
Mark Salyzyn [Thu, 12 Jan 2017 15:34:32 +0000 (15:34 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
am:
d655e61a22
Change-Id: I86d040528ab10e503e03f033f12d47a8142c3c6b
Mark Salyzyn [Thu, 12 Jan 2017 15:19:07 +0000 (15:19 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
Mark Salyzyn [Thu, 29 Sep 2016 15:08:05 +0000 (08:08 -0700)]
Replace cutils/log.h and rationalize log/log.h and android/log.h
- cutils/log.h treat as deprecated and lead by example
- android/log.h to be used instead of log/log.h if possible
- add system includes that are assumed as side effects
- define LOG_TAG first
Test: compile
Bug:
31289077
Bug:
30465923
Change-Id: I8d99b24c333578c9b5aa9f2a01324bd0bba268dd
Felipe Leme [Wed, 11 Jan 2017 19:04:25 +0000 (19:04 +0000)]
Merge "Added test cases to dumpsys." am:
5cfc1c0546
am:
74ee4a06a3
Change-Id: I5e536d12eef0ff8d41030f037f309f67c880b2a7
Felipe Leme [Wed, 11 Jan 2017 18:59:22 +0000 (18:59 +0000)]
Merge "Added test cases to dumpsys."
am:
5cfc1c0546
Change-Id: I87917d89160271a635ac1a42728fb643e1df99ae
Treehugger Robot [Wed, 11 Jan 2017 18:51:14 +0000 (18:51 +0000)]
Merge "Added test cases to dumpsys."
Richard Uhler [Wed, 11 Jan 2017 10:48:12 +0000 (10:48 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am:
6c207a7d96
am:
83c87d4985
Change-Id: I72c03782c82ff40cef7c520adc6d694b52289951
Richard Uhler [Wed, 11 Jan 2017 10:37:44 +0000 (10:37 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
am:
6c207a7d96
Change-Id: I82f59649db71b255abdbafae8190f40974534f83
Treehugger Robot [Wed, 11 Jan 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."