Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
891,995 Commits 3 Branches 0 Tags
00a7e67eaf142bdc65e30b981c2fd3ef3abfb0ce
Commit Graph

891995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2ce35b4609 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 907a6c4031 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ie6cf377351454e643e996bb2027e42387924f6ee
 2023-05-10 14:30:57 +00:00
Bill Yi
3818287b99 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7d46b53aa2 
Blank merge reason: commit message contains skip directive

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

Change-Id: I4af0648263ded438d02a780a9ad829ad495fbb67
 2023-05-10 14:30:09 +00:00
Bill Yi
98c8ef883d [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 289088bede 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ieb6c938957880da3a3e0c3bce49c545aeea47c5a
 2023-05-10 14:29:51 +00:00
Bill Yi
d331d6a379 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 55ff1d49bd 
Blank merge reason: commit message contains skip directive

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

Change-Id: I2a1c5fed8e9f93c7b04b27293859721aef52aeb6
 2023-05-10 14:29:41 +00:00
Josh Hou
ff87f9e88a Merge "[Panlingual] Add the doc link and remove TODO description" into udc-dev 2023-05-10 14:27:35 +00:00
Fabian Kozynski
a65f509f4d Avoid onDestroy content in test 
Even though `Activity.finish` is called by the @Rule before the teardown
happens, `onDestroy` may not be called synchronously and therefore may
happen after mocks have been nulled.

To prevent NPE, do not call `BroadcastDispatcher.unregisterReceiver` in
the test.

Test: atest com.android.systemui.controls
Fixes: 280020640
Change-Id: I992befeac6588116da03ed7869730f5b14b4e091
 2023-05-10 14:25:30 +00:00
Ján Sebechlebský
b6d79eaa3a Merge "Remove BinderDeathRecipient from virtual sensor binder token" into udc-dev am: 1c3a7005fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23101939

Change-Id: Icf0ef2a3ffc5ab2232d99af7622f57fbf47df8ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 14:20:33 +00:00
Jeff DeCew
9041fd6a8b Revert "Remove NOTIFICATION_INLINE_REPLY_ANIMATION flag" 
Also turn the flag off, since the animation may be the source of the problem.

This reverts commit 8423cd9624.

Reason for revert: b/271723067

Change-Id: I3c4168bddaabfcc21594a223e139fd8dae622567
 2023-05-10 14:20:04 +00:00
Ján Sebechlebský
1c3a7005fa Merge "Remove BinderDeathRecipient from virtual sensor binder token" into udc-dev 2023-05-10 14:09:15 +00:00
Ioana Alexandru
37c26f5dca [automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev am: d402a8dd75 -s ours am: 7e10a4e650 -s ours am: c2d4e9d887 -s ours am: 52cac04fae -s ours am: 7c01c09176 -s ours am: 54ed87882c -s ours am: 269d80ff56 -s ours am: 04590dd32d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I485a72d41fa5f07e550cd96b7ce6a68f4463329a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 14:02:02 +00:00
Abhijit Adsule
128d3046ec [automerger skipped] DO NOT MERGE am: a31fad611d -s ours am: e17cff534e -s ours am: 1e97b93ba9 -s ours am: 4389f50f86 -s ours am: a48caa922b -s ours am: df0ca773b4 -s ours am: b621d180e6 -s ours am: 77d868d466 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ce2d1e03ab7f161ca57a9de0548680a9f4bace0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 14:02:00 +00:00
Abhijit Adsule
4c1bbdf03d [automerger skipped] DO NOT MERGE am: e10cae158a -s ours am: 0010edd0a5 -s ours am: d6b38d88b9 -s ours am: 4e0c1a9f71 -s ours am: 683c98591a -s ours am: f32c9d01e9 -s ours am: ce17e9688b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5b977001aa0f0f55bdb7c0c88ff10edf37b90b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 14:01:48 +00:00
Ioana Alexandru
ba12216262 [automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev am: d402a8dd75 -s ours am: 7e10a4e650 -s ours am: c2d4e9d887 -s ours am: 52cac04fae -s ours am: 7c01c09176 -s ours am: 54ed87882c -s ours am: 5ba562eee5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e0be28789d26659d053ebdf48ad54681323f0cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 14:01:31 +00:00
Treehugger Robot
80019aa389 Merge "Ready more build rules for dir move" into udc-dev am: 9d7cd379a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23128351

Change-Id: I0d38024649bdd1c76a3f951d1828fe68380394ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 14:01:28 +00:00
Abhijit Adsule
d2046a7b3d [automerger skipped] DO NOT MERGE am: a31fad611d -s ours am: e17cff534e -s ours am: 1e97b93ba9 -s ours am: 4389f50f86 -s ours am: a48caa922b -s ours am: df0ca773b4 -s ours am: b67a78e0a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8474ad6d2f37a63b331be234240df5d6d074f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 14:01:27 +00:00
Abhijit Adsule
5015e68e9f [automerger skipped] DO NOT MERGE am: e10cae158a -s ours am: 0010edd0a5 -s ours am: d6b38d88b9 -s ours am: 4e0c1a9f71 -s ours am: 683c98591a -s ours am: abdc1e75e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb716447cc20494c2fe3154b3e0db0e1a083af1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 14:01:13 +00:00
Ioana Alexandru
04590dd32d [automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev am: d402a8dd75 -s ours am: 7e10a4e650 -s ours am: c2d4e9d887 -s ours am: 52cac04fae -s ours am: 7c01c09176 -s ours am: 54ed87882c -s ours am: 269d80ff56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id83657f47c095b7307872769a1fa1b007687c45b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:59:13 +00:00
Abhijit Adsule
77d868d466 [automerger skipped] DO NOT MERGE am: a31fad611d -s ours am: e17cff534e -s ours am: 1e97b93ba9 -s ours am: 4389f50f86 -s ours am: a48caa922b -s ours am: df0ca773b4 -s ours am: b621d180e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife78d5e499c118fa1be95d868588711561c878d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:58:58 +00:00
Abhijit Adsule
ce17e9688b [automerger skipped] DO NOT MERGE am: e10cae158a -s ours am: 0010edd0a5 -s ours am: d6b38d88b9 -s ours am: 4e0c1a9f71 -s ours am: 683c98591a -s ours am: f32c9d01e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac39e62227daf16b4e79062c40b12b5a0ca0f687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:58:35 +00:00
Michael Mikhail
f2142c8067 Verify URI permissions in MediaMetadata 
Add a check for URI permission to make sure that user can access the URI
set in MediaMetadata. If permission is denied, clear the URI string set
in metadata.

Bug: 271851153
Test: atest MediaSessionTest
Test: Verified by POC app attached in bug, image of second user is not
the UMO background of the first user.

Change-Id: I384f8e230c909d8fc8e5f147e2fd3558fec44626
 2023-05-10 13:49:57 +00:00
Treehugger Robot
9d7cd379a1 Merge "Ready more build rules for dir move" into udc-dev 2023-05-10 13:48:36 +00:00
Yan Han
091b2e2e90 Rename "Absolute Volume Control" to "absolute volume behavior" 
Currently, the CEC framework uses "Absolute Volume Control" to refer to
the state where both of the following are true:
1. The System Audio device supports the <Set Audio Volume Level> message
   (that is, it supports the CEC "Absolute Volume Control" feature)
2. The HDMI audio output device in AudioService uses "absolute volume
   behavior"

This state is currently named for (1); this CL changes it to be named
for (2).

This is because we plan to reuse the code path for enabling this state
for a new state, where (1) is not true: the System Audio device need
not support <Set Audio Volume Level>/"Absolute Volume Control".

In this new case, (2) will still be true, as  the audio output device
will use a variant of absolute volume behavior - adjust-only absolute
volume behavior.

Bug: 240663266
Test: make

Change-Id: I679d5c1e74a1bfd8dcfe9246410ccb3089a5c5ac
 2023-05-10 15:44:24 +02:00
Yan Han
39d2938341 Fix system server crash on receiving <Report Audio Status> 
This crash occurs when enabling absolute volume behavior, when
we receive <Report Audio Status> with an out-of-bounds volume level.
This is parsed as a negative error code, which causes
HdmiControlService to attempt to construct a VolumeInfo with a
negative volume. This throws an IllegalArgumentException.

To fix this, we ignore <Report Audio Status> messages with out-of-bounds
volume levels. To help prevent future issues, we also enforce that the
AudioStatus object can only represent volume levels in the [0, 100]
range.

Bug: 281821462
Test: atest TvToAudioSystemAvcTest PlaybackDeviceToTvAvcTest
PlaybackDeviceToAudioSystemAvcTest

Change-Id: I31dc0fd58da511262d829a10f7f03a4f0c99c05d
 2023-05-10 15:43:49 +02:00
Jigar Thakkar
94753d2499 Merge "Add separate category header string for clone accounts" into udc-dev am: db2f94de76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22575267

Change-Id: I5b943781f68e3a1e3e73aa8f8a5769b484fd366e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:40:45 +00:00
Treehugger Robot
202d599cfb Merge "Prepare to log post_duration_millis to statsd" into udc-dev am: d6c040c7b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23114956

Change-Id: Ib24d42cac6b10ead4e5685b7094e4311655cd1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:39:07 +00:00
Jigar Thakkar
db2f94de76 Merge "Add separate category header string for clone accounts" into udc-dev 2023-05-10 13:38:59 +00:00
Suprabh Shukla
6531a739ab Count modifications to user's power allowlist 
Log a counter everytime an app is put into or taken out of the power
allowlist. In normal conditions, this is only expected to happen when
the user toggles this in Settings, so should be relatively rare.

Test: N/A

Bug: 263411625
Change-Id: Ie0d79d66cf2b480e8d94c7d6b1567d7785cde7be
 2023-05-10 06:33:48 -07:00
Treehugger Robot
d6c040c7b2 Merge "Prepare to log post_duration_millis to statsd" into udc-dev 2023-05-10 13:25:07 +00:00
Vlad Popa
1e8854edfe Merge "CSD: clean up sound dose test API" into udc-dev am: 31ee265e84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23131176

Change-Id: Ifdb9a0ddfda61d883e08c98708b90b1adc6b16ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:22:49 +00:00
Anton Potapov
a5c233bd4c Merge "Use a separated Configuration instance to save the last state" into udc-dev am: 6a1a88246a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23101545

Change-Id: I0db9394a959976c2b9e993530a9db479b38e0799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:20:22 +00:00
Massimo Carli
e3e986ee57 [automerger skipped] Merge "Improve first opaque activity candidate detection" into tm-qpr-dev am: 8f8baa7437 -s ours am: a6280f7b3c -s ours 
am skip reason: Merged-In I62e829555c43136080ee4909f7dcf8c388165e9f with SHA-1 63ce4e5f79 is already in history

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

Change-Id: I71803dd4e8181c0fe577f7a20c36197edb82eb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:19:59 +00:00
Massimo Carli
8254561dd1 [automerger skipped] Improve first opaque activity candidate detection am: bcf680d064 -s ours am: c32264dab1 -s ours 
am skip reason: Merged-In I62e829555c43136080ee4909f7dcf8c388165e9f with SHA-1 63ce4e5f79 is already in history

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

Change-Id: I654332959471e814c2dc630193c91b7585395995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:19:55 +00:00
Ioana Alexandru
5ba562eee5 [automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev am: d402a8dd75 -s ours am: 7e10a4e650 -s ours am: c2d4e9d887 -s ours am: 52cac04fae -s ours am: 7c01c09176 -s ours am: 54ed87882c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d4f7c46f4f47ca0b415671475d865b2706c04ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:19:19 +00:00
Abhijit Adsule
b67a78e0a0 [automerger skipped] DO NOT MERGE am: a31fad611d -s ours am: e17cff534e -s ours am: 1e97b93ba9 -s ours am: 4389f50f86 -s ours am: a48caa922b -s ours am: df0ca773b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I659404bfc3b6f457d9c7f8712484211cf8062fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:19:16 +00:00
Abhijit Adsule
abdc1e75e8 [automerger skipped] DO NOT MERGE am: e10cae158a -s ours am: 0010edd0a5 -s ours am: d6b38d88b9 -s ours am: 4e0c1a9f71 -s ours am: 683c98591a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3785c6892a420f0cca94c1db4985560d78735dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:19:06 +00:00
Ioana Alexandru
269d80ff56 [automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev am: d402a8dd75 -s ours am: 7e10a4e650 -s ours am: c2d4e9d887 -s ours am: 52cac04fae -s ours am: 7c01c09176 -s ours am: 54ed87882c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83c0d9fa8f120bbc0f9015a10534bcab3aa3a7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:18:18 +00:00
Abhijit Adsule
b621d180e6 [automerger skipped] DO NOT MERGE am: a31fad611d -s ours am: e17cff534e -s ours am: 1e97b93ba9 -s ours am: 4389f50f86 -s ours am: a48caa922b -s ours am: df0ca773b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1551a09b1a8c84b4d9ff01134d6a6664bcdbde7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:18:15 +00:00
Abhijit Adsule
f32c9d01e9 [automerger skipped] DO NOT MERGE am: e10cae158a -s ours am: 0010edd0a5 -s ours am: d6b38d88b9 -s ours am: 4e0c1a9f71 -s ours am: 683c98591a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37ca6187fb2d08d9ee71d71e1bf64cff53d5edf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:18:02 +00:00
Ioana Alexandru
2f66b7da2a Verify URI permissions for notification shortcutIcon. 
Bug: 277593270
Change-Id: I1efaa1301bca36895ad4322a919d7421156a60df
Test: atest NotificationManagerServiceTest
Merged-In: Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1
 2023-05-10 13:00:42 +00:00
Ioana Alexandru
47e661cbf3 Verify URI permissions for notification shortcutIcon. 
Bug: 277593270
Change-Id: I1efaa1301bca36895ad4322a919d7421156a60df
Test: atest NotificationManagerServiceTest
Merged-In: Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1
 2023-05-10 13:00:31 +00:00
Vlad Popa
31ee265e84 Merge "CSD: clean up sound dose test API" into udc-dev 2023-05-10 12:53:41 +00:00
Anton Potapov
6a1a88246a Merge "Use a separated Configuration instance to save the last state" into udc-dev 2023-05-10 12:39:50 +00:00
Massimo Carli
a6280f7b3c [automerger skipped] Merge "Improve first opaque activity candidate detection" into tm-qpr-dev am: 8f8baa7437 -s ours 
am skip reason: Merged-In I62e829555c43136080ee4909f7dcf8c388165e9f with SHA-1 63ce4e5f79 is already in history

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

Change-Id: I88ebd722d7a9056a039205be2bbaead842c2db70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 12:31:54 +00:00
Massimo Carli
c32264dab1 [automerger skipped] Improve first opaque activity candidate detection am: bcf680d064 -s ours 
am skip reason: Merged-In I62e829555c43136080ee4909f7dcf8c388165e9f with SHA-1 63ce4e5f79 is already in history

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

Change-Id: I34f5312a0b6061712cfae2d3987af5255f3ff9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 12:31:40 +00:00
Ioana Alexandru
54ed87882c [automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev am: d402a8dd75 -s ours am: 7e10a4e650 -s ours am: c2d4e9d887 -s ours am: 52cac04fae -s ours am: 7c01c09176 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice38ca95f70e63d48f74878097f04a2425a84439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 12:28:26 +00:00
Abhijit Adsule
df0ca773b4 [automerger skipped] DO NOT MERGE am: a31fad611d -s ours am: e17cff534e -s ours am: 1e97b93ba9 -s ours am: 4389f50f86 -s ours am: a48caa922b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8173d784b0561f4b2a532c71cd7bec93eba85731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 12:28:10 +00:00
Abhijit Adsule
683c98591a [automerger skipped] DO NOT MERGE am: e10cae158a -s ours am: 0010edd0a5 -s ours am: d6b38d88b9 -s ours am: 4e0c1a9f71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0408dd893e2562cf70c2df7e371994a444cd72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 12:27:41 +00:00
Ruslan Tkhakokhov
e3011b3e85 [DO NOT MERGE] Temporarily remove BackupRestoreEventLogger test from presubmit 
The test is failing in presubmit but is fine in postsubmit. Remove from
presubmit pending investigation.

Bug: 273295079
Test: m -j
Change-Id: I56fc17277160e5e32d1a89ea7fc959ac6d210b5b
 2023-05-10 12:18:41 +00:00
Ruslan Tkhakokhov
42d6a017a4 Merge "Pass operation type via BackupManagerMonitor#onEvent" into udc-dev am: ac8d23d973 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22892341

Change-Id: Ibae90c123a2dd81a06332d947fe933f9d6ad9b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 12:13:16 +00:00
Ruslan Tkhakokhov
9011e89b72 Merge "Clear calling identity n BackupManager#reportDelayedRestoreResult" into udc-dev am: 22480bc56b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22970017

Change-Id: I7f1e00dbda9475c4066eb0b4361012a194a6695e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 12:11:14 +00:00