Commit Graph

8320 Commits

Author SHA1 Message Date
Winson Chiu
40e1467fd0 Merge "Optimize (Parsing)PackageImpl implementation" 2020-09-15 16:22:37 +00:00
Fiona Campbell
5e687ef407 Merge "Remove TODO" 2020-09-15 09:21:05 +00:00
Jeff Sharkey
2192b22cf2 Merge changes from topic "sep11"
* changes:
  Remove advisory registerNativeAllocation().
  Hand-rolled linked list for Parcel performance.
2020-09-14 23:53:57 +00:00
Winson
c086fe9ac1 Optimize (Parsing)PackageImpl implementation
To speed up recurring ApplicationInfo creation, this caches
the the appInfoFlags/appInfoPrivateFlags at parse time, since
they're immutable at that point. This saves having to calculate
it hundreds of times for all the packages in getInstalledPackages
or similar.

This also saves the base app data directories for the system user,
or user 0, interning the strings since they're shared across
packages with the same volume UUID. A better solution would
cache these paths during boot scan and re-use the strings directly
rather than re-building and relying on interning, but there was
no good mechanism for that.

This decreases string append computation time and compromises
between persistent memory and performance.

This also compacts boolean fields into a bitset, decreasing
the amount persisted in both the object memory and the Parcelable
output.

In combination these changes result in a net decrease in memory
usage, although the difference is neglible, on the order of
~4KB for 181 packages or ~22B a package. The increase in speed is
roughly 2/3rds saved off the total time of generateWithComponents.

An important note is that hideAsParsed/hideAsFinal are now
required to be called because they now calculate the derived
fields to be cached.

Bug: 153656459

Test: atest CrossProfileAppsServiceImplRoboTest
Test: atest PackageManagerComponentLabelIconOverrideTest
Test: atest PackageParserTest
Test: atest UserSystemPackageInstallerTest
Test: atest DexoptUtilsTest
Test: atest com.android.server.pm.parsing
Test: atest PackageInfoUserFieldsTest
Test: atest com.android.server.pm.ScanTests
Test: atest android.content.pm.cts.PackageManagerTest

Change-Id: I977edb9dec720893ccb1ce5b9df33733c408d3c1
2020-09-14 15:06:41 -07:00
Jing Ji
157550849f Track the child processes that are forked by app processes
Apps could use Runtime.exec() to spawn child process and framework
will have no idea about its lifecycle. Now track those processes
whenever we find them - currently during the cpu stats sampling
they could be spotted. If it's consuming too much CPU while its
parent app process are also in the background, kill it.

By default we allow up to 32 such processes; the process with the
worst oom adj score of their parents will be killed if there are
too many of them.

Bug: 160548789
Bug: 157089413
Test: atest AppChildProcessTest
Test: atest CtsAppTestCases:ActivityManagerTest
Change-Id: I95b20a1f36ccd43d09027201d14872305b169d8d
2020-09-14 10:39:06 -07:00
Jeff Sharkey
c208099506 Remove advisory registerNativeAllocation().
After consulting with the ART team, we learned that sending them
detailed advisory native allocation sizes isn't as useful when the
overall lifecycle of the object is tightly managed, which is the
case with Parcel objects.  (Because Parcel users use explicit
obtain() and recycle() methods, any variable-sized native
allocations have already been freed by the time a Parcel instance
is considered for GC.)

The Parcel benchmarks referenced below are showing a uniform ~3%
performance improvement across 1, 4, and 16 thread cases.  Note that
this is in addition to the improvements recently made with the shift
to a linked-list pooling design.

Bug: 165032569
Test: ./frameworks/base/libs/hwui/tests/scripts/prep_generic.sh little && atest CorePerfTests:android.os.ParcelObtainPerfTest
Change-Id: Id0ce9b3bff1d0ffb426a9f105c7a54eb00060f85
2020-09-11 11:18:30 -06:00
Bradley Allen
86ae8e29b6 Merge "docs: Added links to the Android 11 summary pages on developer.android.com." into rvc-dev am: 5d7be413bc am: 7fad6c94d6 am: 86b4867913 am: 9920ad38f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12548368

