653597 Commits

Author SHA1 Message Date
Treehugger Robot
6e3ea69863 Merge "Update OWNERS for Intent* and Content*" 2021-08-17 23:14:07 +00:00
Colin Cross
faa5e27652 Rename ProcResult stdout and stderr fields
stdout and stderr are macros in musl, which causes build failures
when they are used as field names.  Rename the fields to stdout_str
and stderr_str.

Test: builds
Change-Id: I04770d2d6e82ca8393308ab12a304838a80f0ae5
2021-08-17 15:01:14 -07:00
Makoto Onuki
ea8407635c Update OWNERS for Intent* and Content*
Test: Build
Change-Id: I2232342d3e68cc8e1eea14bfa999f32b15ba5789
2021-08-17 14:27:35 -07:00
Xin Li
e7449820a4 Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master 2021-08-17 18:14:29 +00:00
Treehugger Robot
c6a9f2e81c Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793485

Change-Id: I240a5b08c27aa30a5518f784dd4db8e2abb25e7c
2021-08-17 12:03:43 +00:00
Treehugger Robot
dee731ad0b Merge "Suppress AIDL warnings: untyped-collection" 2021-08-17 11:46:23 +00:00
Max Bires
c9be198afe Fixing a condition that can cause deadlock
Callbacks on ServiceConnection happen on the main UI thread for an
application. Since the thread that calls bindService then immediately
blocks to wait for the service to be connected, this will cause a
deadlock if key operations are happening on the main UI thread.

This bug has likely not been detected yet since key operations are not
supposed to be performed on the main UI thread, however it was uncovered
in a similar application during other testing. This fix ensures the
ServiceConnection object's callbacks will be triggered from a separate
thread from the calling thread.

Bug: 196571032
Test: Apps that run key operations on the UI thread don't hang.
Change-Id: I630a0ef2560a8ebd962de54c65e3d6277133a1cb
Merged-In: I630a0ef2560a8ebd962de54c65e3d6277133a1cb
2021-08-17 06:43:46 +00:00
zhuyunyi
afcd22acaa Change Shallow Copy to Deep Copy in UsageStats
There are three reference type members in UsageStats's constructor, when using "new UsageStats(stats)" to copy, it will be a Shallow Copy, which may cause concurrent modify problem.

For example, in UserUsageStatsService.java, the sUsageStatsCombiner is using "new UsageStats(stats.packageStats.valueAt(i)" to copy, and the value is passing to the computeCacheQuotaHints in
CacheQuotaStrategy.java. If we change the UsageStats.mForegroundServices at the same time, IndexOutOfBounds Exception will happen.

Therefore, it is necessary to modify the way of copying of the UsageStats.

Signed-off-by: zhuyunyi <zhuyunyi@xiaomi.com>
Change-Id: I58a54d17aad6ef5213e52658ee3387f3069339af
2021-08-17 14:10:39 +08:00
Jooyung Han
133879b683 telephony: suppress warnings in AIDL
Warnings from using untyped List/Map. For now these List/Map can't be
migrated to typed ones because AIDL List/Map doesn't support Integer as
key/value types.

Bug: 192615532
Test: m
Change-Id: If55364b4ad4dc5660871f7eef051e12ec0399a70
2021-08-17 14:36:04 +09:00
Treehugger Robot
a2ddc936eb Merge "Update OWNERS." am: bfc5088c1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796485

Change-Id: If25276da75dc6000e0020a4ee90ed177d5bae2b2
2021-08-17 04:09:55 +00:00
Treehugger Robot
bfc5088c1d Merge "Update OWNERS." 2021-08-17 03:57:07 +00:00
Joe Bolinger
2fc9e3fa0a Update OWNERS.
Test: N/A
Change-Id: I3da6e85dd944ca19ecfabfacb2e6928500ee0c49
2021-08-16 17:11:15 -07:00
Hongguang Chen
933dacacf8 Merge "Fix Quiescent Reboot Reason" am: 850866e94a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751962

Change-Id: If0cd58c17c3049597147389257f4dcfe895b1f54
2021-08-16 18:29:03 +00:00
Hongguang Chen
850866e94a Merge "Fix Quiescent Reboot Reason" 2021-08-16 18:12:18 +00:00
Jeff DeCew
1cbc573b93 Add notifications team as OWNERS of notification-related utilities and their tests
Change-Id: I153ab4e182a0843706c25f03c891a92eb48eea9c
2021-08-16 14:56:48 +00:00
Xin Li
773a9dfba7 Merge sc-dev-plus-aosp-without-vendor@7634622
Merged-In: I661f5fb6b1f3f6ce4322fab8fa84a7ab364c65b1
Change-Id: I16482b494ff4821016aabbb646e495d616c630ac
2021-08-14 07:23:27 +00:00
Treehugger Robot
f3da868dad Merge "Keystore 2.0 SPI: Fix contract between equals and hashCode" am: efc036801c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1794807

