Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
638,142 Commits 3 Branches 0 Tags
6a22355b7775fe584f0fa2fd1b05bdb6ce131bde
Commit Graph

638142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Lin
6a22355b77 Merge "PiP: Don't start with marking pinch-resize gesture ongoing." into sc-dev am: 1bd4ed1f06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13926145

Change-Id: I9c052f70cea473d0aa67021f37ae4c52f562b21a
 2021-03-30 20:10:26 +00:00
Jay Aliomer
aa4e262624 Merge "Add null checks in wallpaper service" into sc-dev am: 3bff4d5edc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13973528

Change-Id: I824164893ff63f7d45cc077c51bc8e51b33c78b5
 2021-03-30 20:10:09 +00:00
Hongwei Wang
8c5ba0ebfd Merge "Disable PipMovesInAllApps temporarily" into sc-dev am: 6c9640f8b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14036434

Change-Id: I95f6a2b9afb3e76adcb8c0822dc9360868e98b30
 2021-03-30 20:08:40 +00:00
Ben Lin
1bd4ed1f06 Merge "PiP: Don't start with marking pinch-resize gesture ongoing." into sc-dev 2021-03-30 19:54:37 +00:00
Hongwei Wang
df27e9ddb5 Merge "Apply the whole auto pip transaction in recents animation" into sc-dev am: 660008c5c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13922011

Change-Id: Ia5d47d94f0259f26f6c225e261a52d57a19f5556
 2021-03-30 19:48:35 +00:00
Jay Aliomer
3bff4d5edc Merge "Add null checks in wallpaper service" into sc-dev 2021-03-30 19:45:55 +00:00
Jay Aliomer
32e5de029d Add null checks in wallpaper service 
Fixes: b/183406113
Fixes: b/183196002
Fixes: b/181557891
Test: WallpaperServiceTest
Change-Id: I62fd71cd99d53ed63ee0a334e1c8daf7f90a4a6b
 2021-03-30 19:43:15 +00:00
Hongwei Wang
6c9640f8b3 Merge "Disable PipMovesInAllApps temporarily" into sc-dev 2021-03-30 19:27:00 +00:00
Hongwei Wang
660008c5c2 Merge "Apply the whole auto pip transaction in recents animation" into sc-dev 2021-03-30 19:26:17 +00:00
TreeHugger Robot
a0280d9c08 Merge "Fix async behavior and address possible race conditions." into sc-dev am: 6242b00678 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14021884

Change-Id: Id152f522580e44f2f392e8abd78406d9a945a363
 2021-03-30 18:51:45 +00:00
Anton Hansson
eb9dea572d Merge "Add framework-mime-sources to stubs generation" am: ba4eeb87dd am: 9c26127d17 am: 7e0527c567 am: c092d80a11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655732

Change-Id: I0fc61b3c4171d4d861625cabe56e3ebab39a8f8a
 2021-03-30 18:51:37 +00:00
Treehugger Robot
00751c3d1a [automerger skipped] Merge "Add carrier config keys for GBA" am: 7715ad3ac8 am: dbc2a426ba am: 3ba12c704b -s ours am: 92f1ac756e -s ours 
am skip reason: skip tag Change-Id I03487dca483cd91ddcafe9487f211eb3069caf5f with SHA-1 ab470f7203 is already in history

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

Change-Id: Ib79e41970e9067e7c554342a895026f64ceb4709
 2021-03-30 18:51:24 +00:00
Lorenzo Colitti
7552757b35 Merge changes I24580ea4,Id48b8eab am: 07a238ab02 am: e4f241500c am: 463d2f3f27 am: 3eae430086 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657763

Change-Id: I0cbf113af8021529554db33224ea325589f61aa2
 2021-03-30 18:51:06 +00:00
Anton Hansson
383433b118 Merge "Add a shared filegroup for non-updatable stub sources" am: 4ffb28c5f3 am: 4d79002c3c am: 916e38597d am: 28e58b4783 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655731

Change-Id: Ia038d7a8120cdbed8d6e14b48d67dc4d742b98dc
 2021-03-30 18:50:51 +00:00
Selim Cinek
dc30a9ea21 Merge changes Iab923d09,Ibd18d410 into sc-dev am: 54e08602cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033667

Change-Id: Iccf25c295f31b110fadcc721f20e8ab35f8557be
 2021-03-30 18:50:28 +00:00
Ahaan Ugale
6ffb5d11e2 Merge "Add a showInInputMethodPicker attr." into sc-dev am: 5a8e113266 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13944383

Change-Id: If7eb8e3b36bb2ff8091254602b541009ac063708
 2021-03-30 18:49:59 +00:00