Change-Id: Ieeeb630b72f3b809620a4520dce09412f1a396e9
2020-09-10 17:59:25 +00:00
Bradley Allen
9920ad38f6 Merge "docs: Added links to the Android 11 summary pages on developer.android.com." into rvc-dev am: 5d7be413bc am: 7fad6c94d6 am: 86b4867913
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12548368

Change-Id: I18cf6a43e0e89bc6d8a0833fa797f6f39fabc153
2020-09-10 16:23:56 +00:00
Bradley Allen
86b4867913 Merge "docs: Added links to the Android 11 summary pages on developer.android.com." into rvc-dev am: 5d7be413bc am: 7fad6c94d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12548368

Change-Id: I5c439afb2294cbae80660178dce46d4f2cd3300a
2020-09-10 16:02:36 +00:00
Bradley Allen
7fad6c94d6 Merge "docs: Added links to the Android 11 summary pages on developer.android.com." into rvc-dev am: 5d7be413bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12548368

Change-Id: Ib44d0aee6a87a79dcc668337c945d67678e4c43d
2020-09-10 15:51:51 +00:00
Bradley Allen
5d7be413bc Merge "docs: Added links to the Android 11 summary pages on developer.android.com." into rvc-dev 2020-09-10 15:23:01 +00:00
Martijn Coenen
cf38e32ef4 Merge "Don't kill for REQUEST_INSTALL_PACKAGES on default/error mode transition." into rvc-qpr-dev am: f902374308
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12419090

Change-Id: If07ef71f7c175c32096631eb9aea1f00636a1713
2020-09-10 10:49:11 +00:00
Martijn Coenen
f902374308 Merge "Don't kill for REQUEST_INSTALL_PACKAGES on default/error mode transition." into rvc-qpr-dev 2020-09-10 10:21:49 +00:00
Martijn Coenen
decc8a2353 Merge "Don't kill for REQUEST_INSTALL_PACKAGES on default/error mode transition." 2020-09-10 07:38:55 +00:00
Seigo Nonaka
f192ef78ae Accept repeated locale as an input of LocaleList construction. am: 41b1674f77 am: 8b4cd9aef3 am: c0b541b0ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540040

Change-Id: I1d7f2cf3d005534c841e16d46fdd5096ef5047e0
2020-09-09 21:29:29 +00:00
Seigo Nonaka
c0b541b0ec Accept repeated locale as an input of LocaleList construction. am: 41b1674f77 am: 8b4cd9aef3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540040

Change-Id: If6140b007349d0c4be79c98acc816c9de3c55e61
2020-09-09 20:57:20 +00:00
Seigo Nonaka
8b4cd9aef3 Accept repeated locale as an input of LocaleList construction. am: 41b1674f77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540040

Change-Id: I69509d7ddadb1787f56ce31f0ff2fb617537b2ce
2020-09-09 20:33:10 +00:00
TreeHugger Robot
6e480c0dde Merge "Accept repeated locale as an input of LocaleList construction." into rvc-qpr-dev am: b303b8eae1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540550

Change-Id: I3283505c572d270a2a7b50e4fa83f747ab3d09cd
2020-09-09 20:19:08 +00:00
Bradley Allen
cefc89c911 docs: Added links to the Android 11 summary pages on developer.android.com.
Test: http://go/forrest-run/L06800000688439076
Bug: 163618180
Change-Id: Ibe136020df4ef60183f3726fc0f6336b58c37f99
2020-09-09 17:41:07 +00:00
Seigo Nonaka
373ac57b2d Accept repeated locale as an input of LocaleList construction.
Repeated locale has not been accepted and IllegalArgumentException
is thrown. Instead of throwing exception, dropping repeated locale
instead.

Bug: 152410253
Test: atest LocaleListTest
Change-Id: I80f243678ac3024eaeb0349f770cff897df7f332
2020-09-08 22:35:39 +00:00
Seigo Nonaka
41b1674f77 Accept repeated locale as an input of LocaleList construction.
Repeated locale has not been accepted and IllegalArgumentException
is thrown. Instead of throwing exception, dropping repeated locale
instead.

