Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
813,479 Commits 3 Branches 0 Tags
33a8ba28dfb47cd605c192547d2cb334e61e89cd
Commit Graph

813479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Govinda Wasserman
e66c63200d Merge "Add option to return a null Dagger graph" into tm-qpr-dev am: db19b3960f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20666247

Change-Id: I8e96014a32e752c5b7512fce443c31d8314be16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 21:38:39 +00:00
Jakub Pawłowski
729d749aef Merge "[LE Audio] Add BT LE headset check for voice call to update the icon" 2022-12-13 21:33:59 +00:00
Roman Kiryanov
940ca0c415 Merge "Emulator: handle OOM and Protocol error cases" 2022-12-13 21:32:42 +00:00
Daniel Chapin
4215d4a2af Merge changes from topic "revert-2264526-QTJABPYRJT" 
* changes:
  Revert "Get PackageManager from Context"
  Revert "Use waitForService() istead of getService()"
 2022-12-13 21:31:59 +00:00
Justin Weir
0553824a9a Fix NPE 
Apparently, this can cause an NPE when there are multiple displays.
Someone sent us
review.git.corp.google.com/c/platform/frameworks/base/+/2296938 and the problem will reoccur if we don't fix it in that code's new location.

Bug: 256539657
Test: presubmits
Change-Id: I2c08bb5606bc8af7f3da0f3034c58b5d57b1be0f
 2022-12-13 21:19:47 +00:00
Govinda Wasserman
db19b3960f Merge "Add option to return a null Dagger graph" into tm-qpr-dev 2022-12-13 21:00:06 +00:00
Selim Cinek
4d26393bce Merge "Don't re-lock if we're wake and unlocking." into tm-qpr-dev am: 5bd31e0391 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20650080

Change-Id: I4750fb47cd73509bec5adbe6cb5611dfcc4039af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:30:29 +00:00
TreeHugger Robot
ff8c03009f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e4eba0f961 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76cb168b1a06c174f73f92005b9a25151415a530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:28:15 +00:00
Bill Yi
b8dffc8198 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8349c5f2b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b981e71a1bdf5a9141336ecdf72563e7f7071c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:27:43 +00:00
TreeHugger Robot
e648968f98 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e793d9d58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb36e25ab6be13597f1d3862144d0612e730fb37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:27:29 +00:00
Bill Yi
793cdb0224 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 227eeabb5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida1db2d15a9e380146203d5ba3017a3468e74aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:27:06 +00:00
TreeHugger Robot
38adc48381 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d1993c1132 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e7a5fed4190fccd27cbaf9b78d7425101701781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:26:38 +00:00
Bill Yi
4ec250bfe4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69bed7cedf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d5b26b96f3e71003d2ad844303d7fdc1102acf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:26:09 +00:00
Varun Shah
fb56e4ac6e Fix incorrect message being sent for all intents. 
Only send the CHECK_PACKAGE_IDLE_STATE message for
ACTION_PACKAGE_CHANGED and not for ACTION_PACKAGE_ADDED.

Bug: 214580000
Test: atest UsageStatsDatabaseTest
Test: manually verify buckets are restored
Change-Id: Iac1433b9b7e3904eb7f753cd0617ac64ab6f7944
(cherry picked from commit 69f86a6475)
 2022-12-13 20:25:39 +00:00
TreeHugger Robot
1cc8fbd567 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ea391f346b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f14039e2bc80d9fb261003fa1eeac7f858cfd07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:25:39 +00:00
Bill Yi
a0099fa7d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883c7f2676 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91f656868eb3e50d239c53c55ffa799ca7aeb315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:25:07 +00:00
Automerger Merge Worker
9a03efa7ee Merge "Merge changes I21aaab57,Ie174f7ec am: d5441ca5c3" into stage-aosp-master am: 4013a4f05f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2336537

Change-Id: I68ac5044535d2ef9eb20b236cd04c01fc3774c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:14:37 +00:00
Yan Yan
f86b2d093d Merge changes I21aaab57,Ie174f7ec am: d5441ca5c3 am: 5087a7e6bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2336537

Change-Id: If6fb82c85dc041025f7c008550dacad2fe607639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:13:54 +00:00
Treehugger Robot
297508cb2e [automerger skipped] Merge "Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages" am: b8549639a3 -s ours am: 80a2e77090 -s ours 
am skip reason: Merged-In I4325565d8acaeffd4aab5a4b6295d325edb738a9 with SHA-1 cb2ba4bd13 is already in history

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