Mady Mellor
4a9fa28eb9 [automerger skipped] Merge "DO NOT MERGE Reset top focused root task when task hidden" into rvc-qpr-dev am: f61739c78d am: 77b07ba3f9 -s ours am: 95fbdaa4c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91f7b31828ffc6bcc206edf9c64923da8e4def16
 2021-03-30 18:49:38 +00:00
Louis Chang
e7450c0f09 [automerger skipped] DO NOT MERGE Reset top focused root task when task hidden am: 78a9f28282 am: c66450629e -s ours am: e4ea4b2175 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e417255dedc3f7a5be22fa9e7058c1e01e3fe42
 2021-03-30 18:49:35 +00:00
TreeHugger Robot
6242b00678 Merge "Fix async behavior and address possible race conditions." into sc-dev 2021-03-30 18:45:50 +00:00
Anton Hansson
c092d80a11 Merge "Add framework-mime-sources to stubs generation" am: ba4eeb87dd am: 9c26127d17 am: 7e0527c567 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655732

Change-Id: Id8119533bbd8320d81d0e8166086fd6565ba54b4
 2021-03-30 18:34:04 +00:00
Treehugger Robot
92f1ac756e [automerger skipped] Merge "Add carrier config keys for GBA" am: 7715ad3ac8 am: dbc2a426ba am: 3ba12c704b -s ours 
am skip reason: skip tag Change-Id I03487dca483cd91ddcafe9487f211eb3069caf5f with SHA-1 ab470f7203 is already in history

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

Change-Id: I4193037241441ee9b151e9f262b349428083988e
 2021-03-30 18:33:37 +00:00
Lorenzo Colitti
3eae430086 Merge changes I24580ea4,Id48b8eab am: 07a238ab02 am: e4f241500c am: 463d2f3f27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657763

Change-Id: I9d304c35374670eb0e4dcfb9caf6b065878d97e6
 2021-03-30 18:33:04 +00:00
Anton Hansson
28e58b4783 Merge "Add a shared filegroup for non-updatable stub sources" am: 4ffb28c5f3 am: 4d79002c3c am: 916e38597d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655731

Change-Id: I1ac2e12c782acac9087ff741676406557a19859e
 2021-03-30 18:32:35 +00:00
Selim Cinek
54e08602cf Merge changes Iab923d09,Ibd18d410 into sc-dev 
* changes:
  Updating owners of SystemUI
  Fixed an issue where the user would have no notifications on lockscreen
 2021-03-30 18:32:14 +00:00
Ahaan Ugale
5a8e113266 Merge "Add a showInInputMethodPicker attr." into sc-dev 2021-03-30 18:31:52 +00:00
Mady Mellor
95fbdaa4c9 [automerger skipped] Merge "DO NOT MERGE Reset top focused root task when task hidden" into rvc-qpr-dev am: f61739c78d am: 77b07ba3f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e525f4c15d9b2207cc3b04e97305a7357c9c0c7
 2021-03-30 18:31:23 +00:00
Louis Chang
e4ea4b2175 [automerger skipped] DO NOT MERGE Reset top focused root task when task hidden am: 78a9f28282 am: c66450629e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e5eadc5ac752f839998f394646b82c74b242e13
 2021-03-30 18:31:15 +00:00
Sally Yuen
c7cba43560 Merge "Set min, max, and default RBC strength values" into sc-dev am: b60de846d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13991017

Change-Id: I440633f5344f26ff2f9228fe6e5d0e78e8e555f5
 2021-03-30 18:27:49 +00:00
Fabian Kozynski
2fac8f4beb Merge "Change privacy indicator holding policy" into sc-dev am: e617b31111 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13996764

Change-Id: I293b7d7bdbc30d46d604956b11399174fb8dc35c
 2021-03-30 18:27:24 +00:00
Anton Hansson
de312ad9c4 Merge "Revert "Add SuppressLint to framework-annotations-lib"" into mainline-prod am: 7d5365b2f8 am: 2d9cd59eeb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033674

Change-Id: I30053927703e04a8403a40b180f22788e27b86ce
 2021-03-30 18:26:54 +00:00
Sally Yuen
b60de846d4 Merge "Set min, max, and default RBC strength values" into sc-dev 2021-03-30 18:22:16 +00:00
Fabian Kozynski
e617b31111 Merge "Change privacy indicator holding policy" into sc-dev 2021-03-30 18:19:01 +00:00
Anton Hansson
2d9cd59eeb Merge "Revert "Add SuppressLint to framework-annotations-lib"" into mainline-prod am: 7d5365b2f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033674

Change-Id: Icbfc2c81baf8eebe9862f154170c53b23c08e717
 2021-03-30 18:06:57 +00:00
