250e7aad89edbb7e7a798b565d33205741988620 - platform_frameworks_base

commit	250e7aad89edbb7e7a798b565d33205741988620	[log] [tgz]
author	Tej Singh <singhtejinder@google.com>	Thu Jan 16 13:16:21 2020 -0800
committer	Jeffrey Huang <jeffreyhuang@google.com>	Thu Jan 16 15:16:54 2020 -0800
tree	53a66fcc6247c068ce0296a9b0c15453a976ec8a
parent	25e6dd3ed13346a0fe7056d02ad9faf1328367e2 [diff]

Fix crash when pulling certain atoms

IonMemoryUtil and ProcFsMemoryUtil were package-private classes loaded
in the system server class loader and had the same package as
StatsCompanionService, which is loaded in a separate class loader for
statsd. This caused a crash when statsd tried to access either. This cl
moves IonMemoryUtil and ProcFsMemoryUtil along with StatsPullAtomService
to a separate package so that no classes are shared in the same package.

Bug: 147792532
Test: pulled all relevant atoms and make sure they worked
Test: adb shell cmd stats pull-source 10064
Test: adb shell cmd stats pull-source 10061
Test: adb shell cmd stats pull-source 10042
Test: adb shell cmd stats pull-source 10056
Change-Id: I5107aa47045321e84549a7f2d55d0ee27f0d080e

apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java[diff]
services/core/java/com/android/server/stats/pull/IonMemoryUtil.java[Renamed from services/core/java/com/android/server/stats/IonMemoryUtil.java - diff]
services/core/java/com/android/server/stats/pull/ProcfsMemoryUtil.java[Renamed from services/core/java/com/android/server/stats/ProcfsMemoryUtil.java - diff]
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java[Renamed from services/core/java/com/android/server/stats/StatsPullAtomService.java - diff]
services/java/com/android/server/SystemServer.java[diff]
services/tests/servicestests/src/com/android/server/stats/pull/IonMemoryUtilTest.java[Renamed from services/tests/servicestests/src/com/android/server/stats/IonMemoryUtilTest.java - diff]

6 files changed