Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
758,075 Commits 3 Branches 0 Tags
a300bfc5e06666ef433361a7ae8a14ff6a496ea6
Commit Graph

758075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a300bfc5e0 Merge "Rename narc to cake." into tm-dev 2022-04-20 22:27:01 +00:00
Sudheer Shanka
b771b2215a Merge "Add BlobStoreManager.releaseAllLeases()." into tm-dev 2022-04-20 22:24:39 +00:00
Jon Eckenrode
ea8489c0ce Merge "Updated API documentation of screenWidthDp and screenHeightDp to include multiple-screen behavior." into tm-dev 2022-04-20 22:23:10 +00:00
TreeHugger Robot
2f98c9a4cc Merge "Remove two timeouts in ResolverActivityTest." into tm-dev 2022-04-20 21:53:19 +00:00
TreeHugger Robot
07435b1b47 [automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4 am: 856b62f907 am: df7e8c7203 am: 8cdecf2bf3 -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history

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

Change-Id: I0151ce167fdb8f62c43f0cca038b226152fe0b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:37:53 +00:00
Eric Biggers
e122ed1a6d [automerger skipped] Ignore errors preparing user storage for existing users am: e667b60402 am: 1dd78739ee am: 9d405365cf am: 4c523a5ac2 -s ours 
am skip reason: Merged-In I9bdd1a4bf5b14542adb901f264a91d489115c89b with SHA-1 e667b60402 is already in history

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

Change-Id: I107287cb2cb4dcaebc7e859e5c3b9c9328d141c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:37:43 +00:00
Eric Biggers
fd12293729 [automerger skipped] UserDataPreparer: reboot to recovery for system user only am: fd31f740ce am: 7abafd53c9 am: d4f7100ba0 am: 4e4f5a6325 -s ours 
am skip reason: Merged-In Ia1db01ab4ec6b3b17d725f391c3500d92aa00f97 with SHA-1 fd31f740ce is already in history

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

Change-Id: I39c7057177032205bc7550f1617a65cbbfacacfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:37:16 +00:00
Eric Biggers
871c9964c6 [automerger skipped] UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026ca am: ad111e22f8 am: 9eec832b84 -s ours am: 87fd03af4d -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: I62940c9f865acceab83ff3262c9bfdc0c019a6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:36:56 +00:00
Eric Biggers
5e7d5c80aa [automerger skipped] [automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476 am: 63fec800ad am: 0ee586deaa -s ours am: 3f976d45b5 -s ours 
am skip reason: Merged-In I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2 with SHA-1 9d2bb776ed is already in history

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

Change-Id: I8cccce4225e93ba21c7482d42a9264d1bf4981c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:36:24 +00:00
TreeHugger Robot
8cdecf2bf3 Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4 am: 856b62f907 am: df7e8c7203 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452466

Change-Id: Id73438fbad391a3013287dc2671af71325307771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:20:22 +00:00
Eric Biggers
4c523a5ac2 Ignore errors preparing user storage for existing users am: e667b60402 am: 1dd78739ee am: 9d405365cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416119

Change-Id: I0462e745760b9a04c72504ce145022761234d3e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:19:54 +00:00
Eric Biggers
4e4f5a6325 UserDataPreparer: reboot to recovery for system user only am: fd31f740ce am: 7abafd53c9 am: d4f7100ba0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416118

Change-Id: I839d42f1fb7a485b71dc06dc6219d4600c58f1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:19:32 +00:00
Eric Biggers
87fd03af4d [automerger skipped] UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026ca am: ad111e22f8 am: 9eec832b84 -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: Ied94a5d0aaed79aeeeb22838548b997868142e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:19:24 +00:00
Eric Biggers
3f976d45b5 [automerger skipped] [automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476 am: 63fec800ad am: 0ee586deaa -s ours 
am skip reason: Merged-In I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2 with SHA-1 9d2bb776ed is already in history

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

Change-Id: I85cf120ecca1ea1cdb6dc6254e5d69197574c263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:18:02 +00:00
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
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
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
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