TreeHugger Robot
bbc3c5458c
[automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4 am: 81d8843b6e -s ours
...
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 fbb632ea95 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452466
Change-Id: I4078b43e594103b91d8100d61bd9eda3ad52902e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:05:23 +00:00
Eric Biggers
e540487397
[automerger skipped] Ignore errors preparing user storage for existing users am: e667b60402 am: 8ea6cb03ff -s ours
...
am skip reason: Merged-In I9bdd1a4bf5b14542adb901f264a91d489115c89b with SHA-1 c785063dab is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416119
Change-Id: Ia083382a23d2aa200be7e397df06b4bb81e8859e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:05:05 +00:00
Eric Biggers
ddda347441
[automerger skipped] UserDataPreparer: reboot to recovery for system user only am: fd31f740ce am: 0d80797d8f -s ours
...
am skip reason: Merged-In Ia1db01ab4ec6b3b17d725f391c3500d92aa00f97 with SHA-1 7172fa43c3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416118
Change-Id: I2a4230bed59f4d23b79346377a8eb81cbf366c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:04:38 +00:00
TreeHugger Robot
df7e8c7203
Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4 am: 856b62f907
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452466
Change-Id: I986c3cd0cd5b52d7a57142721d44cd6734c42ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:04:37 +00:00
Eric Biggers
9d405365cf
Ignore errors preparing user storage for existing users am: e667b60402 am: 1dd78739ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416119
Change-Id: Idfec03f3f90e2e5d49bf535ac5af068c7936308b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:04:21 +00:00
Eric Biggers
aefe95dbf2
[automerger skipped] UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026ca am: 4bf1a4ac01 -s ours
...
am skip reason: Merged-In Ib5e91d2510b25780d7a161b91b5cee2f6f7a2e54 with SHA-1 5256365e65 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416117
Change-Id: I86bdda0b031607dee8418123f03e909811c15a29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:04:20 +00:00
Eric Biggers
d4f7100ba0
UserDataPreparer: reboot to recovery for system user only am: fd31f740ce am: 7abafd53c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416118
Change-Id: I8b5b985cc351e60f0d660ac9ea00062ec7749597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:04:17 +00:00
Eric Biggers
9eec832b84
UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026ca am: ad111e22f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416117
Change-Id: I1004f460c5d309007a1b771a6f771db298731be0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:04:12 +00:00
TreeHugger Robot
856b62f907
Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452466
Change-Id: Idf4042818a39723474c347afc2ade4aa5e3320e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:58:23 +00:00
Eric Biggers
1dd78739ee
Ignore errors preparing user storage for existing users am: e667b60402
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416119
Change-Id: I708ff9144a64157b9e70fe2c338d4e809dbcb0f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:58:21 +00:00
Eric Biggers
7abafd53c9
UserDataPreparer: reboot to recovery for system user only am: fd31f740ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416118
Change-Id: Ic4265d151a1992b5e0689dbdff605983e0330647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:58:19 +00:00
Eric Biggers
ad111e22f8
UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416117
Change-Id: I12c358d7642bb0a29dceee071691bc9d6350ce6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:58:11 +00:00
TreeHugger Robot
81d8843b6e
Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452466
Change-Id: I74d261c370252fac3a7a5eca76ced6bac41c678a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:57:33 +00:00
Eric Biggers
8ea6cb03ff
Ignore errors preparing user storage for existing users am: e667b60402
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416119
Change-Id: I3b2bf8689ea9bbbb9c49fad1b28f5616fccb7087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:57:27 +00:00
Eric Biggers
0d80797d8f
UserDataPreparer: reboot to recovery for system user only am: fd31f740ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416118
Change-Id: I44c51c3fb1f6ad4d0b925680d2ca0dd8312b7719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:57:20 +00:00
Eric Biggers
4bf1a4ac01
UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416117
Change-Id: I7c61136b0fc6f2c8992672c6cdd179de9f0ba639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:57:17 +00:00
Automerger Merge Worker
67a2b2a946
Merge "[automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-mainline-prod am: ff4461ae55 -s ours" into tm-dev
2022-04-20 20:56:26 +00:00
Nate Myren
1e22373816
Merge "Add defaultSearchSelector config and default grant" into tm-dev
2022-04-20 20:56:07 +00:00
TreeHugger Robot
7644b13b3c
[automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-mainline-prod am: ff4461ae55 -s ours
...
am skip reason: Merged-In I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2 with SHA-1 567e7a0476 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416116
Change-Id: I59e2ef9659b473fa2daa01852d161aae8469eab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:56:02 +00:00
Eric Biggers
0ee586deaa
[automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476 am: 63fec800ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416116
Change-Id: Ie33a08f08b63cde747a213f0d1acf69732d909eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:55:08 +00:00
SongFerng Wang
3f92b154c8
Merge "[LE_Broadcast]Start broadcast and stop broadcast" into tm-dev
2022-04-20 20:50:37 +00:00
Hans Boehm
87503f91cf
Merge "Don't preload into nonexistent zygote" am: c3a27297c4 am: 3aab9125d9 am: 80b4f59eec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067474
Change-Id: Ic146cd903313a76e93f39dace347382b5d4bb484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:36:51 +00:00
TreeHugger Robot
bc7a25dff4
Merge changes from topic "unencrypted-dirs-s" into sc-dev
...
* changes:
Log to EventLog on prepareUserStorage failure
Ignore errors preparing user storage for existing users
UserDataPreparer: reboot to recovery for system user only
UserDataPreparer: reboot to recovery if preparing user storage fails
StorageManagerService: don't ignore failures to prepare user storage
2022-04-20 20:22:16 +00:00
TreeHugger Robot
ff4461ae55
Merge changes from topic "unencrypted-dirs-s" into sc-mainline-prod
...
* changes:
[automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476
StorageManagerService: don't ignore failures to prepare user storage
2022-04-20 20:22:16 +00:00
TreeHugger Robot
d8f121a6fd
Merge changes from topic "unencrypted-dirs-s" into tm-dev
...
* changes:
[automerged blank] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476 2p: 465d717d6d
[automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476
StorageManagerService: don't ignore failures to prepare user storage
2022-04-20 20:22:16 +00:00
Hans Boehm
80b4f59eec
Merge "Don't preload into nonexistent zygote" am: c3a27297c4 am: 3aab9125d9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067474
Change-Id: Ic85395f2a2930d989bd41fb1ecc1e2c4494e4160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 20:19:33 +00:00
Song Hu
59b5e8bf29
Open dialog panel after long pressing a direct share target to allow pin/unpin the target. Communicate with ShortcutManager/Launcherapps to store pin info in ShortcutService.
...
Bug: 210453009
Test: manual test on local phone
Test: atest ChooserActivityTest
Change-Id: Ibcc83037ca801ee0ecf2306eae954677529fa849
(cherry picked from commit 6393225873 )
Merged-In: Ibcc83037ca801ee0ecf2306eae954677529fa849
2022-04-20 20:10:52 +00:00
Shashwat Razdan
d730c4cf06
Merge "Setting the idle bind timeout to 10 minutes. Bug: 229865962 Test: Config change" into tm-dev
2022-04-20 20:10:02 +00:00
Song Hu
9ed23e7c7e
Fix pin icon un-allignment on direct share row
...
Bug: 210453009
Test: manual test on local phone
Change-Id: I77feb91b4678d9bd3f0d41afa5fa1ca9a6c2dd43
2022-04-20 20:00:49 +00:00
Dave Mankoff
9ce5df5cdf
Cleanup GlobalModule.
...
Add @Application Context for injection, planning for future cleanup.
Bug: 229228871
Test: manual
Change-Id: I108615bda54a92c1533ec2d1e3937291004388d1
2022-04-20 19:58:54 +00:00
Hans Boehm
3aab9125d9
Merge "Don't preload into nonexistent zygote" am: c3a27297c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067474
Change-Id: Ifc9572cced752ba761d52f53eb590d74f87e35d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 19:52:30 +00:00
Nate Myren
1a292f9dbe
Merge "Remove REVIEW_REQUIRED from droidfooder phones" into tm-dev
2022-04-20 19:49:09 +00:00
Kweku Adams
7d0473dfad
Rename narc to cake.
...
Because: reasons.
Let them eat cake.
Bug: 158300259
Test: Android builds
Change-Id: Id03ff9580a135a916e1077653d544cb7ba301974
2022-04-20 19:44:18 +00:00
Hongwei Wang
cf168898be
Merge "Revert "Remove getSfInstance usage from ViewRootImpl"" into tm-dev
2022-04-20 19:31:59 +00:00
Hongwei Wang
654c80a2df
Merge "Revert "Deprecate getSfInstance usage in PiP component"" into tm-dev
2022-04-20 19:31:59 +00:00
Felipe Leme
2af0cc7680
Merge "Changes UserSystemPackageInstaller log TAG to use its own class name." into tm-dev
2022-04-20 19:29:35 +00:00
Miranda Kephart
6a5d70573f
Merge "Handle non-image URIs and quick copies" into tm-dev
2022-04-20 19:26:04 +00:00
Hans Boehm
c3a27297c4
Merge "Don't preload into nonexistent zygote"
2022-04-20 19:14:16 +00:00
Joshua Trask
66a423e79c
Remove unused ChooserUtil.java
...
The helper methods provided by this class have been unused
since ag/13807667 (part of removing the old ChooserTargetService
functionality).
Test: http://cs/search?q=chooserutil&sq=package:android-internal
Bug: 148416928
Change-Id: I0aaaa5f597ef72097f1847a3187b335791287a60
Merged-In: I0aaaa5f597ef72097f1847a3187b335791287a60
2022-04-20 19:07:53 +00:00
Joshua Trask
e5b168ac27
Update Chooser shadows to match Launcher.
...
This just requires a few parameter changes to align with Launcher
(iconloaderlib), as proposed by digman@ in b/196631965.
Bug: 196631965
Test: asked digman@ to approve a screenshot.
Change-Id: Icca36fe8c5771041bea960478c2be85f0679dc8d
Merged-In: Icca36fe8c5771041bea960478c2be85f0679dc8d
2022-04-20 19:06:53 +00:00
Joshua Trask
6121f00e1b
Remove two timeouts in ResolverActivityTest.
...
These don't seem to be necessary for the respective tests
to pass, and they were hampering my ability to make changes
to the chooser refresh delay (since they reference the same
symbol). If we do end up needing to reinstate any delay
like this, we still shouldn't have to take a dependency on
Chooser from Resolver.
Bug: 224816815
Test: atest --iterations 30 ResolverActivityTest
Change-Id: Icf806e2babca048726fe33843df4f9f62e4bd138
Merged-In: Icf806e2babca048726fe33843df4f9f62e4bd138
2022-04-20 19:04:17 +00:00
Lyn Han
72a8595e8f
Update test names to kotlin style
...
Test: StackScrollAlgorithmTest
Change-Id: I89a6df6f538ef0dd2dd46045dbb18ad6f7299130
2022-04-20 14:48:29 -04:00
Makoto Onuki
a501fcb752
Merge changes from topic "Sync-fix-redo" into tm-dev
...
* changes:
Only allow the system server to connect to sync adapters
Revert "Only allow the system server to connect to sync adapters"
2022-04-20 18:42:55 +00:00
Sudheer Shanka
878e618b16
Add BlobStoreManager.releaseAllLeases().
...
Also, rename isAllowedBlobAccess() to
isAllowedBlobStoreAccess().
Bug: 227589710
Test: atest ./apct-tests/perftests/blobstore/src/com/android/perftests/blob/BlobStorePerfTests.java
Change-Id: I190c6c1789e16942e116c8602173040a05c14990
2022-04-20 18:27:20 +00:00
Makoto Onuki
8140b786f4
Merge "Update OWNERS for the content and sync subsystem" am: f3265025d8 am: b5ca3914fe am: 925965ec28
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051441
Change-Id: Idce6f13f8602867cf6f2da920a4ab58a0bd53b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 18:09:49 +00:00
Songchun Fan
714d59fafe
[PackageUsage] fix NPE
...
This is called by `mPm.getPackageUsage().maybeWriteAsync(mPm.mSettings.getPackagesLocked())` under `mPm.mLock` so it's unclear why any pkgSetting would be null. Perhaps there are other usages not shown in the stack trace. Adding null pointer checks to avoid crashes.
BUG: 229823551
Test: builds
Change-Id: Ia33bb59824e774b02249a1e9872bc6e418dec658
2022-04-20 18:08:52 +00:00
Aaron Liu
1570e7d96e
[User Switcher] Use Log.e instead of Log.wtf
...
Log.wtf does not play nicely with atest because it kills the process.
Use Log.e instead.
Bug: 229867034
Test: Run unit tests with AS
Change-Id: Ie0e50d3fb3fcb9ce656b110f82ffde5721f7155f
2022-04-20 18:03:49 +00:00
Steve Elliott
54ad297e7c
Merge "Remove pipeline construct thread asserts + effects" into tm-dev
2022-04-20 17:49:21 +00:00
Yohei Yukawa
538f36937d
Merge "Let A11yIME use its own IPC definitions" into tm-dev
2022-04-20 17:42:55 +00:00
Hongwei Wang
500043a457
Merge "Implement PiP custom close action on phone" into tm-dev
2022-04-20 17:37:44 +00:00