Andy Hung
|
ef3ecceecd
|
Merge "SpatializerHelper: Fix device compatibility with spatial audio" am: fe4b37a3ac am: 7d35eaf6d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2209998
Change-Id: I9980559698ffc3496dbce5a78a6300cc12eac763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 18:22:15 +00:00 |
|
Andy Hung
|
7d35eaf6d7
|
Merge "SpatializerHelper: Fix device compatibility with spatial audio" am: fe4b37a3ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2209998
Change-Id: Ic566e0fc5fd9ab05992795176137a799052cb5fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 17:51:03 +00:00 |
|
Andy Hung
|
fe4b37a3ac
|
Merge "SpatializerHelper: Fix device compatibility with spatial audio"
|
2022-09-08 17:21:09 +00:00 |
|
TreeHugger Robot
|
cf4f22e8a7
|
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: I2efd872d8bdf6e4e49f7d15d042eaac0a504a2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 17:07:32 +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 |
|
Mårten Kongstad
|
d7e5f37d5c
|
Merge "Update droidstubs to use the SdkExt info file" am: 3312d073cb am: 74c2f2abd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2207622
Change-Id: I29f3edcca75cefc4b3d021c868ea7fa929760a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 06:58:54 +00:00 |
|
Mårten Kongstad
|
74c2f2abd8
|
Merge "Update droidstubs to use the SdkExt info file" am: 3312d073cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2207622
Change-Id: Id488984ced136b1a0ac05cbb926473080505b4ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 06:29:55 +00:00 |
|
Mårten Kongstad
|
3312d073cb
|
Merge "Update droidstubs to use the SdkExt info file"
|
2022-09-08 06:08:43 +00:00 |
|
Bill Yi
|
788bb1c522
|
[automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: dc07ebeaa7 -s ours
am skip reason: Merged-In I04913ce45215927a413bad4828e997ff22ca30b5 with SHA-1 25334d16a4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19881455
Change-Id: I5d0422c060ba7a402d5efe7bed78490e26ba8b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 03:14:21 +00:00 |
|
Bill Yi
|
5b049490b2
|
[automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: ab29b767ec -s ours
am skip reason: Merged-In I04913ce45215927a413bad4828e997ff22ca30b5 with SHA-1 25334d16a4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19881455
Change-Id: I4c5bbcfef7a9d9ddc39c904f4435a8b91e82ae21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 03:14:11 +00:00 |
|
Bill Yi
|
dc07ebeaa7
|
Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master
|
2022-09-08 02:32:31 +00:00 |
|
Yuri Lin
|
fc6636c874
|
[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: I1c79ab13efdab5b2d3fa06ad93110106b6538915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:51:49 +00:00 |
|
Yuri Lin
|
1510087a62
|
[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: I7152c90a0ef18b6e0f9113029903107d826460cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:51:35 +00:00 |
|
Yuri Lin
|
ad8a2f539f
|
[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: I92546c4044e3a2e413634cff10bb35c712d46e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:51:29 +00:00 |
|
Yuri Lin
|
bf99a87125
|
[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: I893466c69e89685578f883e9c636a44e84101685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:50:48 +00:00 |
|
Yuri Lin
|
ee929a4d51
|
[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: I4be27240a65897b0324d77fa5f2e691242e3818e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:50:43 +00:00 |
|
TreeHugger Robot
|
4fd5800e0c
|
[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: I9366ec258bd83b880335465e6e0d9dbfdc75a400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:50:26 +00:00 |
|
Ivan Chiang
|
5708978f95
|
[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: I7343d711567222578a4bddef459b940d7ecb318b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:50:14 +00:00 |
|
TreeHugger Robot
|
7d09110d0a
|
[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: I3ef1b3182a5a3712792a95471912c3e96b6014ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:49:54 +00:00 |
|
Ivan Chiang
|
f22d3a58d9
|
[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: I82b7f24ab7c91cb1238d4d5930d268c67d47b66a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:49:48 +00:00 |
|
TreeHugger Robot
|
143eb2e18f
|
[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: I2b7c0e854184a33ab9c8ae248aa7697951792aab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:49:17 +00:00 |
|
Ivan Chiang
|
e46d31c1e8
|
[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: I4bfee95e82f3847d8a286d1b0bda88738f77b971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:49:10 +00:00 |
|
Yuri Lin
|
fe0059f9cd
|
[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: I36faaa703100fce0da6898e40e972faae777f710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:48:38 +00:00 |
|
Yuri Lin
|
616f15eab8
|
[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: I6519731875d501b2ce8aea6f8d5774c8e3219999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:48:08 +00:00 |
|
Yuri Lin
|
3471ad5c0e
|
[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: Id2cbccb9ac8c462283bd02ce94437e118952d3f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:47:57 +00:00 |
|
Yuri Lin
|
cf4d208802
|
[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: I639ea48b56f19672c2a8da3fb551a00d7e4a48ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:47:34 +00:00 |
|
Yuri Lin
|
2397aec5f7
|
[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: Ica39a82892ae61f68e45c01d6d0c91b4a5bc5070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:47:24 +00:00 |
|
Liana Kazanova
|
a99fc52df3
|
[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: I04a00e5067363a869e69f3e63ad869d6838290c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:46:30 +00:00 |
|
Yuri Lin
|
dbb75ee7a6
|
[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 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: I31ea25f8a73556cf56958de6161b1ebc250eb41f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:22:39 +00:00 |
|
Yuri Lin
|
b322597c8d
|
[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 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: Ie395d0a91dcc65f7cf9a58fa9f1c377d46ae7cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:22:01 +00:00 |
|
Yuri Lin
|
064625ee1b
|
[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 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: I6c1b18474e45e900ddf119c49d7166108c42f0f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:21:41 +00:00 |
|
Yuri Lin
|
497f6535ba
|
[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 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: I45774b8d6cb670d87dbbbb1fa852fd0cd543f039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:21:08 +00:00 |
|
Yuri Lin
|
36cbffd53a
|
[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 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: Icf5156bfe9b5e9a8168dd709f99766c7d05574b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:20:56 +00:00 |
|
TreeHugger Robot
|
f8b3a24e24
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803236
Change-Id: I8311a019adfd465d174cc97d963289685ea3cf17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:19:55 +00:00 |
|
Ivan Chiang
|
3a61daa5cb
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803236
Change-Id: I21eda05c606019230bbd436d93ae38001f5e7bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:19:44 +00:00 |
|
TreeHugger Robot
|
4af266fb67
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18708335
Change-Id: I1e7ab04ccb0cc053afacb30e612e27e719106e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:19:00 +00:00 |
|
Ivan Chiang
|
13b1e54879
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18708335
Change-Id: I61999932ea671a38288617aff838c1c338d51a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:18:48 +00:00 |
|
TreeHugger Robot
|
b6acbe1445
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803235
Change-Id: I63ffc64d559612f773eda2a4341ce014d8a584eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:18:24 +00:00 |
|
Ivan Chiang
|
0805aff0b2
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803235
Change-Id: Ia9ca52c3561bbbc5d1496976dd143e830cf7df8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:18:13 +00:00 |
|
Yuri Lin
|
66b29d5dbb
|
[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 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: I1ad0036130352daef970b66e174b1e2b6432cdd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:17:53 +00:00 |
|
Lorena Torres-Huerta
|
5bad8d2717
|
[automerger skipped] Merge changes from topic "media_common_types_version_bump" am: 29e60dca12 am: 76bac9b9fb -s ours
am skip reason: Merged-In If5a96c05b6448b588aa6326225dc6962ca7da6c7 with SHA-1 9b9ce2a4cb is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2203459
Change-Id: Ie40c5e3789b380bd9cc88440fee36e2a74bcdeca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:17:37 +00:00 |
|
Yuri Lin
|
8fb250630e
|
[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 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: If6b54b5264754400607d6599de507224516b8dc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:17:31 +00:00 |
|
Lorena Torres-Huerta
|
99fc8045b8
|
[automerger skipped] Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration. am: 4cd3884564 am: 90ed92fd64 -s ours
am skip reason: Merged-In I481d4b4e7b4f1302d508ab6eb2c7ed4336a8f801 with SHA-1 cd5387e2df is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2203458
Change-Id: Ia2408922f0cdf623ea88b7d703ab05f9f04680e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:17:29 +00:00 |
|
Yuri Lin
|
7c4c1ef521
|
[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 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: I632a63d4c594657d91cbeda9fa72a83412a012ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:17:01 +00:00 |
|
Yuri Lin
|
ce630b213d
|
[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 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: I0330b599fe08ff6744b0e7bf8a3149cf2cc43fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:16:39 +00:00 |
|
Yuri Lin
|
a4001f34e2
|
[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 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: Ia2e9977303ab4a38d9fb38571b3c3e03fe55b181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:16:28 +00:00 |
|
Liana Kazanova
|
8f8d4940e6
|
[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 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: Id6505c67a5fdc489611b2140e8d4cdae4504d32f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-08 00:15:52 +00:00 |
|
Lorena Torres-Huerta
|
76bac9b9fb
|
Merge changes from topic "media_common_types_version_bump" am: 29e60dca12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2203459
Change-Id: Ida1d144439a9662c230c0ed132031c558020018b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-07 23:55:30 +00:00 |
|
Lorena Torres-Huerta
|
90ed92fd64
|
Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration. am: 4cd3884564
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2203458
Change-Id: Ib0b019bcb015ea0cb6cb151bae1b11507ce7a281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-07 23:55:22 +00:00 |
|
Yuri Lin
|
4082fa21aa
|
[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 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: I59aa3249853bf0f8f56fd63b0deb13deaf29cfdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-07 23:52:30 +00:00 |
|