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

765006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hawkwood Glazier
3a2ffd7e0d Merge "MediaPlayer will now transition the background with color scheme" into tm-dev 2022-12-07 23:15:07 +00:00
Pinyao Ting
63d803e611 [automerger skipped] Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev am: e51fb72b75 -s ours 
am skip reason: Merged-In I94b4e39475c7585ec67f15df1256fdf0b65f3bec with SHA-1 fa4b2dc6d8 is already in history

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

Change-Id: I3d573409718cd91d56a05276aa37281144dff58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 22:21:57 +00:00
Pinyao Ting
800028ab88 [automerger skipped] Implement a global maximum on number of shortcuts an app can publish am: 7622d6da0e -s ours 
am skip reason: Merged-In I94b4e39475c7585ec67f15df1256fdf0b65f3bec with SHA-1 fa4b2dc6d8 is already in history

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

Change-Id: Id45447edd2eca8d755f1a9b140cb0936dce7969a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 22:21:10 +00:00
Pinyao Ting
e51fb72b75 Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev 2022-12-07 22:08:54 +00:00
Pinyao Ting
7622d6da0e Implement a global maximum on number of shortcuts an app can publish 
Currently there is a limit on the number of shortcuts an app can publish
in respect to each launcher activity. This CL further implements a
global maximum of total number of shortcuts an app can publish to
mitigate from any potential system health issue.

Bug: 250576066
Test: manual
Change-Id: I94b4e39475c7585ec67f15df1256fdf0b65f3bec
Merged-In: I94b4e39475c7585ec67f15df1256fdf0b65f3bec
 2022-12-07 21:36:56 +00:00
Pinyao Ting
118fcda1c0 Merge "Implement a global maximum on number of shortcuts an app can publish" into tm-dev 2022-12-07 21:36:18 +00:00
Nate Myren
3016eca3ca [automerger skipped] Merge "RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag" into rvc-dev am: 9b00dd413d am: 3e878fd78f -s ours am: 70f6c1e320 -s ours am: ff8dbfb354 -s ours am: cc488a9fb3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d84413f588f5f514d79e62ae89b3e194037bf81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 01:20:03 +00:00
Nate Myren
34c5ea19a9 [automerger skipped] RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag am: 2f30a63b11 am: 649a4db56a -s ours am: c245ec817d -s ours am: d93f16d638 -s ours am: 730010cba3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf07a44dc092eb93dc9d2c0e83afcf56326b431e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 01:18:14 +00:00
Nate Myren
0174fc355b Merge "RESTRICT AUTOMERGE Use chain start token in performOpTransaction" into tm-dev 2022-12-07 00:53:43 +00:00
Nate Myren
cc488a9fb3 [automerger skipped] Merge "RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag" into rvc-dev am: 9b00dd413d am: 3e878fd78f -s ours am: 70f6c1e320 -s ours am: ff8dbfb354 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45413c796aa076394f05fed75f5f820dfbb91857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 23:52:01 +00:00
Nate Myren
730010cba3 [automerger skipped] RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag am: 2f30a63b11 am: 649a4db56a -s ours am: c245ec817d -s ours am: d93f16d638 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3798a934f55ccfdd2a1301a616abdc1f6e66d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 23:51:46 +00:00
Nate Myren
ff8dbfb354 [automerger skipped] Merge "RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag" into rvc-dev am: 9b00dd413d am: 3e878fd78f -s ours am: 70f6c1e320 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fd2877c7eb2295647264d9d91d494fbc8cb0d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 23:11:05 +00:00
Nate Myren
d93f16d638 [automerger skipped] RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag am: 2f30a63b11 am: 649a4db56a -s ours am: c245ec817d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41414bef7dfa8d3cf900e1175f7130b257be8e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 23:11:00 +00:00
Nate Myren
70f6c1e320 [automerger skipped] Merge "RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag" into rvc-dev am: 9b00dd413d am: 3e878fd78f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I831b232720fcacd9fbbfb2069d1198071ed56842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 21:59:53 +00:00
Nate Myren
c245ec817d [automerger skipped] RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag am: 2f30a63b11 am: 649a4db56a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36174e9ba94d38496fe372d38b8bbfdd5b58e547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 21:59:33 +00:00
Nate Myren
3e878fd78f Merge "RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag" into rvc-dev am: 9b00dd413d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621238

Change-Id: I7888e99223a3fc46536361ed4367d7462948de64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 21:23:58 +00:00
Nate Myren
649a4db56a RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag am: 2f30a63b11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621238

Change-Id: I8a4f9793b028f33c484476c02af3e68081cdfa45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 21:23:41 +00:00
Nate Myren
9b00dd413d Merge "RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag" into rvc-dev 2022-12-06 20:49:04 +00:00
Pinyao Ting
fa4b2dc6d8 Implement a global maximum on number of shortcuts an app can publish 
Currently there is a limit on the number of shortcuts an app can publish
in respect to each launcher activity. This CL further implements a
global maximum of total number of shortcuts an app can publish to
mitigate from any potential system health issue.