Bug: 152410253
Test: atest LocaleListTest
Change-Id: I80f243678ac3024eaeb0349f770cff897df7f332
2020-09-08 20:22:48 +00:00
Treehugger Robot
3284f1c75f Merge "android.os.Binder: remove unused getFinalizer" am: c59758ab41 am: e98c205ba8 am: 4d279afec1 am: 402ef20f46 am: f5d56737ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418956

Change-Id: I4cf1ecd318ea03823763d047a08f57539607f7fa
2020-09-08 17:13:07 +00:00
Treehugger Robot
f5d56737ea Merge "android.os.Binder: remove unused getFinalizer" am: c59758ab41 am: e98c205ba8 am: 4d279afec1 am: 402ef20f46
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418956

Change-Id: If247aae8c28671f63f0101cc96f1443b56173dee
2020-09-08 17:06:18 +00:00
Treehugger Robot
402ef20f46 Merge "android.os.Binder: remove unused getFinalizer" am: c59758ab41 am: e98c205ba8 am: 4d279afec1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418956

Change-Id: I1ea049a26712a8db06dd3f3c9bbaee7884ec5c30
2020-09-08 16:48:11 +00:00
Treehugger Robot
4d279afec1 Merge "android.os.Binder: remove unused getFinalizer" am: c59758ab41 am: e98c205ba8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418956

Change-Id: Ia3996b2e60afdb8944b431501ee90e3c1997b8c2
2020-09-08 16:22:14 +00:00
Treehugger Robot
e98c205ba8 Merge "android.os.Binder: remove unused getFinalizer" am: c59758ab41
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418956

Change-Id: Ia8f7da7e819eaa5080412efe86b7c9d96bb7b971
2020-09-08 15:45:15 +00:00
Treehugger Robot
c59758ab41 Merge "android.os.Binder: remove unused getFinalizer" 2020-09-08 15:26:56 +00:00
Martijn Coenen
27c52fcaa8 Don't kill for REQUEST_INSTALL_PACKAGES on default/error mode
transition.

When handling unknown sources, PackageManager transitions from
MODE_DEFAULT to MODE_ERRORED, causing us to kill the app before the user
has even decided whether to allow external sources or not.

Since MODE_DEFAULT and MODE_ERRORED are the same from a storage point of
view, ignore transitions between the two.

This required some AppOps changes to store the previous mode and pass it
in.

Bug: 162849988
Test: run Epic installer
Change-Id: Ic866216f877e9b727fe70556f66dd998966fe0a2
Merged-In: Ic866216f877e9b727fe70556f66dd998966fe0a2
2020-09-08 14:23:31 +00:00
Martijn Coenen
e9e278f670 Don't kill for REQUEST_INSTALL_PACKAGES on default/error mode transition.
When handling unknown sources, PackageManager transitions from
MODE_DEFAULT to MODE_ERRORED, causing us to kill the app before the user
has even decided whether to allow external sources or not.

Since MODE_DEFAULT and MODE_ERRORED are the same from a storage point of
view, ignore transitions between the two.

This required some AppOps changes to store the previous mode and pass it
in.

Bug: 162849988
Test: run Epic installer
Change-Id: Ic866216f877e9b727fe70556f66dd998966fe0a2
2020-09-08 16:21:51 +02:00
Steven Moreland
2e4e636f87 android.os.Binder: remove unused getFinalizer
This native method is unimplemented, and it is never called.

Bug: N/A
Test: N/A
Change-Id: I6da9da9dc47051bd7d1591a8e88272739e06cf4c
2020-09-04 00:30:55 +00:00
TreeHugger Robot
8317be2bbf Merge "Accept repeated locale as an input of LocaleList construction." 2020-09-03 22:17:48 +00:00
Seigo Nonaka
fc8c211b43 Accept repeated locale as an input of LocaleList construction.
Repeated locale has not been accepted and IllegalArgumentException
is thrown. Instead of throwing exception, dropping repeated locale
instead.

