Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
822,840 Commits 3 Branches 0 Tags
742ca033ce2cf4203e236b25220fcb35be9c56fc
Commit Graph

822840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
742ca033ce Ready more build rules for dir move am: ca6e67a66b am: 8914da07e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2469528

Change-Id: I89551d7bfeb60a74d03befad71235589541ca44c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 10:21:25 +00:00
Massimo Carli
3af1633d59 Merge changes from topic "presubmit-am-cf2f51fcc9a649cf9c8e27061e88ec3e" into tm-qpr-dev-plus-aosp 
* changes:
  [automerge] Invalidate buffers on transform change 2p: 5545b1cc36
  Invalidate buffers on transform change
 2023-05-10 09:51:08 +00:00
Anton Hansson
8914da07e9 Ready more build rules for dir move am: ca6e67a66b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2469528

Change-Id: I4fc148293bd5a697a7e4808bc97ecacbddd5c2e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 09:21:31 +00:00
Automerger Merge Worker
c3fa31bd97 [automerger skipped] Merge changes from topic "am-9ee372a5869e41718a77f93727e0bc34" am: 15c4d00e7f -s ours am: 36a1325931 -s ours 
am skip reason: Merged-In If9b602a12b372b20f398583aba06f29ea7aa6e5e with SHA-1 ddaea64c0a is already in history

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

Change-Id: I950409fecdcc68d208d01f918abf640d780b4bb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 08:58:05 +00:00
Treehugger Robot
b716cfc6a0 [automerger skipped] Merge "Update Autofill OWNERS" into android13-tests-dev am: c805f9c0e5 -s ours am: a6c4a9d472 -s ours am: ee99b8dc16 -s ours 
am skip reason: Merged-In If9b602a12b372b20f398583aba06f29ea7aa6e5e with SHA-1 ddaea64c0a is already in history

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

Change-Id: I2b1c3bc44ebb4828ff303e27d470b77a64e14154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 08:58:01 +00:00
Automerger Merge Worker
36a1325931 Merge changes from topic "am-9ee372a5869e41718a77f93727e0bc34" am: 15c4d00e7f -s ours 
am skip reason: Merged-In If9b602a12b372b20f398583aba06f29ea7aa6e5e with SHA-1 ddaea64c0a is already in history

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

Change-Id: Ib1f9b45d50f4dbad71efbdbe5830e54009c2f4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 08:22:24 +00:00
Treehugger Robot
ee99b8dc16 [automerger skipped] Merge "Update Autofill OWNERS" into android13-tests-dev am: c805f9c0e5 -s ours am: a6c4a9d472 -s ours 
am skip reason: Merged-In If9b602a12b372b20f398583aba06f29ea7aa6e5e with SHA-1 ddaea64c0a is already in history

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

Change-Id: I31238ab7433e9353e2be98d1505eff1bb6810f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 08:22:18 +00:00
Treehugger Robot
2a6ffcb5d3 Merge "Show current event threshold in EVENT TRACKER POLICY SETTINGS " am: cbb416e6a8 am: f6aae3d073 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2577655

Change-Id: Id54df36139f8e9ddb5904229eff62077d86ec09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 07:54:12 +00:00
Automerger Merge Worker
15c4d00e7f Merge changes from topic "am-9ee372a5869e41718a77f93727e0bc34" 
* changes:
  [automerger skipped] Merge "Update Autofill OWNERS" into android13-tests-dev am: c805f9c0e5 -s ours
  [automerger skipped] Update Autofill OWNERS am: a89ffbeca8 -s ours
 2023-05-10 07:36:43 +00:00
Treehugger Robot
a6c4a9d472 [automerger skipped] Merge "Update Autofill OWNERS" into android13-tests-dev am: c805f9c0e5 -s ours 
am skip reason: Merged-In If9b602a12b372b20f398583aba06f29ea7aa6e5e with SHA-1 ddaea64c0a is already in history

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

Change-Id: If95b7d9a1855d0df27ba8151ceb96475f8f714c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 07:36:30 +00:00
TYM Tsai
d1b8f5686b [automerger skipped] Update Autofill OWNERS am: a89ffbeca8 -s ours 
am skip reason: Merged-In If9b602a12b372b20f398583aba06f29ea7aa6e5e with SHA-1 ddaea64c0a is already in history

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

Change-Id: Ibf7fba9c46f68704aa8513a9a428f19e523bd564
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 07:36:14 +00:00
Treehugger Robot
f6aae3d073 Merge "Show current event threshold in EVENT TRACKER POLICY SETTINGS " am: cbb416e6a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2577655