Bug: 250576066
Test: manual
Change-Id: I94b4e39475c7585ec67f15df1256fdf0b65f3bec
 2022-12-05 18:24:23 +00:00
Gareth Vaughan
735a3d612d Fixing test that is breaking in some environments. 
Test: atest com.android.server.pm.CrossProfileAppsServiceImplTest#startActivityAsUser_sameTask_fromProfile_success
Bug: 252837119

Cherry picked from: Ie0ca41247b80f927ef1377866d1a2d2d2deb5333

Change-Id: Ibd312b482ffe2df04eb1e33303800e2377fe203f
 2022-12-05 16:38:54 +00:00
Bill Yi
ed8cd54d93 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 411521b6a1 -s ours am: d09c03c433 -s ours am: 0b49fc62a3 -s ours am: 4bd09ef803 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e291cc2ad26ef0b4cb4d8cd69166ebac1651bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 20:28:18 +00:00
Bill Yi
4bd09ef803 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 411521b6a1 -s ours am: d09c03c433 -s ours am: 0b49fc62a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1affd77b6e393a827f1a67de3eb7d84338147fe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:56:29 +00:00
Bill Yi
0b49fc62a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 411521b6a1 -s ours am: d09c03c433 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ed7e0a9e605ed81bb22f59e9f4999fef90bbcdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:20:51 +00:00
Bill Yi
d09c03c433 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 411521b6a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7628b7a4ccb957d5f72c83ea568c03ef5fa41020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:43:06 +00:00
Bill Yi
411521b6a1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I363f6e45c4c0e8e78e55e0ae114be4250a7625db
 2022-12-03 16:15:12 -08:00
Nate Myren
ada079bc57 [automerger skipped] Merge "RESTRICT AUTOMERGE Use chain start token in performOpTransaction" into sc-dev am: 2791da2e05 am: 59e5e06858 -s ours am: 7bd2412841 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dc18a6b16426b44232f0c09010fc529b2d2df9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 23:34:10 +00:00
Nate Myren
7bd2412841 [automerger skipped] Merge "RESTRICT AUTOMERGE Use chain start token in performOpTransaction" into sc-dev am: 2791da2e05 am: 59e5e06858 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc58f95c71b97a609e50596846f338f71f0f20d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 23:02:07 +00:00
Nate Myren
42cbd4cffa Merge changes from topic "cherrypick-cherrypick-attrTokens-xdkc7c9ixz-3kymu67epe" into sc-qpr1-dev am: 0dd8a79068 am: 066b27ff56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20521154

Change-Id: I86a47090308b285a34bb70460d29a0c30c1f61cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 23:00:11 +00:00
Presubmit Automerger Backend
c507c9de20 [automerger skipped] [automerge] RESTRICT AUTOMERGE Use chain start token in performOpTransaction 2p: 9d09846798 am: 7799cef625 -s ours am: e92131811d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0708da59e748b8eebe817292928fcc3b4c3a1c2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 22:59:37 +00:00
Nate Myren
59e5e06858 Merge "RESTRICT AUTOMERGE Use chain start token in performOpTransaction" into sc-dev am: 2791da2e05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20521154

Change-Id: Id5b3027c7afe83d4aaaedf6769351af068d49a4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 22:28:04 +00:00
Nate Myren
066b27ff56 Merge changes from topic "cherrypick-cherrypick-attrTokens-xdkc7c9ixz-3kymu67epe" into sc-qpr1-dev am: 0dd8a79068 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20521154

Change-Id: I90fbd128667cb295631758e2ead5961b96752173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 22:26:58 +00:00
Presubmit Automerger Backend
e92131811d [automerger skipped] [automerge] RESTRICT AUTOMERGE Use chain start token in performOpTransaction 2p: 9d09846798 am: 7799cef625 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12ad1c0d4730965588c5ed55bf95c5c1968375c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 22:26:51 +00:00
Nate Myren
400653192c [automerger skipped] Merge "RESTRICT AUTOMERGE Use chain start token in performOpTransaction" into sc-v2-dev am: 8271269cf9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If62761a9ed84d2b0e802d63bdd1e8de9cbe42e95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 22:23:26 +00:00
Nate Myren
c7150895b9 [automerger skipped] RESTRICT AUTOMERGE Use chain start token in performOpTransaction am: 3d563d27aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I732025ee29fe54cfd24b3660865bbbeac58d0866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 22:22:49 +00:00
Nate Myren
2791da2e05 Merge "RESTRICT AUTOMERGE Use chain start token in performOpTransaction" into sc-dev 2022-12-02 22:01:36 +00:00
Nate Myren
0dd8a79068 Merge changes from topic "cherrypick-cherrypick-attrTokens-xdkc7c9ixz-3kymu67epe" into sc-qpr1-dev 
* changes:
  [automerge] RESTRICT AUTOMERGE Use chain start token in performOpTransaction 2p: 9d09846798
  RESTRICT AUTOMERGE Use chain start token in performOpTransaction
 2022-12-02 22:01:35 +00:00
