Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
848,043 Commits 3 Branches 0 Tags
03eea04c1919ca2adbb33fc14b9a2d192d42d386
Commit Graph

848043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aseem Kumar
03eea04c19 Merge "Fix NPE in AccountManagerService." 2022-11-11 23:06:19 +00:00
Ale Nijamkin
e34657499d [automerger skipped] Merge "Revert "Adds a few dependencies to the shared library."" into tm-qpr-dev am: 4133d50209 -s ours am: eab7d6a3c0 -s ours 
am skip reason: Merged-In I4e41a911891ff3ba30ff82163be1005ef3974be3 with SHA-1 97860c2a0e is already in history. Merged-In was found from reverted change.

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

Change-Id: I766f4a4739c340057c24e0c8b5b71ae923337460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 21:52:39 +00:00
Ale Nijamkin
37d8a4b05c [automerger skipped] Revert "Adds a few dependencies to the shared library." am: f93309b2a5 -s ours am: 8a21bcf659 -s ours 
am skip reason: Merged-In I4e41a911891ff3ba30ff82163be1005ef3974be3 with SHA-1 97860c2a0e is already in history. Merged-In was found from reverted change.

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

Change-Id: I1a49bcae7c79d6b8450a75a87e286d47c30413c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 21:52:03 +00:00
Ale Nijamkin
eab7d6a3c0 [automerger skipped] Merge "Revert "Adds a few dependencies to the shared library."" into tm-qpr-dev am: 4133d50209 -s ours 
am skip reason: Merged-In I4e41a911891ff3ba30ff82163be1005ef3974be3 with SHA-1 97860c2a0e is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I76fbf63d16f470567d5befab9d1cace75666e77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 21:20:58 +00:00
Ale Nijamkin
8a21bcf659 [automerger skipped] Revert "Adds a few dependencies to the shared library." am: f93309b2a5 -s ours 
am skip reason: Merged-In I4e41a911891ff3ba30ff82163be1005ef3974be3 with SHA-1 97860c2a0e is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ic47c2476329b5239d93aaccf722faade53facb81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 21:20:36 +00:00
Kunal Malhotra
f4c573cc63 Merge "Adding in new metrics for Jobs." 2022-11-11 21:14:54 +00:00
Ale Nijamkin
4133d50209 Merge "Revert "Adds a few dependencies to the shared library."" into tm-qpr-dev 2022-11-11 20:56:23 +00:00
Kweku Adams
46038f2a1c Merge "Add data transfer JobService APIs." 2022-11-11 19:34:24 +00:00
Aaron Liu
5bf86ebc7a Merge "[Bouncer] Update bouncer view with display size." into tm-qpr-dev am: a40e956a6a am: 027a1dd6fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20413391

Change-Id: Ib4f2837acdb9d64e14b72b513c4fbe0cbbdc59ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 19:11:59 +00:00
Aaron Liu
027a1dd6fb Merge "[Bouncer] Update bouncer view with display size." into tm-qpr-dev am: a40e956a6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20413391

Change-Id: Iaffc0dc924f923191c0a988fe599055f77f77a8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 18:39:58 +00:00
Aaron Liu
a40e956a6a Merge "[Bouncer] Update bouncer view with display size." into tm-qpr-dev 2022-11-11 18:15:31 +00:00
Matt Buckley
b091fb85de Merge "Add support for ADPF HintSession sendHint to JNI" 2022-11-11 17:54:42 +00:00
Gurpreet Singh
cf6cd188b7 Merge changes from topic "presubmit-am-0937382625b34fa3bd0171e756b4e2e9" 
* changes:
  [automerged blank] Fix testUsesSdk test to use higher extension version. 2p: 587492489c
  Fix testUsesSdk test to use higher extension version.
 2022-11-11 17:41:46 +00:00
Shaju Mathew
28a1770efe Merge "Revert "BroadcastQueue: more increasing delay knobs."" 2022-11-11 17:39:00 +00:00
Michael Groover
b27f82bcc1 Merge "Override registerReceiver methods in test Context to accept flags" am: 57ff4b4589 am: ebd19a22d8 am: 3023e08134 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2295653