Change-Id: Id19fa4dc6ca62339315652f98a6d66f12dbff51c
2021-08-14 05:27:00 +00:00
Treehugger Robot
efc036801c Merge "Keystore 2.0 SPI: Fix contract between equals and hashCode" 2021-08-14 05:07:21 +00:00
Treehugger Robot
461ea8ce30 Merge "Allow SHELL_UID to disable Bluetooth for testing" am: 4c462beeae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796128

Change-Id: Ic2b5ce12110773fde15da68cc93457b7544a9e48
2021-08-14 01:09:59 +00:00
Treehugger Robot
4c462beeae Merge "Allow SHELL_UID to disable Bluetooth for testing" 2021-08-14 00:42:29 +00:00
Myles Watson
c4b27dfce3 Allow SHELL_UID to disable Bluetooth for testing
Bug: 189952422
Test: atest VtsHalBluetoothV1_0TargetTest
Change-Id: Id45a43b824b2be49fb38686f9582484931024187
2021-08-13 16:03:12 -07:00
Kalesh Singh
edc09109a7 PowerManagerService: Use AIDL Suspend HAL
Use the aidl suspend hal for getting suspend blocker in power manager
service.

Bug: 170260236
Test: boot; Verify no failure to get suspend service in logs
Change-Id: I338804d98fea32bf5481a335a77484c1418e1b82
Merged-In: I338804d98fea32bf5481a335a77484c1418e1b82
2021-08-13 14:49:52 +00:00
Jooyung Han
aa0551424c Merge "AIDL: use typed Map" am: 72d5595e0e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793486

Change-Id: I2757de388bfa22023c4a710c4677b04cd049efff
2021-08-12 23:24:13 +00:00
Chris Li
3b65b029c5 Merge "Fix thread safety issues;" am: a1431a8227
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1791852

Change-Id: I0a21018e46acffa35c9e337b1f39d381c98a1754
2021-08-12 23:23:56 +00:00
Jooyung Han
72d5595e0e Merge "AIDL: use typed Map" 2021-08-12 23:14:53 +00:00
Chris Li
a1431a8227 Merge "Fix thread safety issues;" 2021-08-12 23:07:32 +00:00
Janis Danisevskis
7bdc12d5f3 Keystore 2.0 SPI: Fix contract between equals and hashCode
This fixes the contract between equals and hashCode in
AndroidKeystoreKey and AndroidKeystorePublicKey.

Bug: 196118021
Test: N/A
Change-Id: I3f7e6d72d53c7051c13daeb5aa6ce1abf4eb0cc5
2021-08-12 12:29:02 -07:00
Riddle Hsu
7f2cb4c0a5 Merge "Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()" am: 99e5c70ff0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793211

Change-Id: I27e6901083d1f16c2b2bcccb77627c81592d4ceb
2021-08-12 10:03:21 +00:00
Riddle Hsu
99e5c70ff0 Merge "Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()" 2021-08-12 09:50:46 +00:00
Jooyung Han
553c027bbf AIDL: use typed Map
AIDL supports typed maps, so use it instead of untyped one.

Bug: 192615532
Test: m, TH presubmit
Change-Id: I0fedf05872cbe2025e04ca07ce6c90bc9067b331
2021-08-12 08:38:10 +00:00
Jooyung Han
fb8ebe9f44 Suppress AIDL warnings: untyped-collection
For now AIDL doesn't support Map<String,Integer>, there's no way to fix
it with typed map.

Bug: 192615532
Test: m
Change-Id: Id0011372a0997b4ab9aa700a7c4f8746bff29189
2021-08-12 17:30:32 +09:00
Ashok Mutyala
895d981852 Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()
Problem: Framework Reboot i.e., NullPointer Exception in android.ui Thread
E AndroidRuntime: FATAL EXCEPTION IN SYSTEM PROCESS: android.ui
E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method
'java.lang.Object android.content.Context.getSystemService(java.lang.String)' on a null object reference

E AndroidRuntime: **at android.app.Dialog.<init>(Dialog.java:199)
E AndroidRuntime: **at android.app.AlertDialog.<init>(AlertDialog.java:204)
E AndroidRuntime: **at android.app.AlertDialog.<init>(AlertDialog.java:200)
E AndroidRuntime: **at com.android.server.am.BaseErrorDialog.<init>(BaseErrorDialog.java:39)
E AndroidRuntime: **at com.android.server.am.AppNotRespondingDialog.<init>(AppNotRespondingDialog.java:53)
E AndroidRuntime: **at com.android.server.am.ErrorDialogController.showAnrDialogs(ErrorDialogController.java:183)
E AndroidRuntime: **at com.android.server.am.AppErrors.handleShowAnrUi(AppErrors.java:1077)