Change-Id: I45dfb0966ded77bee414efb73f3a8be6c33d9e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 07:13:36 +00:00
Treehugger Robot
c805f9c0e5 Merge "Update Autofill OWNERS" into android13-tests-dev 2023-05-10 07:08:02 +00:00
Treehugger Robot
cbb416e6a8 Merge "Show current event threshold in EVENT TRACKER POLICY SETTINGS " 2023-05-10 06:16:32 +00:00
Dmitry Dementyev
8fcf9798b3 Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 am: fdde2e60a2 am: 5323ecef73 am: 0e5fa22005 am: 18bf0e3858 am: 66409803bc am: d62a53c164 am: 9534586f6b am: c979afe16f am: 76924ab139 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: I00c912bf939e31073cfa7b9e88011bf5e41744c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 02:57:09 +00:00
Dmitry Dementyev
76924ab139 Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 am: fdde2e60a2 am: 5323ecef73 am: 0e5fa22005 am: 18bf0e3858 am: 66409803bc am: d62a53c164 am: 9534586f6b am: c979afe16f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: I97e6503a2a1c33cf4588cddd60cdc297af7d336c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 02:39:58 +00:00
Charles Chen
074e39a741 [automerger skipped] Merge "Skip letterboxing if the activity below is embedded" into tm-qpr-dev am: 53b8173a0d -s ours 
am skip reason: Merged-In Ic7b1c4b40960fd04de9efbf4f6d7abee45c93025 with SHA-1 ad7d89c22b is already in history

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

Change-Id: I8dc564519b309a74ac5d61ef915f25371918fc05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 02:35:30 +00:00
Dmitry Dementyev
c979afe16f Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 am: fdde2e60a2 am: 5323ecef73 am: 0e5fa22005 am: 18bf0e3858 am: 66409803bc am: d62a53c164 am: 9534586f6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: I1eea235957ea045e6a8faf8a6c936ac5cd346d91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 01:55:16 +00:00
Charles Chen
53b8173a0d Merge "Skip letterboxing if the activity below is embedded" into tm-qpr-dev 2023-05-10 01:47:04 +00:00
Charles Chen
18393dd898 Merge changes from topic "presubmit-am-80091bc2e6654d6d850a978ebe80e880" into tm-qpr-dev-plus-aosp 
* changes:
  [automerge] Skip letterboxing if the activity below is embedded 2p: ad7d89c22b
  Skip letterboxing if the activity below is embedded
 2023-05-10 01:46:56 +00:00
Dmitry Dementyev
9534586f6b Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 am: fdde2e60a2 am: 5323ecef73 am: 0e5fa22005 am: 18bf0e3858 am: 66409803bc am: d62a53c164 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: Ia1fcbc14013d07e501b7187e3aeb8a20a217dbc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 01:08:23 +00:00
Dmitry Dementyev
d62a53c164 Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 am: fdde2e60a2 am: 5323ecef73 am: 0e5fa22005 am: 18bf0e3858 am: 66409803bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: If060b61f91e9c75be2027d1880bd94cfd42bce6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:31:16 +00:00
Treehugger Robot
233ee2a71b Merge "Hide data limit notfication if data not active nor default" am: b6fbb9784f am: 38b31cdf29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2541633

Change-Id: Ibe2eb6f92f872339a31cbca1aaec885bd69a5c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:46:58 +00:00
Juan Yescas
ff3b946914 Merge "Return TotalMemory size when ddr size is not present" am: 24e934c0c3 am: c1029121ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583778

Change-Id: I94b51b86f028d7f19171aeca827cfe59f5d404a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:46:38 +00:00
Dmitry Dementyev
66409803bc Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 am: fdde2e60a2 am: 5323ecef73 am: 0e5fa22005 am: 18bf0e3858 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: I5b27cab9123b688bbfc14ced50395ce1fdccb72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:25:21 +00:00
Treehugger Robot
38b31cdf29 Merge "Hide data limit notfication if data not active nor default" am: b6fbb9784f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2541633

Change-Id: I03ecbf6e882c4499f5549f2a48fdb01b0b8ba862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:06:17 +00:00
Juan Yescas
c1029121ac Merge "Return TotalMemory size when ddr size is not present" am: 24e934c0c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583778

