Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
839,964 Commits 3 Branches 0 Tags
ceee53dc36fccdb9f72ce55e98fe10015aaebe29
Commit Graph

839964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rhed Jao
ceee53dc36 Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into sc-qpr1-dev am: d6557bf574 am: 5d50827274 am: 30285d92b4 am: 4e5e478715 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190

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

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

Change-Id: I46eee76578f208ed92726b1101d4f5abfe4daa10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:15:48 +00:00
Ale Nijamkin
592858a152 Merge "UserSwitcherController impl uses UserInteractor" into tm-qpr-dev am: 37f4b300c6 am: 106f08490c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20090976

Change-Id: I8658fda5a99291f1978427d975f9e28bb3ac6713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:14:56 +00:00
Rhed Jao
86e4f7f6ba [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-v2-dev am: cf31cd7d00 -s ours am: 7720f2f16d -s ours am: 8a64609167 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25ece29cbc13a7aad3c86366790bc74d0b94720d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:14:11 +00:00
Rhed Jao
ee64b47905 [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 006bb7107e -s ours am: bf85986936 -s ours am: 7aba6d535b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81026bdc3a93bcb45c7142d93650fcc280c8bec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:13:53 +00:00
TreeHugger Robot
e436b2988a Merge "Annotate KeyStore service as never null" 2022-10-05 01:57:11 +00:00
Ale Nijamkin
106f08490c Merge "UserSwitcherController impl uses UserInteractor" into tm-qpr-dev am: 37f4b300c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20090976

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

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

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

Change-Id: Ia07404ec2cdca5bbbaa66636b311cb987cd1113e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:13:06 +00:00
Rhed Jao
8a64609167 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-v2-dev am: cf31cd7d00 -s ours am: 7720f2f16d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77549503094e2724e3eab99875d91184ea6abca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:12:39 +00:00
Rhed Jao
7aba6d535b [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 006bb7107e -s ours am: bf85986936 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0e1cc3246038294699af21b939124bfc6c25e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:12:25 +00:00
TreeHugger Robot
06652ca635 Merge "Optimize IMMS#setAdditionalInputMethodSubtypes() a bit for bg users" 2022-10-05 01:06:47 +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
Ale Nijamkin
37f4b300c6 Merge "UserSwitcherController impl uses UserInteractor" into tm-qpr-dev 2022-10-05 00:55:08 +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
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
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
Menghan Li
d8d61664c2 Merge "Provide ability to link to text reading page" 2022-10-05 00:21:35 +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
Automerger Merge Worker
c2767dc438 Merge changes from topic "am-ccfd42f404e2449db33d745d6ec7bf42" 
* changes:
  [automerger skipped] Merge changes from topic "tm-qpr-proc-start-triggers" into tm-qpr-dev am: a04b35b697 am: cb077acdbd -s ours
  [automerger skipped] Add push messaging as a trigger for proc start am: 8fcf1d63c6 am: f4551d3187 -s ours
  [automerger skipped] Cleaning up duplicate proto for ProcessStartTime am: 83327c47f5 am: b19ae11f0f -s ours
 2022-10-04 22:54:25 +00:00
Cole Faust
44900ab585 Merge "Fix array-related errorprone warnings" 2022-10-04 22:53:34 +00:00
TreeHugger Robot
18c36b9eee [automerger skipped] Merge changes from topic "tm-qpr-proc-start-triggers" into tm-qpr-dev am: a04b35b697 am: cb077acdbd -s ours 
am skip reason: Merged-In I577f940bf09e3ce7b8da87496af413058f324455 with SHA-1 e6ab4d7199 is already in history

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

Change-Id: Ic8f5319940fd210835dfc6ba901b55330893eee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:53:32 +00:00
Suprabh Shukla
5210bb9b2d [automerger skipped] Add push messaging as a trigger for proc start am: 8fcf1d63c6 am: f4551d3187 -s ours 
am skip reason: Merged-In I55c56601af4eb60173ae039d8de7f9e7916c81e8 with SHA-1 84c7a05dbb is already in history

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

Change-Id: Ie8daadc989f56dc10c2db54ab7c5af78aa16221b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:52:57 +00:00
Suprabh Shukla
bbe8a7b61e [automerger skipped] Cleaning up duplicate proto for ProcessStartTime am: 83327c47f5 am: b19ae11f0f -s ours 
am skip reason: Merged-In Ie2bdd2151dae26a611c3905342bb49ddddf2788d with SHA-1 e6073bc3ce is already in history

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

Change-Id: I8931e53965dcc24c1095802d7812d56cab7bed34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:52:08 +00:00
Ale Nijamkin
d3a31fc3ac Merge changes from topics "usc-less-domain", "usc-less-split-flag", "usc-less-ui" into tm-qpr-dev am: 3cd2429e55 am: 6e543ea69d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064881

Change-Id: If42a263e513afbd2cd4d65ad7bddb7d89a821ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:50:57 +00:00
Vinit Nayak
c6bf573dab Merge "Add UIEvent for NotificationDrag" into tm-qpr-dev am: 8f9e218330 am: a60e9c21a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20076376

Change-Id: I3771b9dc3fe8b421d21e661719302fee63b1b569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:49:48 +00:00
TreeHugger Robot
80953337ca Merge "Add proto output of battery usage stats" into tm-qpr-dev am: eb59079888 am: 626dfc8928 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20107348

Change-Id: Iffcad1993ee11db9f6a5f6d1aff39ccac5c7a410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:47:52 +00:00
Yohei Yukawa
9ddd4cd83e Optimize IMMS#setAdditionalInputMethodSubtypes() a bit for bg users 
This is a follow up CL to my previous CL, which enabled background
users to call

  InputMethodManager#setAdditionalInputMethodSubtypes().

One this this CL tries to optimize is the fact that its implementation
is currently invoking

  AdditionalSubtypeUtils.load()

twice when called for background usres.  The double-call is happening
in

  InputMethodManagerService#setAdditionalInputMethodSubtypes()

itseif and inside

  InputMethodManagerService#queryMethodMapForUser() [2].

With this CL, the load operation should be happen only once.

There should be no developer-observable behavior change.

 [1]: Iac778d95846843504f6e00b3b939ef0794013b02
      0b169d04c1
 [2]: I4187468076705ac597d680f2f5dc32d7b166da1f
      b5f3d34def

Bug: 234882948
Test: presubmit
Change-Id: I6eb4201ebd69ca8821cbe74fc69356f68f9bcb5e
 2022-10-04 15:25:45 -07:00
TreeHugger Robot
cb077acdbd Merge changes from topic "tm-qpr-proc-start-triggers" into tm-qpr-dev am: a04b35b697 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20112181

Change-Id: I0e6e78826dd4b868c704d46f7f31371dafce127a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:23:16 +00:00
Suprabh Shukla
f4551d3187 Add push messaging as a trigger for proc start am: 8fcf1d63c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20112890

Change-Id: Ia1b7c4fe3462c191d241b00db4050892324959ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:22:55 +00:00
Suprabh Shukla
b19ae11f0f Cleaning up duplicate proto for ProcessStartTime am: 83327c47f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20111318

Change-Id: I6c1df0b50306dbf376655fa1315153711393781a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:22:43 +00:00
Ale Nijamkin
6e543ea69d Merge changes from topics "usc-less-domain", "usc-less-split-flag", "usc-less-ui" into tm-qpr-dev am: 3cd2429e55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064881

Change-Id: I0dc00354e9a0cffe33a10f96ac26b191eb18f111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:19:28 +00:00
Vinit Nayak
a60e9c21a3 Merge "Add UIEvent for NotificationDrag" into tm-qpr-dev am: 8f9e218330 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20076376

Change-Id: Ibd05fc71d114610ef837645bc5161790dc11a00c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:17:30 +00:00
TreeHugger Robot
626dfc8928 Merge "Add proto output of battery usage stats" into tm-qpr-dev am: eb59079888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20107348

Change-Id: I4edeb8faa2a1c6cd7d4c48522cece62645bfaaf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:16:41 +00:00
TreeHugger Robot
a04b35b697 Merge changes from topic "tm-qpr-proc-start-triggers" into tm-qpr-dev 
* changes:
  Add trigger type job for logging process starts
  Add push messaging as a trigger for proc start
  Cleaning up duplicate proto for ProcessStartTime
 2022-10-04 22:16:32 +00:00
Julia Reynolds
bafdadd594 [automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-dev am: 815880be21 -s ours am: f5a1db84ea -s ours am: 07167b0bce -s ours am: 77ebe8c56c -s ours am: 268e10cc75 -s ours am: ab678ed676 -s ours am: 3c87c84c4e -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: Iff66a00e0a1a7c8efe379c4f4fbcb474255ae773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:06:52 +00:00
Julia Reynolds
47b7db85f3 [automerger skipped] Merge changes from topic "presubmit-am-41f55ec06ce44b7aaf10c778037774c5-sc-dev" into sc-qpr1-dev am: 92fde680ff -s ours am: 218a268f7b -s ours am: 580993c890 -s ours am: b5e3c815b5 -s ours am: aa8b06c42c -s ours am: 267d936b7c -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: Ib196181e8b65246e22159484baf5752f9d5e0059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:05:45 +00:00
Presubmit Automerger Backend
1fc5e68c9d [automerger skipped] [automerge] Lower per-app notificationchannel limit 2p: 36acdd6758 am: 6950f0f417 -s ours am: dada90cbb9 -s ours am: 13ce7235fb -s ours am: 761bea88db -s ours am: bb3c5ac8ce -s ours am: a53d2edf81 -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: I8e80a3d777df135dd12f9d5a34eec4bc1ab97a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 22:05:14 +00:00
Ale Nijamkin
3cd2429e55 Merge changes from topics "usc-less-domain", "usc-less-split-flag", "usc-less-ui" into tm-qpr-dev 
* changes:
  Splits up the flag.
  UserRecord support in user interactor.
  user UI layer changes to support USC dep removal
  UserInteractor changes to not depend on USC
  GuestUserInteractor.
  RefreshScheduler.
  User data layer without dependency on USC
  Extracts dialogs out of old UserSwitcherController.
  Adds snapshot function for isKeyguardShowing.
  Adds telephony repository and interactor.
  Moves enforcedAdmin into UserRecord.
 2022-10-04 21:58:24 +00:00
Vinit Nayak
8f9e218330 Merge "Add UIEvent for NotificationDrag" into tm-qpr-dev 2022-10-04 21:56:07 +00:00
Julia Reynolds
3c87c84c4e [automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-dev am: 815880be21 -s ours am: f5a1db84ea -s ours am: 07167b0bce -s ours am: 77ebe8c56c -s ours am: 268e10cc75 -s ours am: ab678ed676 -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: I8a3b6db828aed290d8b6c13af6fbfeb8fea0704d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 21:52:18 +00:00
Julia Reynolds
267d936b7c [automerger skipped] Merge changes from topic "presubmit-am-41f55ec06ce44b7aaf10c778037774c5-sc-dev" into sc-qpr1-dev am: 92fde680ff -s ours am: 218a268f7b -s ours am: 580993c890 -s ours am: b5e3c815b5 -s ours am: aa8b06c42c -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: Ic6ec0f6ec2a26fc98a852c842d035bf4b969c2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 21:51:43 +00:00
Presubmit Automerger Backend
a53d2edf81 [automerger skipped] [automerge] Lower per-app notificationchannel limit 2p: 36acdd6758 am: 6950f0f417 -s ours am: dada90cbb9 -s ours am: 13ce7235fb -s ours am: 761bea88db -s ours am: bb3c5ac8ce -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: I3a1111b6a232f513bd2bda9d524eac92145fbc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 21:51:27 +00:00
Julia Reynolds
db7b231186 [automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-qpr1-dev am: 9595707df0 -s ours am: f16157ca1b -s ours am: c0b4aeefb7 -s ours am: 6830d59680 -s ours am: af586f09cb -s ours am: c38ee82c78 -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: Ica1251b0b7d46ba944aad5e81dfc7b4be80b1125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 21:43:05 +00:00
Julia Reynolds
a5b0c7bb19 [automerger skipped] Lower per-app notificationchannel limit am: 3b0929a30d -s ours am: 7fa9c4b71f -s ours am: 6c6ceba18d -s ours am: e2b61e111b -s ours am: e0ab58bc1b -s ours am: c07096e7bb -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: Id08fab569c20421ccd733dcb838aadb35d0ca008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 21:42:47 +00:00
Guojing Yuan
df483f3705 Merge "Catch NameNotFoundException during onPackageModified" into tm-qpr-dev am: a84c7a7b5f am: 3bd44bc1bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20091660

Change-Id: I18d13f932bf1884b531b56c66eb1161aa4b71a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-04 21:41:59 +00:00
TreeHugger Robot
eb59079888 Merge "Add proto output of battery usage stats" into tm-qpr-dev 2022-10-04 21:41:35 +00:00