Change-Id: Ibe6128bfe20ec4eeacc2d2474bd5e932ab184b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:11:59 +00:00
bkchoi
34463586c7 [automerger skipped] Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages am: b2fafea71b -s ours am: 0d35686b0b -s ours 
am skip reason: Merged-In I4325565d8acaeffd4aab5a4b6295d325edb738a9 with SHA-1 cb2ba4bd13 is already in history

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

Change-Id: I0f603d29d3d0c62ba5d743df62062770f6c3e4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:11:45 +00:00
Selim Cinek
5bd31e0391 Merge "Don't re-lock if we're wake and unlocking." into tm-qpr-dev 2022-12-13 20:03:00 +00:00
TreeHugger Robot
e4eba0f961 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-13 19:49:16 +00:00
TreeHugger Robot
0e793d9d58 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-13 19:49:16 +00:00
TreeHugger Robot
d1993c1132 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-13 19:49:16 +00:00
TreeHugger Robot
ea391f346b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-13 19:49:16 +00:00
Automerger Merge Worker
4013a4f05f Merge "Merge changes I21aaab57,Ie174f7ec am: d5441ca5c3" into stage-aosp-master 2022-12-13 19:39:32 +00:00
Yan Yan
5087a7e6bc Merge changes I21aaab57,Ie174f7ec am: d5441ca5c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2336537

Change-Id: I41154069941fe218d91ac868d0c5678b20802dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 19:39:23 +00:00
Yan Yan
db9d5de903 Merge changes I21aaab57,Ie174f7ec am: d5441ca5c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2336537

Change-Id: Iab4fd1cc599dfc12b9aa2ee6422cff075c6542f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 19:39:23 +00:00
Treehugger Robot
80a2e77090 [automerger skipped] Merge "Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages" am: b8549639a3 -s ours 
am skip reason: Merged-In I4325565d8acaeffd4aab5a4b6295d325edb738a9 with SHA-1 cb2ba4bd13 is already in history

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

Change-Id: I3b45fe728b2dea0172876b3eedf4e5c830452fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 19:37:53 +00:00
bkchoi
0d35686b0b [automerger skipped] Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages am: b2fafea71b -s ours 
am skip reason: Merged-In I4325565d8acaeffd4aab5a4b6295d325edb738a9 with SHA-1 cb2ba4bd13 is already in history

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

Change-Id: I452732bb5322d2574f2dcf799d34bdd29e37a655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 19:37:47 +00:00
Vania Januar
acddecc160 Merge "Flag for USI low battery notifications." into tm-qpr-dev am: b3dc6d163f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20709586

Change-Id: Ib4c982904f0e85f5eace862982387440df64ff66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 19:36:23 +00:00
Alex Stetson
e28a3b8fa2 Use consistent method to get current user 
Depending on the timing of the switching actions, the
KeyguardUpdateMonitor and the user tracker may have different current
users. We should use a consistent method for getting the current user in
the KeyguardViewMediator

Bug: 250675259
Test: manual
Change-Id: I2b078ac21f0546d1b8de24f55e4225a754d53aea
 2022-12-13 11:34:50 -08:00
Michael Mikhail
3d21096ff0 [Media TTT] Add @SystemApis for new states of receiver devices 
Adds two new states that indicates if the transfer for receiver is
succeeded or failed. (ag/16730985) is a good reference.

Bug: 257301489
Test: atest MediaTttChipControllerReceiverTest
Change-Id: Ifb1d04c445235fde432b7fd3495114e61c41fd74
 2022-12-13 19:24:28 +00:00
Miranda Kephart
12056830e5 Add log when clipboard smart actions shown 
Refactors to pull the action classification into a separate class for
testing. Logic flow is unchanged.

Test: make statsd_testdrive && $ANDROID_HOST_OUT/bin/statsd_testdrive 90
Test: atest ClipboardOverlayControllerTest
Bug: 261201283
Change-Id: Ie931b2c11ef1a01c16147907d730d1dd6e5febe8
 2022-12-13 19:20:35 +00:00
