Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
765,583 Commits 3 Branches 0 Tags
73fdbbb3fd65f8b8bf87a96bab36bee2d39c87f7
Commit Graph

765583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Songchun Fan
73fdbbb3fd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc65 am: 318cccd37d -s ours am: 75365b4139 -s ours am: 145dbe01fe -s ours am: df69525571 -s ours am: 42fced71b6 -s ours am: df25d67d3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3658e565778b52a7d71ad8cc82dcff2598f77c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 03:17:57 +00:00
Songchun Fan
c3ae056ecb [automerger skipped] [RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" am: 07d74c4c28 am: 9a00a3d2a8 -s ours am: 332e015554 -s ours am: c4ef6c60c0 -s ours am: fa47e36183 -s ours am: eac7a17533 -s ours am: 69e88a7523 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaff647a14881230c51079574e834db7a68a4b224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 03:17:55 +00:00
Songchun Fan
df25d67d3a [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc65 am: 318cccd37d -s ours am: 75365b4139 -s ours am: 145dbe01fe -s ours am: df69525571 -s ours am: 42fced71b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78acba1db1f0265c1064ab6819925c597afccd76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 03:01:51 +00:00
Songchun Fan
69e88a7523 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" am: 07d74c4c28 am: 9a00a3d2a8 -s ours am: 332e015554 -s ours am: c4ef6c60c0 -s ours am: fa47e36183 -s ours am: eac7a17533 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3fb4cd59cdab777f24a6bd684f0a7ee93b07cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 03:01:24 +00:00
Songchun Fan
42fced71b6 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc65 am: 318cccd37d -s ours am: 75365b4139 -s ours am: 145dbe01fe -s ours am: df69525571 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf8b2c3a1080823efd44c44ad9a0bc69db169d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 02:44:21 +00:00
Songchun Fan
eac7a17533 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" am: 07d74c4c28 am: 9a00a3d2a8 -s ours am: 332e015554 -s ours am: c4ef6c60c0 -s ours am: fa47e36183 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29529dc5b1e3df311c5b68dffbf947e89050c077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 02:44:15 +00:00
Songchun Fan
df69525571 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc65 am: 318cccd37d -s ours am: 75365b4139 -s ours am: 145dbe01fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic75e64204d3e4e52fd194584127d13f8fbe54857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 02:17:22 +00:00
Songchun Fan
fa47e36183 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" am: 07d74c4c28 am: 9a00a3d2a8 -s ours am: 332e015554 -s ours am: c4ef6c60c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7dc5e678534adec8f934d0ce06db9194daaab4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 02:17:08 +00:00
Songchun Fan
145dbe01fe [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc65 am: 318cccd37d -s ours am: 75365b4139 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f9c286b3e8769e49fe9ce198d925d771523eded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 02:01:42 +00:00
Songchun Fan
c4ef6c60c0 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" am: 07d74c4c28 am: 9a00a3d2a8 -s ours am: 332e015554 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie063698e37504af5390adf41c390ab33a394af5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 02:01:24 +00:00
Songchun Fan
75365b4139 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc65 am: 318cccd37d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I664b4297458f60c98ac5df28307c9bbffc517f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 01:36:08 +00:00
Songchun Fan
332e015554 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" am: 07d74c4c28 am: 9a00a3d2a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a8fe839957a612e71545f9c01a6286749b0d889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 01:35:52 +00:00
Songchun Fan
318cccd37d Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092213

Change-Id: I7486e3d5668248c54a0ab6160c8112ef154903f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 01:12:42 +00:00
Songchun Fan
9a00a3d2a8 [RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" am: 07d74c4c28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092213

Change-Id: If22465789761ee4d6077a84b5d570f4392fedbb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 01:12:25 +00:00
Songchun Fan
650eb0cc65 Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev 2022-06-28 20:37:57 +00:00
Raphael Kim
dfda3dad5c Merge "Re-introduce ActivityTaskManager in CdmService" into tm-dev am: 06258e35ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19066676

Change-Id: I902c79ca375dc3dc51f000c14529a09cf1bdf287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:39:33 +00:00
Ilya Matyukhin
4424885121 Merge changes I171604ee,I81d648e5 into tm-d1-dev 
* changes:
  Do nothing in duplicate onDialogAnimatedIn calls
  Don't crash on illegal biometric states
 2022-06-28 18:24:31 +00:00
Raphael Kim
06258e35ce Merge "Re-introduce ActivityTaskManager in CdmService" into tm-dev 2022-06-28 18:12:40 +00:00
TreeHugger Robot
657e9583c3 Merge "Correctly parse minSdk even when targetSdk is a codename" into tm-dev am: 2fb8b2d84c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19087061

Change-Id: If5ab5711c8ddf6561781542fae7cb8d6a0955c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:03:05 +00:00
TreeHugger Robot
2fb8b2d84c Merge "Correctly parse minSdk even when targetSdk is a codename" into tm-dev 2022-06-28 17:28:20 +00:00
Songchun Fan
07d74c4c28 [RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" 
Revert submission 16575908-dont_abandon_child_qt_dev

Reason for revert:  Reverting CVE-2021-39624 on qt-dev
Reverted Changes:
I4ede6b7a4:Persist destroyed staged sessions until they are c...
Ib0ba9f378:Don't abandon child sessions (1/n)

Change-Id: I50ab96061b2e0fa016a0fbdb5773ccc5f2397ac6
 2022-06-28 16:37:33 +00:00
Ilya Matyukhin
c3639d29ed Do nothing in duplicate onDialogAnimatedIn calls 
Bug: 233448368
Test: atest AuthSessionTest
Change-Id: I171604ee6dc40f1d44ac65525c32ff97f1fa1d76
 2022-06-27 20:57:35 +00:00
Ilya Matyukhin
ba632cbe8e Don't crash on illegal biometric states 
Bug: 233448368
Test: atest BiometricSchedulerOperationTest
Change-Id: I81d648e584b90ad00f8200fe981a113dd44bd7c2
 2022-06-27 20:56:53 +00:00
Winson Chiu
bcf5b69c41 Correctly parse minSdk even when targetSdk is a codename 
The code that assigned target to min if min was not specified was
only checking for min codenames, but if the manifest specified a
numerical minSdkVersion, that is valid and would incorrectly prevent
the package from installing.

Bug: 237059024

Test: mts-tradefed > mts-eng-only -m ApkInApexTest

Change-Id: I3a2b9baa82ebb8ca9031c9fa128ce12bff17226e
 2022-06-27 18:29:39 +00:00
Alex Johnston
6b10a7a317 Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034752

Change-Id: I074ff67be5aee5088c5913cd050a1e9ed479c5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 18:11:10 +00:00
Alex Johnston
2d31bbe7ec Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev 2022-06-27 17:52:38 +00:00
Raphael Kim
e4c67f63e8 Re-introduce ActivityTaskManager in CdmService 
Bug: 237039176
Test: Manually tested by reporter
Change-Id: I2b61b6f88b5dc772d2b4333aa23fcae22c4eee9a
 2022-06-27 16:49:57 +00:00
Galia Peycheva
d7f43c22b9 Merge "Remove SplashScreen animations on TV" into tm-dev am: 07943a5b9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18601924

Change-Id: I5aeffda29e08f4dfa88ea7a27b5cb0a7b2755efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 12:34:20 +00:00
Galia Peycheva
07943a5b9b Merge "Remove SplashScreen animations on TV" into tm-dev 2022-06-27 12:19:51 +00:00
Charles Chen
e53c8761b2 Merge "Fix exception in expandSplitContainerIfNeeded" into tm-dev am: 5a0f8768a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18886475

Change-Id: I84e2988efbb4451023161badfe2203f2aff9ee71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 03:48:05 +00:00
Charles Chen
5a0f8768a7 Merge "Fix exception in expandSplitContainerIfNeeded" into tm-dev 2022-06-27 03:28:09 +00:00
SongFerng Wang
8a8b69d77b Merge "[LE Unicast] Using the active device as main device after grouping" into tm-d1-dev 2022-06-26 16:38:24 +00:00
Bart Sears
4310d341de Merge "Move bottom padding from ScrollView to child" into tm-dev am: 8e575eafcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19046652

Change-Id: I662f94a9a49d5e5560816b4a893b17b141ef5035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 21:51:26 +00:00
Bart Sears
8e575eafcf Merge "Move bottom padding from ScrollView to child" into tm-dev 2022-06-24 21:24:58 +00:00
Michael Wright
e2b26a18be Merge "Release outstanding suspend blockers when shutting down DPC" into tm-dev am: 3a28a13e0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19053827

Change-Id: I9cc6a44e15ca8156d768f300b5a6cb99c8c760d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 20:37:23 +00:00
Michael Wright
3a28a13e0d Merge "Release outstanding suspend blockers when shutting down DPC" into tm-dev 2022-06-24 20:17:44 +00:00
TreeHugger Robot
2420b44719 Merge "Use the default top clock margin on h800 devices" into tm-dev am: b865d49b16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19051608

Change-Id: I194026de5f3cb79b5413dcadb3295d84187e404a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 18:38:26 +00:00
TreeHugger Robot
b865d49b16 Merge "Use the default top clock margin on h800 devices" into tm-dev 2022-06-24 18:08:02 +00:00
Michael Wright
5747d1a551 Release outstanding suspend blockers when shutting down DPC 
Right now DPC removes all messages but doesn't actually clean up all of
the outstanding state that's in flight. In general, this isn't that
harmful for most things as the display is going away at this point, but
if any suspend blockers are being held pending this work then we end up
in a state where the device can never suspend. This causes severe
battery drain that can only be fixed by a reboot.

Test: manual
Fixes: 213407479
Change-Id: I5b61f5bd498f09026d5b398bb3a8ccdaa91601fe
 2022-06-24 18:39:18 +01:00
Alex Johnston
7d1eae2df6 DPMS workaround to check the device owner type in PermissionController 
Context:
* If the device is managed, then hibernation should not be
  handled unless the device is financed.
* We need a way to check if a device is financed in
  PermissionController. However, PermissionController
  is a mainline module so cannot call the TestAPI
  Dpm.getDeviceOwnerType

Change:
* User Global Settings to let permission controller know
  if the device is financed

Bug: 236283038
Test: Manual testing following go/hibernation-local-testing
Change-Id: Ib9a1a9116014d041c9514752882cdd364bfe777b
 2022-06-24 14:34:58 +01:00
TreeHugger Robot
da2d8fe459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 81222d2803 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe951d5a6a402dc45a53b7cee9f146870f209b72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:57 +00:00
Bill Yi
4445ed60d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84666a2a3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4c71376a75ee904f8d0b101125437b840f9e668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:56 +00:00
TreeHugger Robot
515e8dd9dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e07f5e2953 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida335deb909489066b07b72f4574e4a242db734e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:50 +00:00
Bill Yi
bbdb8073e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0064bc1a7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbbc1c4b5f1d0d1cf2a502c582fd5916a8f0a20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:42 +00:00
TreeHugger Robot
60e60ee81b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8c6904ecc0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a233a68d654c6c6085b0654a28e05fd8a3a9281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:39 +00:00
Bill Yi
58c62a1e49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44b2921b5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2c33002275289d366c5b6e8abd8eb284886bb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:31 +00:00
TreeHugger Robot
3d5e29ec32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 932644a8f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I869678e2f3ff78685bcb58cd636507e4700ab44e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:17 +00:00
Bill Yi
76bfeb9882 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd3ad0a763 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8916ddf0173b31ccee003731f7a0aaef5e41c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:03 +00:00
TreeHugger Robot
81222d2803 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:43 +00:00
TreeHugger Robot
e07f5e2953 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:43 +00:00