Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,277 Commits 3 Branches 0 Tags
d46ebb9419db3ab8b34ff440d43ca4e0c4576deb
Commit Graph

661277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hao Ke
d46ebb9419 Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 am: 64e4cbc1d8 am: ac02d51ea3 am: c3cde6206d am: 926e1629cb am: ce4b0d45ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: I4d7dccbd1962f43c882993933ed96ebdc1fd8946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 22:17:12 +00:00
Hao Ke
ce4b0d45ac Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 am: 64e4cbc1d8 am: ac02d51ea3 am: c3cde6206d am: 926e1629cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: I3a6b174d8925ff17220621a561d6d9c8209fec70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 21:43:46 +00:00
Hao Ke
926e1629cb Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 am: 64e4cbc1d8 am: ac02d51ea3 am: c3cde6206d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: If9b55443b1b382f4f555133804a0615b90a9a4b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 21:11:26 +00:00
Hao Ke
c3cde6206d Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 am: 64e4cbc1d8 am: ac02d51ea3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: Ia84e89e68912e5e11c38ebb3afa8258b9143491b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 20:35:15 +00:00
Hao Ke
ac02d51ea3 Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 am: 64e4cbc1d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: I8ebe172f9d76d5b21e3beb0f99b36189511fc71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 20:05:33 +00:00
Hao Ke
64e4cbc1d8 Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: I38314b7569ac5e5fbdffc43b734ec996178e7c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 19:29:54 +00:00
Hao Ke
459808b2c0 Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev 2022-10-05 18:40:44 +00:00
Rhed Jao
c8ac3211e7 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours am: 886fab1952 -s ours am: 3d7a421abf -s ours am: 5211157050 -s ours am: 4faaa465d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabe2294a31478ef275fb7ca45b3bb179f5c9bf73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 03:55:42 +00:00
Rhed Jao
e3e7ddd875 [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f am: cd6e9585b9 -s ours am: 0de1dbc4f4 -s ours am: 83ca24a005 -s ours am: 92bc927537 -s ours am: 1a1e56a0ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49ebabddd612473ebe3303262c136bdbacdf53ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 03:55:33 +00:00
Rhed Jao
4faaa465d9 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours am: 886fab1952 -s ours am: 3d7a421abf -s ours am: 5211157050 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3cf95bdb48a8dfa33a60993ce55273325557878f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 03:26:04 +00:00
Rhed Jao
1a1e56a0ad [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f am: cd6e9585b9 -s ours am: 0de1dbc4f4 -s ours am: 83ca24a005 -s ours am: 92bc927537 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02af6591a1192f89f5418f223c8daccf940b6377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 03:25:52 +00:00
Rhed Jao
f422d1ae79 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into rvc-dev am: 32a7d30650 am: 6fa037454b -s ours am: 0e9238a6a9 -s ours am: 8b6d7ebee8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If22f4464fc16b894885b3eb08791ecafe07af067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:41:43 +00:00
Rhed Jao
d28149e45d [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 5e98f26759 am: 2246ebbdd2 -s ours am: 38d3bfcc1e -s ours am: f75baf4efb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74f13a4249210d0a5171f78b394c2973c046db2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:41:35 +00:00
Rhed Jao
5211157050 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours am: 886fab1952 -s ours am: 3d7a421abf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbdf58f325db7a8d55f518642f53def5a72946be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:40:43 +00:00
Rhed Jao
92bc927537 [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f am: cd6e9585b9 -s ours am: 0de1dbc4f4 -s ours am: 83ca24a005 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I584d6246600b023341472de53fa976ef45368830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:40:20 +00:00
Rhed Jao
8b6d7ebee8 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into rvc-dev am: 32a7d30650 am: 6fa037454b -s ours am: 0e9238a6a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50d6fce1f155061a9382d946c2ad1261f8786249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:11:33 +00:00
Rhed Jao
f75baf4efb [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 5e98f26759 am: 2246ebbdd2 -s ours am: 38d3bfcc1e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I378b3c0c0b8ee7e3302537cf5115f3b44d9bf764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:11:32 +00:00
Rhed Jao
3d7a421abf [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours am: 886fab1952 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifaedeab25092163958160adb1715e20f9a4e89d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:10:22 +00:00
Rhed Jao
83ca24a005 [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f am: cd6e9585b9 -s ours am: 0de1dbc4f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4c575780940c4d20cc1241ee15acd390a73c398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:10:03 +00:00
Rhed Jao
0e9238a6a9 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into rvc-dev am: 32a7d30650 am: 6fa037454b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6a458d416da2459765d82e97182b895ce4ed5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:10:17 +00:00
Rhed Jao
886fab1952 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6acb4026cb6b949dd5158a84274fe539306480cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:10:04 +00:00
Rhed Jao
38d3bfcc1e [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 5e98f26759 am: 2246ebbdd2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56f6c12c3058ac9f8164c5fd134f4dc351157c3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:09:45 +00:00
Rhed Jao
0de1dbc4f4 [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f am: cd6e9585b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f13363fb41ece156b858755174244cc875d5099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:09:40 +00:00
Rhed Jao
5631164db9 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-dev am: 4c7c96f6c4 am: b03fbe7f51 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I702671fac8c0ffd80322de9c428d8706bcdb4554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:58:54 +00:00
Rhed Jao
b03fbe7f51 Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-dev am: 4c7c96f6c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190

Change-Id: I65adefcb807973bcb0da6524149311731598a7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:44:55 +00:00
Rhed Jao
5d50827274 Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into sc-qpr1-dev am: d6557bf574 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190

Change-Id: I7e6fbb8039ae5521512f1d49a41ad8ff73c90c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:44:36 +00:00
Rhed Jao
4ec2b1ec8f [automerger skipped] [automerge] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting 2p: 2447359037 am: ecee7cb098 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47611e55e943953c44536903326a05d1994650cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:44:32 +00:00
Rhed Jao
806167eda3 Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305

Change-Id: I8657b8b6d1f46889a61d9ecd4af6e834df4ba544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:43:47 +00:00
Rhed Jao
cd6e9585b9 [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305

Change-Id: I717dc0210b91048ac79afb2ef0d22dc9a266802f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:43:40 +00:00
Rhed Jao
6fa037454b Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into rvc-dev am: 32a7d30650 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061344

Change-Id: Id28a913c468097ffbdb5a8ac3f65d83f21e62be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:42:30 +00:00
Rhed Jao
2246ebbdd2 [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 5e98f26759 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061344

Change-Id: I1037ef22c1d1204c4e45e484542ed27448094be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:42:12 +00:00
Rhed Jao
4727daddff Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev 2022-10-05 00:12:20 +00:00
Rhed Jao
32a7d30650 Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into rvc-dev 2022-10-05 00:12:02 +00:00
Rhed Jao
4c7c96f6c4 Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-dev 2022-10-05 00:11:27 +00:00
Rhed Jao
d6557bf574 Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into sc-qpr1-dev 
* changes:
  [automerge] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting 2p: 2447359037
  [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting
 2022-10-05 00:11:26 +00:00
Rhed Jao
cf31cd7d00 Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-v2-dev 2022-10-05 00:10:52 +00:00
Hao Ke
eb9a0566a5 Add safety checks on KEY_INTENT mismatch. 
For many years, Parcel mismatch typed exploits has been using the
AccoungManagerService's passing of KEY_INTENT workflow, as a foothold of
launching arbitrary intents. We are adding an extra check on the service
side to simulate the final deserialization of the KEY_INTENT value, to
make sure the client side won't get a mismatched KEY_INTENT value.

Bug: 250588548
Bug: 240138294
Test: atest CtsAccountManagerTestCases
Test: local test, also see b/250588548
Change-Id: I433e34f6e21ce15c89825044a15b1dec46bb25cc
 2022-10-04 22:07:34 +00:00
Julia Reynolds
07167b0bce [automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-dev am: 815880be21 -s ours am: f5a1db84ea -s ours 
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 36acdd6758 is already in history

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

Change-Id: Ia7c26c7c3060e9d1a38323fc0d8ed3ee42e7021c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 19:57:38 +00:00
Julia Reynolds
218a268f7b [automerger skipped] Merge changes from topic "presubmit-am-41f55ec06ce44b7aaf10c778037774c5-sc-dev" into sc-qpr1-dev am: 92fde680ff -s ours 
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 3b0929a30d is already in history

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

Change-Id: I569ae9b3bc660f5c325570ca213a63969c97db75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 19:57:08 +00:00
Presubmit Automerger Backend
dada90cbb9 [automerger skipped] [automerge] Lower per-app notificationchannel limit 2p: 36acdd6758 am: 6950f0f417 -s ours 
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 3b0929a30d is already in history

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

Change-Id: Ib382c32f8a727d89bde0a480b2a3bf87d175f96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 19:57:05 +00:00
Julia Reynolds
f16157ca1b [automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-qpr1-dev am: 9595707df0 -s ours 
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 aa170108bd is already in history

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

Change-Id: I2257bf2950ab6009debb371093bdb5e239e8bac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 19:55:11 +00:00
Julia Reynolds
7fa9c4b71f [automerger skipped] Lower per-app notificationchannel limit am: 3b0929a30d -s ours 
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 aa170108bd is already in history

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

Change-Id: I05c4baa3cd0e759f240fb1d8786fd1c76cf26e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 19:55:02 +00:00
Julia Reynolds
f5a1db84ea [automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-dev am: 815880be21 -s ours 
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 36acdd6758 is already in history

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

Change-Id: I62f6df9c39dcef61a91aa8b5a6322a7e1732d8da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 19:51:45 +00:00
Julia Reynolds
815880be21 Merge "Lower per-app notificationchannel limit" into sc-dev 2022-10-04 19:19:52 +00:00
Julia Reynolds
92fde680ff Merge changes from topic "presubmit-am-41f55ec06ce44b7aaf10c778037774c5-sc-dev" into sc-qpr1-dev 
* changes:
  [automerge] Lower per-app notificationchannel limit 2p: 36acdd6758
  Lower per-app notificationchannel limit
 2022-10-04 19:19:52 +00:00
Julia Reynolds
9595707df0 Merge "Lower per-app notificationchannel limit" into sc-qpr1-dev 2022-10-04 19:19:17 +00:00
Julia Reynolds
16c4ba8c28 Merge "Lower per-app notificationchannel limit" into sc-v2-dev 2022-10-04 19:19:13 +00:00
TreeHugger Robot
f88c3bc851 [automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-dev am: e667a6bfe2 am: f259cf50fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie84f5af18d5e6ac082564ad11c1351e4bcd8e193
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 01:30:24 +00:00
Pinyao Ting
56d11db9b5 [automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev am: 9e3aecfce1 am: f552951850 -s ours am: c03b0e2d78 -s ours am: e1db2fe6a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7749a1764871655d9f5d90e03738c8e3ba0ae19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 01:30:17 +00:00
Pinyao Ting
ac01de83cb [automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: a8fe41afb0 am: 10033535fc -s ours am: 5774c8409a -s ours am: a8ab42d12e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e0a1960c361eb6630a3e58e007ae96d3daec7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 01:30:15 +00:00