Change-Id: Ib7daaf9b43c7756ea101ed15d8bfded2a22f660a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 16:46:47 +00:00
Michael Groover
3023e08134 Merge "Override registerReceiver methods in test Context to accept flags" am: 57ff4b4589 am: ebd19a22d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2295653

Change-Id: Ieb23a1f4f61478e26789822cff404197e599d2f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 16:43:10 +00:00
Ale Nijamkin
f93309b2a5 Revert "Adds a few dependencies to the shared library." 
This reverts commit c752af5808.

Reason for revert: b/258424862

Change-Id: I2851fd0980b579015e34754a5b1c7db46ab56dea
 2022-11-11 16:41:53 +00:00
Victor Chang
1fe78cf84e Revert "BroadcastQueue: more increasing delay knobs." 
This reverts commit 2bd5b49f95.

Reason for revert: b/258718309

Change-Id: I7ccb4e8238066c6038364395d026f340a872a1b0
 2022-11-11 16:33:18 +00:00
Florian Mayer
1162d79a78 Merge "Add constant for intent to open MemtagPage" 2022-11-11 16:33:13 +00:00
Michael Groover
ebd19a22d8 Merge "Override registerReceiver methods in test Context to accept flags" am: 57ff4b4589 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2295653

Change-Id: I655a5a5fc3de312c9ea2c35a4dfc3465bb0687fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 15:58:11 +00:00
Michael Groover
57ff4b4589 Merge "Override registerReceiver methods in test Context to accept flags" 2022-11-11 15:32:07 +00:00
Matt Casey
9caeec5dd8 Merge "Fix long screenshots actions for work profile." into tm-qpr-dev am: a07000013b am: 1e5e9eeb8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20225186

Change-Id: Ie5d9cf5ae6ee9bc887986d94d34bc9b6c89c8de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 15:21:29 +00:00
TreeHugger Robot
5cf5a91bf5 Merge "QS in split shade should listen to changes earlier" into tm-qpr-dev am: ed19f58a1c am: 8985cfc6ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20388345

Change-Id: I6c4813f60249fa07a102da3d07e390c040eccb6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 15:20:47 +00:00
Silvia Vinyes
ce3e3c43b6 [automerger skipped] Merge "Add logging for ambient light." into tm-qpr-dev am: fd8565ceb1 am: 146afdf91a -s ours 
am skip reason: Merged-In I7b3a823f116b68a349d398b9cd2dab465e27ea9c with SHA-1 642112e475 is already in history

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

Change-Id: Iea91f77d47be8dd55f1c1b689a97290b0b10f5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 15:18:36 +00:00
Silvia Vinyes
e70fa8ab36 [automerger skipped] Merge "Ensure only internal display display interactions are logged." into tm-qpr-dev am: 6bb34e9b92 am: 793ddfa8d1 -s ours 
am skip reason: Merged-In I473867eb37ae6d862759ab1f4fad95bb7bb96616 with SHA-1 fedad29a41 is already in history

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

Change-Id: I18d06efd9410bae10b9823f0492096242fc5ecff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 15:17:03 +00:00
Matt Casey
1e5e9eeb8a Merge "Fix long screenshots actions for work profile." into tm-qpr-dev am: a07000013b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20225186

Change-Id: Ifed01d1baacfea444dee6f9fb0fe427e8c56bcbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 15:16:22 +00:00
TreeHugger Robot
8985cfc6ed Merge "QS in split shade should listen to changes earlier" into tm-qpr-dev am: ed19f58a1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20388345

Change-Id: I1c501f8dd1bbf0cb6a74e37a953c7b03f77833d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 15:13:45 +00:00
Matt Casey
a07000013b Merge "Fix long screenshots actions for work profile." into tm-qpr-dev 2022-11-11 15:03:46 +00:00
TreeHugger Robot
ed19f58a1c Merge "QS in split shade should listen to changes earlier" into tm-qpr-dev 2022-11-11 14:36:05 +00:00
Silvia Vinyes
146afdf91a Merge "Add logging for ambient light." into tm-qpr-dev am: fd8565ceb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20300181