Bug: 152410253
Test: atest LocaleListTest
Change-Id: I80f243678ac3024eaeb0349f770cff897df7f332
2020-09-03 00:16:27 -07:00
Xin Li
c8c8e8e8be Merge RP1A.200720.011
Bug: 167588565
Merged-In: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Change-Id: Ia8f5f008bc1f77115b644ab996aedc892fab68e7
2020-09-02 12:34:37 -07:00
Fiona Campbell
68b9085b28 Remove TODO
This todo doesn't need to happen since we're keeping both the int and float values for backwards compatibility.

Bug: 160141704
Test: manual
Change-Id: I26a5057acd7604578f3021c21a1412d6c1b7b0d6
2020-09-02 18:05:42 +01:00
Yo Chiang
309f789948 Merge "Check error status after installing each DSU partition" am: fbd85db85d am: 73d5afb2cb am: dbe6d55157 am: 9b2f226473 am: 52a88df94a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404669

Change-Id: I0b3f8dcbdfe4bf4451bb38d734aa423f489187d4
2020-09-02 06:25:57 +00:00
Yo Chiang
52a88df94a Merge "Check error status after installing each DSU partition" am: fbd85db85d am: 73d5afb2cb am: dbe6d55157 am: 9b2f226473
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404669

Change-Id: I43354358dacaf1b5f39cffab1717cef9774e7d18
2020-09-02 06:16:09 +00:00
Yo Chiang
9b2f226473 Merge "Check error status after installing each DSU partition" am: fbd85db85d am: 73d5afb2cb am: dbe6d55157
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404669

Change-Id: I06c9dc97b6cf55884718357cdf3b0e03af583ba6
2020-09-02 05:59:24 +00:00
Yo Chiang
dbe6d55157 Merge "Check error status after installing each DSU partition" am: fbd85db85d am: 73d5afb2cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404669

Change-Id: Ife736c00f9491d3d4768a8d36833b7e6d34ab63f
2020-09-02 05:40:55 +00:00
Yo Chiang
73d5afb2cb Merge "Check error status after installing each DSU partition" am: fbd85db85d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404669

Change-Id: I1ebc08ebf05815ea17c8bbdca5cb745fa3aca40f
2020-09-02 04:10:14 +00:00
Xin Li
628590d7ec Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07:00
Marco Ballesio
bf61b8c858 Merge changes from topic "cgroup v2 freezer frameworks" into rvc-qpr-dev am: 7176835583
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12392113

Change-Id: I2f87b8c3fb60848bf8e9266116ddccbf0eb68f30
2020-08-28 18:16:01 +00:00
Marco Ballesio
b3cd567ab3 freezer: switch to cgroup v2 freezer am: 6ca459dc17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12392112

Change-Id: Ic980cd9dd6dbaf94b69c428615cccd58dc9c6885
2020-08-28 18:15:52 +00:00
Marco Ballesio
12f3e8d6d4 freezer: reentrant enable/disable method
the app freezer state can be toggled in multiple situations when a
debugging tool like heapdump is invoked, or when system_server dumps its
binder connections. All these uses are potentially concurrent and a
robust method to handle reentrancy is necessary to avoid leaving the
freezer in a state incompatible with a specific operation.

This patch moves freezer enable and disable operations from Process to
CachedAppOptimizer (ActivityManager), introduces a new ActivityManager API
to centralize all freezer state changes to ActivityManager and modifies
client code accordingly.

Bug: 151225245
Test: manually verified that no regression are introduced on freezer
behavior, verified that concurrent behavior is handled properly

Change-Id: I7d588cc6e0499012dce64ed4e42ff2adb336062d
Merged-In: I7d588cc6e0499012dce64ed4e42ff2adb336062d
2020-08-27 16:05:57 -07:00
Marco Ballesio
6ca459dc17 freezer: switch to cgroup v2 freezer
cgroup v2 freezer has a single hierarchy and is mounted under
/sys/fs/cgroup. Proper v2 freezer support in a system can be checked by
verifying that the file "cgroup.freeze" is present in a freezer subgroup.

