Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
767,696 Commits 3 Branches 0 Tags
feef24932a2f90ac15c7305477b67626e1356378
Commit Graph

767696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iván Budnik
feef24932a [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -s ours am: 489f92832d -s ours am: 3bf1fa1198 -s ours am: 96cdee8978 -s ours 
am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf1993c is already in history

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

Change-Id: Idecc05da27429bd0846a43eb12bacc7179e6e7b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 22:41:39 +00:00
Iván Budnik
96cdee8978 [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -s ours am: 489f92832d -s ours am: 3bf1fa1198 -s ours 
am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf1993c is already in history

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

Change-Id: Ib06133992738c3bc4cd641e3df1d5aa21916b8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 21:53:57 +00:00
Iván Budnik
3bf1fa1198 [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -s ours am: 489f92832d -s ours 
am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf1993c is already in history

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

Change-Id: I64d4eb75bd0c0c704a5feecb6a1f7f8700e132ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 21:27:08 +00:00
Iván Budnik
489f92832d [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -s ours 
am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf1993c is already in history

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

Change-Id: I60b655f3dfe4d4fcf17be855d8c3c53d9089745a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 20:55:48 +00:00
Iván Budnik
07afb47507 [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours 
am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf1993c is already in history

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

Change-Id: I6dbc01fcbe81e6542f1dceac50dc887fe500b17a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 20:24:25 +00:00
Iván Budnik
b243407293 Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19781337

Change-Id: Ib19add857ac741684ba902dcad62b423949618b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 19:56:47 +00:00
Iván Budnik
f8f07e22f1 Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev 2022-09-12 18:45:04 +00:00
Iván Budnik
4d54528b59 [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed18 -s ours am: 53f19e615b -s ours am: 8ae2b04df7 -s ours am: f3eb39a184 -s ours 
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.

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

Change-Id: I3943c1e52578033c533676b8a4a9e177110ceb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 18:28:14 +00:00
Iván Budnik
9c2e12697d [automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours am: 6d129d1cb2 -s ours am: e9bac010c4 -s ours am: 97226d9621 -s ours 
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.

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

Change-Id: I5f090b05c5e3a51c99671bd7824faf453447c6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 18:28:05 +00:00
Iván Budnik
f3eb39a184 [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed18 -s ours am: 53f19e615b -s ours am: 8ae2b04df7 -s ours 
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.

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

Change-Id: I98edc2ecdea889e959c99d8e2959fb2cec17e067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 17:58:23 +00:00
Iván Budnik
97226d9621 [automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours am: 6d129d1cb2 -s ours am: e9bac010c4 -s ours 
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.

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

Change-Id: I037f8a1e49bdaf5d4873e4e93ffded91e2b38279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 17:57:48 +00:00
Iván Budnik
8ae2b04df7 [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed18 -s ours am: 53f19e615b -s ours 
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.

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

Change-Id: Ifd242a291cd5c9b747420f70ba18503b79f35e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 17:19:49 +00:00
Iván Budnik
e9bac010c4 [automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours am: 6d129d1cb2 -s ours 
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.

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

Change-Id: I441e0da4d50ddd7254e5d55af39bb660e7bee65b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 17:19:41 +00:00
Iván Budnik
53f19e615b [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed18 -s ours 
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I4f4b03ae8aee39d135571ec0decc055af54d0a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 16:53:50 +00:00
Iván Budnik
6d129d1cb2 [automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours 
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ib88aedb7bcac4806ecf7250fd92db81ccaacad48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 16:53:48 +00:00
Iván Budnik
094e9f8046 Revert "Enforce ComponentName belongs to caller app" 
This reverts commit ff7be9912f.

Reason for revert: b/241798893. Note: this fix is not the root cause of the breakage. It just exposes a previously unknown bug. See linked bug.

Change-Id: I7da45dfedace793085da06697976d189e8e7fbdb
Merged-In: Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709
 2022-09-09 16:30:46 +00:00
Iván Budnik
c59352ed18 Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev 2022-09-09 16:17:34 +00:00
Evan Severson
9981a55437 [automerger skipped] Merge "Make sure parallel broadcasts enforce excluded permissions" into sc-dev am: 3f015cbc5e -s ours am: 789a752f05 -s ours am: 414f992fe4 -s ours am: 652ea18323 -s ours 
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history

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

Change-Id: Idd484df9e37d9215da15234f34ee42ad6a8045d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 06:01:09 +00:00
Evan Severson
5cdeed0ea0 [automerger skipped] Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-qpr1-dev am: 7493908364 am: b45d936f2f -s ours am: 945fca327c -s ours 
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history

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

Change-Id: I62cb4e2ed457e7f680ccf6e13fad84fe33cc0439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 06:01:02 +00:00
Evan Severson
652ea18323 [automerger skipped] Merge "Make sure parallel broadcasts enforce excluded permissions" into sc-dev am: 3f015cbc5e -s ours am: 789a752f05 -s ours am: 414f992fe4 -s ours 
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history

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

Change-Id: I479444650a790e87cf1e2a960777398f3ed83d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 05:31:03 +00:00
Evan Severson
945fca327c [automerger skipped] Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-qpr1-dev am: 7493908364 am: b45d936f2f -s ours 
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history

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

Change-Id: I8f9833180ab25784ec07cf6dd76f46ba8527def8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 05:29:43 +00:00
Evan Severson
414f992fe4 [automerger skipped] Merge "Make sure parallel broadcasts enforce excluded permissions" into sc-dev am: 3f015cbc5e -s ours am: 789a752f05 -s ours 
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history

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

Change-Id: I0c2f7d9ee89e353d0c3bfd0d7a1551e9965b0ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 05:05:22 +00:00
Evan Severson
b45d936f2f Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-qpr1-dev am: 7493908364 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529

Change-Id: I0914a42348807b2da489cb9a448a6de3ced5c385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 05:05:14 +00:00
Evan Severson
e41acf9128 [automerger skipped] Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into tm-dev am: bc7b243dd7 -s ours 
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 ef9b368d1b is already in history

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

Change-Id: I0083e53a28111f281dbab5c560f1ef94e19d56aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 05:05:06 +00:00
Presubmit Automerger Backend
eca7ed33ab [automerger skipped] [automerged blank] Make sure parallel broadcasts enforce excluded permissions 2p: 0eee4fa476 2p: 77b3537fe3 am: e4f2f3e43d -s ours 
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 ef9b368d1b is already in history

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

Change-Id: Id7c355d69e1fd378a8fcc5dbc48fa8dbb909761d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 05:05:01 +00:00
Evan Severson
789a752f05 [automerger skipped] Merge "Make sure parallel broadcasts enforce excluded permissions" into sc-dev am: 3f015cbc5e -s ours 
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history

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

Change-Id: Ib3221584615d5041294acd7c52f5d4e666e32f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 05:04:50 +00:00
Evan Severson
3f015cbc5e Merge "Make sure parallel broadcasts enforce excluded permissions" into sc-dev 2022-09-09 04:31:40 +00:00
Evan Severson
bc7b243dd7 Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into tm-dev 
* changes:
  [automerged blank] Make sure parallel broadcasts enforce excluded permissions 2p: 0eee4fa476 2p: 77b3537fe3
  [automerge] Make sure parallel broadcasts enforce excluded permissions 2p: 0eee4fa476
  Make sure parallel broadcasts enforce excluded permissions
 2022-09-09 04:31:40 +00:00
Evan Severson
7493908364 Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-qpr1-dev 
* changes:
  [automerge] Make sure parallel broadcasts enforce excluded permissions 2p: 0eee4fa476
  Make sure parallel broadcasts enforce excluded permissions
 2022-09-09 04:31:39 +00:00
Andrew Solovay
c7a544b14d Merge "Fix example AGSL code in the javadoc comments" into tm-dev am: 89acf500cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19889898

Change-Id: I5662d5a95cf096961329272a3634e0096cbfae1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 19:19:56 +00:00
Andrew Solovay
89acf500cb Merge "Fix example AGSL code in the javadoc comments" into tm-dev 2022-09-08 18:47:00 +00:00
TreeHugger Robot
8a0f592d2a Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev am: 95e397a8b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19436694

Change-Id: I4cb48212ba44da33fbc6a423862e35bc6ca54efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 17:10:07 +00:00
TreeHugger Robot
95e397a8b8 Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev 2022-09-08 16:35:29 +00:00
Yuri Lin
91d7bdf92b [automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into qt-dev am: 3fe8fdc4dc am: 85d0cb310c -s ours am: 4bc4a7d756 -s ours am: 5725377e5c -s ours am: c73ff23f81 -s ours am: 25ab88ccc3 -s ours am: 4082fa21aa -s ours am: dbb75ee7a6 -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 0b262d0ae5 is already in history

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

Change-Id: I321eaa5dc5437f09a612c5eb539f956fb20432d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:51:59 +00:00
Yuri Lin
58741d2d22 [automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into rvc-dev am: 06377249c0 -s ours am: b6ae840c5d -s ours am: 697d4897cf -s ours am: c8db189722 -s ours am: dd16618bbc -s ours am: b322597c8d -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 2ceaaebb3c is already in history

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

Change-Id: I975571fbadf47981c6fa7d7398e9ff980fa80c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:51:52 +00:00
Yuri Lin
ae32f947f7 [automerger skipped] Fix system zen rules by using owner package name if caller is system am: 0b262d0ae5 -s ours am: cb57bce342 -s ours am: d38cce80f9 -s ours am: aeaa857792 -s ours am: 67404594af -s ours am: 064625ee1b -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 2ceaaebb3c is already in history

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

Change-Id: I9b3cbf5f427315113d3501446a3a62e2f446022c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:51:51 +00:00
Yuri Lin
3d516306d5 [automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into rvc-qpr-dev am: e3434b5548 -s ours am: dcbabe5a88 -s ours am: 99716a27a5 -s ours am: fc3d6c843f -s ours am: 497f6535ba -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history

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

Change-Id: Ic4623efedfe12314689c2384496eff33a825e17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:51:37 +00:00
Yuri Lin
00330c0e27 [automerger skipped] Fix system zen rules by using owner package name if caller is system am: 2ceaaebb3c -s ours am: e0a4c485a3 -s ours am: 01f768455e -s ours am: f91eb44aff -s ours am: 36cbffd53a -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history

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

Change-Id: I929a3f0c192be66ee903d58e2524a86080cc3fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:51:36 +00:00
TreeHugger Robot
fc2f6f2b76 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission for VoiceInteraction" into qt-dev am: cef7f19369 am: 14246ca9b8 -s ours am: 3a946e8c95 -s ours am: 4be854db74 -s ours am: e67265edf2 -s ours am: 1bc1463396 -s ours am: 3af55abe0f -s ours am: f8b3a24e24 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62130f5e5221bd174800d7f657086370374a02f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:51:24 +00:00
Ivan Chiang
f98543ddfb [automerger skipped] [RESTRICT AUTOMERGE] Check permission for VoiceInteraction am: e4e77f4570 am: 8862cac366 -s ours am: ee0f678dcf -s ours am: 9e5f614a13 -s ours am: 1cb961704f -s ours am: ede179453b -s ours am: 4df23a821e -s ours am: 3a61daa5cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6a9495d85bc1fdbd508c9e8d9df02e2de7cdf26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:51:23 +00:00
TreeHugger Robot
65f9ccd3c4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission for VoiceInteraction" into rvc-dev am: 5f0da27aab am: db0918e39a -s ours am: b442594b71 -s ours am: 5bc1fbb7f4 -s ours am: 407d34205d -s ours am: 4af266fb67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf659f8451c9308d285d8316c61fb9e22dbd8e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:51:09 +00:00
Ivan Chiang
a0832001ec [automerger skipped] [RESTRICT AUTOMERGE] Check permission for VoiceInteraction am: 525690ce16 am: f6ab03e679 -s ours am: 2bc68fb4ad -s ours am: 765ebaaf71 -s ours am: 8ece04b098 -s ours am: 13b1e54879 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3132ba3696b5cc6b6aa886f56b07f9b914cf515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:51:08 +00:00
TreeHugger Robot
23fddc1ffb [automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission for VoiceInteraction" into rvc-qpr-dev am: 4d31d49108 -s ours am: b1aba9a8e9 -s ours am: 7b30baa0e7 -s ours am: a9da1d834a -s ours am: b6acbe1445 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf523aa93fa60ab445fc3d8c1059bb0185539f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:50:35 +00:00
Ivan Chiang
6926fb0e5b [automerger skipped] [RESTRICT AUTOMERGE] Check permission for VoiceInteraction am: 25834066d3 -s ours am: 9265c1a9bc -s ours am: fae8cdb569 -s ours am: b2e9eaf6d0 -s ours am: 0805aff0b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I997ebe1079d76c5eafa091149f141f815baa0057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:50:34 +00:00
Yuri Lin
1eb9a20cfa [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into qt-dev am: 380ec03dee am: e5fdd7f0de -s ours am: ae6b8569a3 -s ours am: 36de09dab8 -s ours am: 6f0bda9117 -s ours am: 98bd7eb129 -s ours am: c8f0bfea4e -s ours am: 66b29d5dbb -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 1fcd99f5aa is already in history

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

Change-Id: Ibc9a7d01f394b052b2f4ac0861b5d63cd46e98ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:50:16 +00:00
Yuri Lin
0615f7704f [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into rvc-dev am: 6df0223ee6 -s ours am: 3809613ecd -s ours am: 6ae0f72e44 -s ours am: 6801026e8f -s ours am: 24b1e06aaa -s ours am: 8fb250630e -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 5b0c4af9ba is already in history

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

Change-Id: I7059158c023e85d25089fde5b89782ca655b62e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:49:46 +00:00
Yuri Lin
252374e553 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 1fcd99f5aa -s ours am: b7b76c0b92 -s ours am: fa763850dd -s ours am: bd3ab08c34 -s ours am: 52d8e078d9 -s ours am: 7c4c1ef521 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 5b0c4af9ba is already in history

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

Change-Id: I87812a173d5ab49db1e1702e72eee009fd75186d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:49:45 +00:00
Yuri Lin
5057ea0c3b [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into rvc-qpr-dev am: 0b50f9cd27 -s ours am: c74c781cfd -s ours am: 8a8ae45e0d -s ours am: 8082d2f1d6 -s ours am: ce630b213d -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 19bc2c3559 is already in history

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

Change-Id: I38fe10e57af5388fb3563668fb7744fffa1c9e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:49:36 +00:00
Yuri Lin
6ac2718d4b [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 5b0c4af9ba -s ours am: f98751379a -s ours am: 5560692e83 -s ours am: b2d799cf44 -s ours am: a4001f34e2 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 19bc2c3559 is already in history

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

Change-Id: I2f883033a349b241398574b938159e3b72370943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:49:35 +00:00
Liana Kazanova
b4177575e1 [automerger skipped] Merge "[conflict] [conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8cd2 am: 9f864c4b23 am: ef2a1d60be am: 043b90b360" into sc-dev am: b62eeefe44 am: 7a601f8e70 -s ours am: c89d81e29b -s ours am: 8f8d4940e6 -s ours 
am skip reason: Merged-In I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96 with SHA-1 8c2c7b4164 is already in history

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

Change-Id: Ib6899a144fe68c4ecc921f2bf24d9c677fc4a4f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:49:22 +00:00