Change-Id: Ia0d3ad55fe9ffe7eb2718a77ba58ac9f711e64f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 14:31:21 +00:00
Silvia Vinyes
793ddfa8d1 Merge "Ensure only internal display display interactions are logged." into tm-qpr-dev am: 6bb34e9b92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20411902

Change-Id: I6a7226bd87e9c1d7e4d90e262a49044db41f3a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 14:28:28 +00:00
Silvia Vinyes
fd8565ceb1 Merge "Add logging for ambient light." into tm-qpr-dev 2022-11-11 13:58:32 +00:00
Silvia Vinyes
6bb34e9b92 Merge "Ensure only internal display display interactions are logged." into tm-qpr-dev 2022-11-11 13:58:23 +00:00
Iván Budnik
4e72b9846e Merge "Rename selectRoute(String, MediaRoute2Info) to transfer()" 2022-11-11 11:17:46 +00:00
Hani Kazmi
2ad36d7254 Merge "Add logging for activity finishActivity to be blocked as part of go/activity-security" 2022-11-11 10:53:09 +00:00
Ilya Matyukhin
61560344b0 Add tests for the FingerprintManager path in UdfpsController am: 2e38249906 am: 84dea87491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20410498

Change-Id: I5e03406fd8d52e79d194ab2de53999e4d34331b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 10:24:05 +00:00
Ilya Matyukhin
84dea87491 Add tests for the FingerprintManager path in UdfpsController am: 2e38249906 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20410498

Change-Id: I959d77ff5f343c8abbcf7c0176a61e9849f2e6d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 09:23:29 +00:00
Chilun Huang
518b394962 Merge "Extand the long press duration" 2022-11-11 09:11:45 +00:00
Qinmei Du
42aa615a02 Merge "Change the icon and displayName inside the providerInfo data class from the packageInfo" 2022-11-11 08:02:04 +00:00
Shawn Lin
a51725bcbf Merge "Fix cutout not updating when switching cutout emulation" into tm-qpr-dev am: 58de71a4a9 am: 1aeb4c8ec1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20336269

Change-Id: Iabfb9bee8be9b64ee38964c4a0ca99a71a491557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 07:18:27 +00:00
Ankita Vyas
c581a47329 Merge "Add a new field showInPersonalTab in AppEntry." 2022-11-11 07:17:48 +00:00
Ilya Matyukhin
2e38249906 Add tests for the FingerprintManager path in UdfpsController 
Bug: 218388821
Test: atest UdfpsControllerTest
Change-Id: I0de372b2897231ee2832a07d660e233f4ed9fd05
 2022-11-11 06:51:42 +00:00
Shawn Lin
1aeb4c8ec1 Merge "Fix cutout not updating when switching cutout emulation" into tm-qpr-dev am: 58de71a4a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20336269

Change-Id: I193deccf2d3f31af1e3c8b2e24fea026516d0112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 06:47:27 +00:00
Wei Sheng Shih
827093037e Merge "Generalize back animation and transition sequence..." 2022-11-11 06:42:49 +00:00
Parvathy Shanmugam
355a61818e Merge "(Emergency call routing type) support DB routing type while merging" 2022-11-11 06:29:08 +00:00
Shawn Lin
58de71a4a9 Merge "Fix cutout not updating when switching cutout emulation" into tm-qpr-dev 2022-11-11 06:14:28 +00:00
Tiger Huang
ab970cfaeb Merge "Don't send mSizeCompatScale to client if it is from SizeCompatBounds" into tm-qpr-dev am: d76c6279e1 am: 2d8d2456c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20419089

Change-Id: Ia02150ebf576aaa1f7da990f7f2ec339c7d204bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 06:08:52 +00:00
Tiger Huang
2d8d2456c1 Merge "Don't send mSizeCompatScale to client if it is from SizeCompatBounds" into tm-qpr-dev am: d76c6279e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20419089

Change-Id: If243c31b640a63b8fa92f1f17115994adc9eb5c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 05:36:38 +00:00
Tiger Huang
d76c6279e1 Merge "Don't send mSizeCompatScale to client if it is from SizeCompatBounds" into tm-qpr-dev 2022-11-11 05:04:05 +00:00
Jimmy Hu
7710eba48a Merge "Fix possible NPE in StorageNotification." 2022-11-11 04:56:20 +00:00