Bug: 154548692
Test: manually verified that processes are frozen and unfrozen

Change-Id: Ib966a957490ec986eb14aba6492832c96e147896
Merged-In: Ib966a957490ec986eb14aba6492832c96e147896
2020-08-27 16:05:41 -07:00
Marco Ballesio
db203fcabf freezer: reentrant enable/disable method
the app freezer state can be toggled in multiple situations when a
debugging tool like heapdump is invoked, or when system_server dumps its
binder connections. All these uses are potentially concurrent and a
robust method to handle reentrancy is necessary to avoid leaving the
freezer in a state incompatible with a specific operation.

This patch moves freezer enable and disable operations from Process to
CachedAppOptimizer (ActivityManager), introduces a new ActivityManager API
to centralize all freezer state changes to ActivityManager and modifies
client code accordingly.

Bug: 151225245
Test: manually verified that no regression are introduced on freezer
behavior, verified that concurrent behavior is handled properly

Change-Id: I7d588cc6e0499012dce64ed4e42ff2adb336062d
2020-08-27 15:56:51 -07:00
Marco Ballesio
37ae22f321 freezer: switch to cgroup v2 freezer
cgroup v2 freezer has a single hierarchy and is mounted under
/sys/fs/cgroup. Proper v2 freezer support in a system can be checked by
verifying that the file "cgroup.freeze" is present in a freezer subgroup.

Bug: 154548692
Test: manually verified that processes are frozen and unfrozen

Change-Id: Ib966a957490ec986eb14aba6492832c96e147896
2020-08-27 15:45:11 -07:00
Alex Buynytskyy
9f36df9948 Merge "Wait for APK to be fully downloaded for full APK digests." 2020-08-27 20:07:34 +00:00
Alex Buynytskyy
bc0a7e6cbf Wait for APK to be fully downloaded for full APK digests.
Bug: 160605420
Test: atest ChecksumsTest
Change-Id: Ib9fd591c67290786268b6dcdc57c7db153612e01
2020-08-27 10:33:46 -07:00
Colin Cross
082aec6c84 Revert "Snap for 6793014 from bbbccc3c2b7fc7c5780f6c415c4223e1d0..."
Revert "Snap for 6793014 from 44725f06b7f7d6407b5ee82d989bdd6c7a..."

Revert "Snap for 6793014 from f22ad3164937a8f2e309965c102b6366d5..."

Revert "Snap for 6793014 from 11467102abddb6026aaa164c1361439c2d..."

Revert "Snap for 6793014 from 265280bf5cb4bc14e132c3a35ae5f7ae65..."

Revert "Snap for 6793014 from f2989f9c65556d5155dbd57f82f0c93a16..."

Revert "Snap for 6793014 from 8b8bf0a07b0521bbe8483fbbab1222ffd6..."

Revert "Snap for 6793014 from 3777d883a3857b1a1589181c436d9018d7..."

Revert "Snap for 6793014 from 3157b4ee4325286f0c2ab0f26528460c8b..."

Revert "Snap for 6793014 from a43295d1825da62af038d345a7a861ed7a..."

Revert "Snap for 6793014 from 2076be4d27078d6ebc0a6b5e5ceb386109..."

Revert "Snap for 6793014 from d0e31526c62b2aeb35c293ac96feb180fc..."

Revert "Snap for 6793014 from 7a3a8c6351d5167a6ae0b33bc376efabd2..."

Revert "Snap for 6793014 from 41471cb21bb16b5c3bcc92f84293b79684..."

Revert "Snap for 6793014 from 42e5cca3cfb829690c9d8c6aca57a8e7d5..."

Revert "Snap for 6793014 from 4f81304963d19f4511b1e8e7d0aad87a67..."

Revert "Snap for 6793014 from 07602cdacf5bcc835db41f7eaa24af9964..."

Revert "Snap for 6793014 from 14cb57e107a3abce8b14937b1f92c28d18..."