Sudheer Shanka
d955473beb Merge "Revert NPMS threshold to BFGS." into sc-dev am: a55c43879e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14006647

Change-Id: I4d77105027a88071ed78d7ced1f8fc423ab36f3e
 2021-03-30 18:02:46 +00:00
Sudheer Shanka
a55c43879e Merge "Revert NPMS threshold to BFGS." into sc-dev 2021-03-30 17:51:51 +00:00
Amit Mahajan
a681f374b7 Merge "Notify CellLocation whenever ACTION_USER_SWITCHED" into sc-dev am: 244c071737 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13891835

Change-Id: Ideca245d742325e14d936ca36ddb9716727561ae
 2021-03-30 17:45:13 +00:00
Pinyao Ting
10e2ab3e70 Merge "Remove unnecessary invokation on AppSearch" into sc-dev am: 4546fb3eb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14021435

Change-Id: I9513bb4afb58093382c8b06cc6178d3db143e6fb
 2021-03-30 17:44:48 +00:00
Anton Hansson
7e0527c567 Merge "Add framework-mime-sources to stubs generation" am: ba4eeb87dd am: 9c26127d17 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655732

Change-Id: I8343e4782d69cfd1f33b2f18c77cc97dcbbbf582
 2021-03-30 17:44:47 +00:00
Treehugger Robot
3ba12c704b Merge "Add carrier config keys for GBA" am: 7715ad3ac8 am: dbc2a426ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657761

Change-Id: I78f1661d3f18daa5e575b8fe6af2564fb495bcda
 2021-03-30 17:44:10 +00:00
Lorenzo Colitti
463d2f3f27 Merge changes I24580ea4,Id48b8eab am: 07a238ab02 am: e4f241500c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657763

Change-Id: I8a7973e7ed4a8aac67d6f3da7c496a2eb0e28d92
 2021-03-30 17:43:08 +00:00
Beverly Tai
4e04bc2588 Merge "Don't show a toast icon if app.info is null" into sc-dev am: 42f5892237 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14018135

Change-Id: Ie4a983c007c44faa13dd83b2dafd8c5324a0c88b
 2021-03-30 17:43:02 +00:00
Anton Hansson
916e38597d Merge "Add a shared filegroup for non-updatable stub sources" am: 4ffb28c5f3 am: 4d79002c3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655731

Change-Id: I2a9e255364c15f598bb7ecc7bdfde753d38d647f
 2021-03-30 17:42:34 +00:00
Amit Mahajan
244c071737 Merge "Notify CellLocation whenever ACTION_USER_SWITCHED" into sc-dev 2021-03-30 17:42:08 +00:00
Mady Mellor
77b07ba3f9 Merge "DO NOT MERGE Reset top focused root task when task hidden" into rvc-qpr-dev am: f61739c78d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14019845

Change-Id: Ib9102191d27a029d4e60d0d4719220f43c4e7cf9
 2021-03-30 17:42:00 +00:00
Louis Chang
c66450629e DO NOT MERGE Reset top focused root task when task hidden am: 78a9f28282 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14019845

Change-Id: I043dd659efd942aa19e6f6264294b8280e4da3e8
 2021-03-30 17:41:33 +00:00
Anton Hansson
9c26127d17 Merge "Add framework-mime-sources to stubs generation" am: ba4eeb87dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655732

Change-Id: Iee85bdb6d1a185d098cdba9baa01aa061ee5aa69
 2021-03-30 17:36:21 +00:00
Pinyao Ting
4546fb3eb4 Merge "Remove unnecessary invokation on AppSearch" into sc-dev 2021-03-30 17:33:28 +00:00
Treehugger Robot
dbc2a426ba Merge "Add carrier config keys for GBA" am: 7715ad3ac8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657761

Change-Id: I606bd697c6afbe157d41fe4c23a7c046fc931f6e
 2021-03-30 17:31:23 +00:00
Beverly Tai
42f5892237 Merge "Don't show a toast icon if app.info is null" into sc-dev 2021-03-30 17:26:44 +00:00
Kweku Adams
626ec2902c Fix async behavior and address possible race conditions. 
1. Don't release the lock until we've fully processed an app or user
   removal so that JS stays in a consistent state outside of the lock.
   Before, we released the lock between cancelling jobs and telling
   controllers of the removal, so there was a short period where JS was
   internally inconsistent and an app scheduling a job could land in JS's
   inconsistency.
2. Actually lock around methods that require the lock be held.

Bug: 183921387
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/job
Test: atest CtsJobSchedulerTestCases
Change-Id: I440e3c7753d119e025b0359d2b35bec90fa19628
 2021-03-30 10:23:40 -07:00