Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
764,002 Commits 3 Branches 0 Tags
0d5d3650dfb20136aab434a7e98abcbc8b75508b
Commit Graph

764002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rhed Jao
0d5d3650df [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: e3e7ddd875 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2315f64e5912de9a7c5590247b2d020efe77bb7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 04:21:18 +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
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
535d007597 [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: f422d1ae79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9dfe715bd5ff5399f5a300106ac997a0988eb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 03:23:46 +00:00
Rhed Jao
fc0da5ebb8 [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: d28149e45d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica7dfc5b80d7a986efab8fe6a1ae44a3800a22be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 03:23:12 +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
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
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
b65b9dc604 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-dev am: 4c7c96f6c4 am: b03fbe7f51 -s ours am: 5631164db9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie216eaa29eaf8bdfbe33dad9858aa13fff7eb114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:09:53 +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
30285d92b4 Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into sc-qpr1-dev am: d6557bf574 am: 5d50827274 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190

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

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

Change-Id: I31af4ace4164bf3c138ae129187d7ff489393ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:55:52 +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
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
7720f2f16d [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-v2-dev am: cf31cd7d00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d161ad03b76e88da2c5faa6c8fcc90a8d983314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:42:13 +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
bf85986936 [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 006bb7107e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8f10859ab9bf6df5caae953e6e0ff0ba1dd1bcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:41:35 +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
Julia Reynolds
77ebe8c56c [automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-dev am: 815880be21 -s ours am: f5a1db84ea -s ours am: 07167b0bce -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: I61c7d4b60e563b43c6cd23a0f1d82688045279ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 20:06:46 +00:00
Julia Reynolds
580993c890 [automerger skipped] Merge changes from topic "presubmit-am-41f55ec06ce44b7aaf10c778037774c5-sc-dev" into sc-qpr1-dev am: 92fde680ff -s ours am: 218a268f7b -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: I847732ed37955ca71c42543236d02acdb1e0f29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 20:06:27 +00:00
Presubmit Automerger Backend
13ce7235fb [automerger skipped] [automerge] Lower per-app notificationchannel limit 2p: 36acdd6758 am: 6950f0f417 -s ours am: dada90cbb9 -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: I55cef2eff6d61857c454f27a4a2ef878c17dab9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 20:06:17 +00:00
Julia Reynolds
c0b4aeefb7 [automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-qpr1-dev am: 9595707df0 -s ours am: f16157ca1b -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: Ib99cb35e90ec75c35113ce1448628c8ccee5ca56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 20:05:41 +00:00
Julia Reynolds
6c6ceba18d [automerger skipped] Lower per-app notificationchannel limit am: 3b0929a30d -s ours am: 7fa9c4b71f -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: I585486fc7f5700c8d6b43b33485ed3c02f2ab90b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 20:05:28 +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
4904bd6725 [automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-v2-dev am: 16c4ba8c28 -s ours 
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 39b4b1e9aa is already in history

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

Change-Id: I478a4baa948ef2e4ae09b5c960c40fae29357eb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 19:51:42 +00:00
Julia Reynolds
5fe7e4d65e [automerger skipped] Lower per-app notificationchannel limit am: aa170108bd -s ours 
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 39b4b1e9aa is already in history

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

Change-Id: Ib60eac95bb9ffe38fea0e64d2e71c2b3ee35734a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 19:51:04 +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
Julia Reynolds
add484470c Merge "Lower per-app notificationchannel limit" into tm-dev 2022-10-04 19:19:06 +00:00
TreeHugger Robot
9bce00406b Merge "Ignore malformed shortcuts" into tm-dev 2022-10-04 18:15:22 +00:00
TreeHugger Robot
e7ef7b04b8 [automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-dev am: e667a6bfe2 am: f259cf50fe -s ours am: f88c3bc851 -s ours 
am skip reason: subject contains skip directive

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

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