Vania Januar
b3dc6d163f Merge "Flag for USI low battery notifications." into tm-qpr-dev 2022-12-13 19:20:02 +00:00
Yan Yan
d5441ca5c3 Merge changes I21aaab57,Ie174f7ec 
* changes:
  Expose APIs to configure transports to be restricted by VCN
  Add restrictions on underlying networks with VcnConfig
 2022-12-13 19:04:24 +00:00
Bryce Lee
8f1d29313d Merge "Do not allow complications when dream overlay is not enabled." into tm-qpr-dev am: ad91f3b29a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20695279

Change-Id: I70b887f879b7be0cb52298b85d4a2271c12689d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 19:00:51 +00:00
Treehugger Robot
b8549639a3 Merge "Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages" 2022-12-13 19:00:42 +00:00
Jeff DeCew
a1fbdd0a95 Merge "More exhaustive logs from NotificationWakeUpCoordinator" into tm-qpr-dev am: e845bc28c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20712497

Change-Id: I1f19ba8470e3ea43c3a4e3ee9475012ce5d54499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 18:59:54 +00:00
Pat Manning
e11447494a Merge "Prevent top app thumbnail cropping by taskbar in split overview." into tm-qpr-dev am: 04cd657102 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20666767

Change-Id: I2042a05a8f8986621ad4204364bb8a1123ca1ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 18:59:11 +00:00
Michał Brzeziński
23208bc7d1 Merge "Optimistic fix for tile not getting redistributed in split shade" into tm-qpr-dev am: 8d6cb6583f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20641209

Change-Id: I44681bf8fb863f8a476577da40e5afc549211a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 18:58:14 +00:00
Bryce Lee
ad91f3b29a Merge "Do not allow complications when dream overlay is not enabled." into tm-qpr-dev 2022-12-13 18:55:23 +00:00
Seth Moore
23fc5c8d57 Fix API feedback on AuthenticatedKeyMetadata 
Make class final.
Add @NonNull annotation to ctor param

Fixes: 262381995
Test: atest android.security.identity.cts
Change-Id: Icae24f120090ec03e532ffdf139513a1cb852c80
 2022-12-13 10:53:48 -08:00
Jeff DeCew
e845bc28c6 Merge "More exhaustive logs from NotificationWakeUpCoordinator" into tm-qpr-dev 2022-12-13 18:53:33 +00:00
Pat Manning
04cd657102 Merge "Prevent top app thumbnail cropping by taskbar in split overview." into tm-qpr-dev 2022-12-13 18:29:26 +00:00
Avichal Rakesh
375525ff41 Make ImageWriter thread safe 
The various functions in ImageWriter were not protected by a lock, which
led to segfaults under certain race conditions.

This CL adds a mutex to prevent ImageWriter methods from executing while
ImageWriter is closing. This also prevent multiple calls to close from
executing simultaneously.

It also adds a simialar mutex to WriterImageSurface to prevent
simultaneous calls to close().

Bug: 244262872
Test: mediaframeworktest:com.android.mediaframeworktest.stress
Change-Id: I44976e5a36154ce98f64e2982865b2defcec7f5e
 2022-12-13 10:17:59 -08:00
Daniel Chapin
db37a06c60 Revert "Get PackageManager from Context" 
Revert submission 2264526

Reason for revert: Droidfood blocking bug: 262191143

Reverted changes: /q/submissionid:2264526

Change-Id: I34c81e2044827cd858d67c37e491967baf701759
 2022-12-13 18:12:28 +00:00
Daniel Chapin
0d3977c185 Revert "Use waitForService() istead of getService()" 
Revert submission 2264526

Reason for revert: Droidfood blocking bug: 262191143

Reverted changes: /q/submissionid:2264526

Change-Id: I32906f3c406ec0e4c1f83671bb988ae0e5d17dff
 2022-12-13 18:12:29 +00:00
Michał Brzeziński
8d6cb6583f Merge "Optimistic fix for tile not getting redistributed in split shade" into tm-qpr-dev 2022-12-13 18:07:42 +00:00
Vali Calinescu
89f64b844f Refactor dispatching the focus event from handleWindowFocusChanged 
Bug: 262216060
Test: N/A
Change-Id: Ic2814d9665b8f293249de5fe2158f83af72517da
Merged-In: Ic2814d9665b8f293249de5fe2158f83af72517da
 2022-12-13 17:52:11 +00:00