Revert "Snap for 6793014 from ab1e4a81d09a540a5f927059e5bc03a606..."

Revert "Snap for 6793014 from 8c65adad0bcdfb3acc561063b4048dca24..."

Revert "Snap for 6793014 from b3061942700265e2bf04af9997775dcbbb..."

Revert "Snap for 6793014 from 551c5953fc62e339e4ee884ec2cd0ac3be..."

Revert "Snap for 6793014 from 4919273b2ac5c6347a18e17c5ec70d8da6..."

Revert "Snap for 6793014 from 988d4244914e0c749655e8cb6db18ba44f..."

Revert submission 12465146-release-request-6b259cbc-1f45-4b05-bc7e-c9b893b79d68-for-git_main-busytown-release-6793014

Reason for revert: b/166531456
Reverted Changes:
I5ff7a6c0d:Snap for 6793014 from f2989f9c65556d5155dbd57f82f0...
I77bdff943:Snap for 6793014 from a43295d1825da62af038d345a7a8...
I2ac5c520a:Snap for 6793014 from c3f124cca05579acf0a6cb589ebd...
I023b9702f:Snap for 6793014 from 98756d6d3e2bb0ba28eb125caa7a...
Ibc7893d72:Snap for 6793014 from fd1ad6750ef332d3f50f218f4d5d...
Ic27847bee:Snap for 6793014 from 8c65adad0bcdfb3acc561063b404...
If20bc9352:Snap for 6793014 from 7a3a8c6351d5167a6ae0b33bc376...
I6542d17e8:Snap for 6793014 from 3777d883a3857b1a1589181c436d...
I66e6bb8a9:Snap for 6793014 from 8b8bf0a07b0521bbe8483fbbab12...
I3cd190b6b:Snap for 6793014 from 424180bdc4aa18249e678daebfd0...
If92db7402:Snap for 6793014 from ab1e4a81d09a540a5f927059e5bc...
Iaced03c87:Snap for 6793014 from d0e31526c62b2aeb35c293ac96fe...
I5d28c6b4b:Snap for 6793014 from 4f81304963d19f4511b1e8e7d0aa...
I30d07bea3:Snap for 6793014 from 7594ec6384c4da320726def34f47...
I473205f48:Snap for 6793014 from 551c5953fc62e339e4ee884ec2cd...
I0656b41af:Snap for 6793014 from 44725f06b7f7d6407b5ee82d989b...
I0f9796067:Snap for 6793014 from 4919273b2ac5c6347a18e17c5ec7...
I9a38cda8f:Snap for 6793014 from 2076be4d27078d6ebc0a6b5e5ceb...
I876a82f51:Snap for 6793014 from 11467102abddb6026aaa164c1361...
I749d7d023:Snap for 6793014 from 41471cb21bb16b5c3bcc92f84293...
I038daea41:Snap for 6793014 from 07602cdacf5bcc835db41f7eaa24...
I47aa3131c:Snap for 6793014 from 14cb57e107a3abce8b14937b1f92...
I32dba8a95:Snap for 6793014 from 3157b4ee4325286f0c2ab0f26528...
I2ebc9f9db:Snap for 6793014 from 988d4244914e0c749655e8cb6db1...
Iae7c3370f:Snap for 6793014 from 9ffb8852294e06e2d387dc1fb868...
I6467a7f1b:Snap for 6793014 from 42e5cca3cfb829690c9d8c6aca57...
I8c6375203:Snap for 6793014 from b3061942700265e2bf04af999777...
I843b2e1f3:Snap for 6793014 from 265280bf5cb4bc14e132c3a35ae5...
Ie254f7079:Snap for 6793014 from f22ad3164937a8f2e309965c102b...
I01e0974ed:Snap for 6793014 from bbbccc3c2b7fc7c5780f6c415c42...

Change-Id: I9160aa1ae5523d8e92c618ae1922576bb70a7ac8
2020-08-27 04:12:26 +00:00
TreeHugger Robot
316b514902 Merge "Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()" 2020-08-26 05:37:22 +00:00