Nate Myren
8271269cf9 Merge "RESTRICT AUTOMERGE Use chain start token in performOpTransaction" into sc-v2-dev 2022-12-02 22:01:16 +00:00
Liana Kazanova
534925c288 Merge "Ignore scheduled onDeviceGone call on simulated device if it is already no longer present." into tm-dev 2022-12-02 21:18:49 +00:00
Nate Myren
2f30a63b11 RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag 
If a permission has the "pre23" flag, and an app is upgrading past api
23, then we should not assume that a "development" permission remains
granted

Fixes: 259458532
Test: atest RevokeSawPermissionTest
Change-Id: I214396f455c5ed9e8bac2e50b1525b86475c81c7
 2022-12-02 18:28:35 +00:00
Yuri Lin
90a0e26194 [automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev am: e0ddfb666d am: fb7e019e1d -s ours am: a5b0e8c2e7 -s ours am: 853c9d7bb5 -s ours am: 713824873b -s ours am: 616553ab89 -s ours am: a988aef9b8 -s ours 
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 7e58ab94f9 is already in history

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

Change-Id: I71fd583624bb294539ac51ebde5157fb1449ccc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 20:15:41 +00:00
Raphael Kim
dd5a3ff6e0 Ignore scheduled onDeviceGone call on simulated device if it is already no longer present. 
Bug: 259286481
Bug: 253637009
Test: atest CtsCompanionDeviceManagerCoreTestCases
      atest CtsCompanionDeviceManagerUiAutomationTestCases
Change-Id: Ia7f5eabde8879ff4f6bc5b5cc19455bbd4164ac9
Merged-In: Ia7f5eabde8879ff4f6bc5b5cc19455bbd4164ac9
(cherry picked from commit bfbf0e4b3b)
 2022-12-01 19:55:57 +00:00
Yuri Lin
a988aef9b8 [automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev am: e0ddfb666d am: fb7e019e1d -s ours am: a5b0e8c2e7 -s ours am: 853c9d7bb5 -s ours am: 713824873b -s ours am: 616553ab89 -s ours 
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 7e58ab94f9 is already in history

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

Change-Id: Ie708b46e860cf86aac598eb65e873e91439a7b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 19:45:25 +00:00
Yuri Lin
616553ab89 [automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev am: e0ddfb666d am: fb7e019e1d -s ours am: a5b0e8c2e7 -s ours am: 853c9d7bb5 -s ours am: 713824873b -s ours 
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 7e58ab94f9 is already in history

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

Change-Id: I4fc4b90778e4013d8dcc27cafc968a87c6c3d171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 19:12:20 +00:00
Yuri Lin
713824873b [automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev am: e0ddfb666d am: fb7e019e1d -s ours am: a5b0e8c2e7 -s ours am: 853c9d7bb5 -s ours 
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 7e58ab94f9 is already in history

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

Change-Id: I7b39ce8cd9a3a02ee10762df782b70c41c3e38cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 18:35:20 +00:00
Yuri Lin
853c9d7bb5 [automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev am: e0ddfb666d am: fb7e019e1d -s ours am: a5b0e8c2e7 -s ours 
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 7e58ab94f9 is already in history

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

Change-Id: I6fb4937f1c44b59d86b3a3aa9a5539114043f454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 18:01:33 +00:00
Yuri Lin
a5b0e8c2e7 [automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev am: e0ddfb666d am: fb7e019e1d -s ours 
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 7e58ab94f9 is already in history

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

Change-Id: Ib8201e6401ad7d8bc62e634d585246f8beafa325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 17:30:34 +00:00
Yuri Lin
fb7e019e1d Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev am: e0ddfb666d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20532079

Change-Id: I1caa71c7cebf92403b53fae2d0dc71ae79cdb3fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 16:55:11 +00:00
Yuri Lin
e0ddfb666d Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev 2022-12-01 16:26:52 +00:00
Yuri Lin
2e55c7c46f [automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into rvc-dev am: 177cff5975 -s ours am: b44e95c6a0 -s ours am: 4c144d569e -s ours am: 64c4cbbcb7 -s ours am: 55f0d8adf1 -s ours 
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 b5ec639ba2 is already in history

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

Change-Id: I99ac0749378cde8e598a38444fdcd7ed3b7ff7ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 01:23:36 +00:00
Yuri Lin
4b7ee95b74 [automerger skipped] Use rule package name in addAutomaticZenRule; specify "android" for all system apps am: 7e58ab94f9 -s ours am: fd9c2777f6 -s ours am: 2a1d293135 -s ours am: cf47b7b163 -s ours am: 21436e4d0a -s ours 
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 b5ec639ba2 is already in history

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

Change-Id: I60c45dfddd266969b21c0cce1c944cf2444e53c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 01:23:07 +00:00