Analysis:
As Context Object is passed from showAnrDialogs method and will be retrieved from getDisplayContextWithErrorDialogs
And list of context objects will be filled by querying from RootWindowContainer.getDisplayUiContext and this method is
Annotated with Nullable. So, the possibility could be null value filled in the context object List.

Bug: 196189977
Test: Stability Test

Change-Id: Ib944fc5ffc8bcca999c75f99d462d441e555fcda
2021-08-12 04:31:18 +00:00
Nate Jiang
f46dc85e5a Merge "Remove modules-utils-build_system from filegroup" am: a4d60ac1ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1792931

Change-Id: If693bdf1ee36e6997373bb70fd390b32d7329a7e
2021-08-12 02:11:28 +00:00
Nate Jiang
a4d60ac1ee Merge "Remove modules-utils-build_system from filegroup" 2021-08-12 01:56:33 +00:00
Suren Baghdasaryan
5c822bf4ea [automerger skipped] Merge "Adding native flag namespace for lmkd." am: 1fdacf6376 am: eb10acc1cb -s ours
am skip reason: Merged-In I1f13d6bbb4a9a7fd8825d7e5acde416750271df4 with SHA-1 93c48c704a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786787

Change-Id: I661f5fb6b1f3f6ce4322fab8fa84a7ab364c65b1
2021-08-11 23:28:31 +00:00
Suren Baghdasaryan
eb10acc1cb Merge "Adding native flag namespace for lmkd." am: 1fdacf6376
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786787

Change-Id: I8d661ad5868a7df5df08e67574bcd1eda9092772
2021-08-11 23:13:07 +00:00
Suren Baghdasaryan
1fdacf6376 Merge "Adding native flag namespace for lmkd." 2021-08-11 22:56:11 +00:00
Rob Carr
ba8979c6d7 Merge "Update wallpaper offset when changing target from null" into sc-dev am: ccdb324274
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521640

Change-Id: Iedcc5f3ca75f9ffd022c14076ed05c06c874d3b4
2021-08-11 22:11:18 +00:00
Rob Carr
ccdb324274 Merge "Update wallpaper offset when changing target from null" into sc-dev 2021-08-11 21:58:32 +00:00
Makoto Onuki
a33d48c48e Merge "Clarify how FGS restriction won't apply STICKY FGS restarts" into sc-dev am: 0c1dc2fc76
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15484572

Change-Id: Ic11bfc07ac3ad19222bcc48dc7e54f46a1af6fe6
2021-08-11 21:35:25 +00:00
Makoto Onuki
0c1dc2fc76 Merge "Clarify how FGS restriction won't apply STICKY FGS restarts" into sc-dev 2021-08-11 21:17:20 +00:00
Suren Baghdasaryan
9a740a18df Adding native flag namespace for lmkd.
For experiment flag testing, adding lmkd flag in DeviceConfig.

Bug: 194316048
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I1f13d6bbb4a9a7fd8825d7e5acde416750271df4
Merged-In: I1f13d6bbb4a9a7fd8825d7e5acde416750271df4
2021-08-11 17:41:41 +00:00
Automerger Merge Worker
578d06c984 Merge "Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513d1 am: 726c374fa3" into sc-dev-plus-aosp 2021-08-11 17:39:27 +00:00
Suren Baghdasaryan
6e6a94d00b Merge "Adding native flag namespace for lmkd." into sc-dev-plus-aosp 2021-08-11 17:39:23 +00:00
Steven Moreland
df10c51e95 Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513d1 am: 726c374fa3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793027

Change-Id: I79e5443b356906fcb0787f8c286af7bb520326a1
2021-08-11 17:39:13 +00:00
John Wu
266d79d0c1 Merge "Update DynamicSystemInstallationService manifest" am: 703378f39c am: 2f6ec8e09e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793447

Change-Id: Ia3b0795a883fe21e030d82dcdac2c6a5d88fc725
2021-08-11 17:38:31 +00:00
Steven Moreland
726c374fa3 Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793027

Change-Id: I18fff5e8d3e5c7e308b218ab95450f9a10593d38
2021-08-11 17:23:15 +00:00
John Wu
2f6ec8e09e Merge "Update DynamicSystemInstallationService manifest" am: 703378f39c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793447

Change-Id: Ia2ee451b72eab5c826d7362a6e60954cb68b93f3
2021-08-11 17:22:57 +00:00
Steven Moreland
b801a513d1 Merge "ServiceManager: waitForService uses allowBlocking" 2021-08-11 17:16:42 +00:00
Steven Moreland
d247e417a2 ServiceManager: waitForService uses allowBlocking
For parity with getService and checkService.

Bug: 194806512
Test: boot
Change-Id: Iecc3f1c6d6ae9bee94252281b416d62f3bf30afd
2021-08-11 17:16:32 +00:00