Change-Id: Id64b599c47d51be0fe93477abab40723633aaa86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:03:36 +00:00
Treehugger Robot
b6fbb9784f Merge "Hide data limit notfication if data not active nor default" 2023-05-09 22:49:31 +00:00
Dmitry Dementyev
18bf0e3858 Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 am: fdde2e60a2 am: 5323ecef73 am: 0e5fa22005 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: Iae4bda7880486698feb077034de9f3cf37b6bbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:42:43 +00:00
Juan Yescas
24e934c0c3 Merge "Return TotalMemory size when ddr size is not present" 2023-05-09 22:16:51 +00:00
Dmitry Dementyev
0e5fa22005 Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 am: fdde2e60a2 am: 5323ecef73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: Ifab58d222ac2d0fe603f19db5be149e43a79019f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 21:56:41 +00:00
Dmitry Dementyev
5323ecef73 Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 am: fdde2e60a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: I433b5d30d9911afbd63b3652e1fb8a9f9d1f3f09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 21:12:16 +00:00
Dmitry Dementyev
fdde2e60a2 Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: I1efde1d2314c1819fcd2a7db1ba449c9f85c09d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 20:36:15 +00:00
Dmitry Dementyev
d0ff6dcb61 Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: Ic60f72ac520c153c5686e3576b68478bc4d19e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:55:22 +00:00
Juan Yescas
f572402f11 Return TotalMemory size when ddr size is not present 
When the ddr size is not present or it is invalid, getAdvertisedMem()
must return getTotalMemory() size.

Bug: 278977257
Test: atest frameworks/base/core/tests/coretests/src/android/os/ProcessTest.java
Change-Id: I2323d79d869a4c58eb29d0cae351144f357b867d
 2023-05-09 12:08:02 -07:00
Ioana Alexandru
bf92c0be72 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours am: 92b4cfb6b6 -s ours am: 52521e07bf -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I8153d5040060c3f18ec785273cd1d9f65117eb55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:04:12 +00:00
Ioana Alexandru
ec21f64f0c [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours am: 820da584b7 -s ours am: c05570e2b7 -s ours am: 3c6820b343 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I4ebd6904cbb2d9da052dc55c6f1163473680e714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:03:39 +00:00
Ioana Alexandru
43fee97a25 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours am: 7e06b4b84f -s ours am: cd6045b190 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: Idb450d5a1645844d2a3c023104126078100e818b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:03:15 +00:00
Ioana Alexandru
8ba260201e [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours am: 036b2e6c4f -s ours am: 1aea31df53 -s ours am: 10ba244776 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: Ic0e0c7d49ee609580a03f6460545fd7ecc3dd852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:03:00 +00:00
Ioana Alexandru
52521e07bf [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours am: 92b4cfb6b6 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: Idd9169223e968dfa9bbde9f3bb24691b462b452e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:25:47 +00:00
Ioana Alexandru
3c6820b343 [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours am: 820da584b7 -s ours am: c05570e2b7 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I089a6adb253dddd350e5d78e8dc5c67bddb7cc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:25:42 +00:00
Ioana Alexandru
cd6045b190 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours am: 7e06b4b84f -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: Ic230082cccf3490bf75dca9c860743363dac9f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:25:29 +00:00
Ioana Alexandru
10ba244776 [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours am: 036b2e6c4f -s ours am: 1aea31df53 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: I4a86346ce4521000d893d2058e7f99ba25bcd11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:25:25 +00:00
Ioana Alexandru
92b4cfb6b6 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I0f87fd56b97d9f90b2a423b330b2411773273664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:43:41 +00:00
Ioana Alexandru
c05570e2b7 [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours am: 820da584b7 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: If34c3aab13936ee68ee747ed08a57ad5dbc24e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:43:35 +00:00
Ioana Alexandru
7e06b4b84f [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: I6e32a1b0a472c26702e249ee927a82c9703a751e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:43:17 +00:00
Ioana Alexandru
1aea31df53 [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours am: 036b2e6c4f -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: Ifa6a44d9f3f4cf01a46c9329cb942302bd8c7e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:43:11 +00:00
Evan Laird
1f08c15e0c Merge "Set default battery percentage in SystemUI" am: 196a350162 am: 612e8e5ce6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1719595

Change-Id: I7da1fa4aa432659123864b7740fc5a9820a81298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:17:25 +00:00
Ioana Alexandru
2e13a4afde [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I801f497dd957cda7d145eda1202c580a1d5df899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:56:39 +00:00
Ioana Alexandru
820da584b7 [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: Ide3ce1307875134f8301b7b8a3386f1ee02c2f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:56:15 +00:00