Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
831,254 Commits 3 Branches 0 Tags
e33f3f093fcbaf8564c5e6f11258e45cc9f996cc
Commit Graph

831254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Epin
e33f3f093f Merge "Load direct-share icons asynchronously" into tm-qpr-dev am: 1809ffcf0e am: bb1a6ee1c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18973259

Change-Id: I97c84130642975bc7913b36b27332eedbf484137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 03:38:57 +00:00
Andrey Epin
bb1a6ee1c8 Merge "Load direct-share icons asynchronously" into tm-qpr-dev am: 1809ffcf0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18973259

Change-Id: If4991c79dae30982c27ad0f3f75654b21ea3d5ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 03:10:28 +00:00
Andrey Epin
1809ffcf0e Merge "Load direct-share icons asynchronously" into tm-qpr-dev 2022-09-07 02:44:24 +00:00
Prameet Shah
833fb8b820 Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" am: 9946834795 am: a4c70add80 am: b157ddb8cd am: c14b86f979 am: 2d15671d29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189719

Change-Id: I7c3ca4ff2ed8f083b161438f964985ec62361780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 02:20:30 +00:00
Wei Sheng Shih
e442860cea Merge "Correct visible status of an activity if no more transition will happen" into tm-qpr-dev am: dd2f290170 am: 9d38711699 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19728398

Change-Id: I1099889cf50cf4403a4fd96af111241b768fa169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 02:19:18 +00:00
Prameet Shah
2d15671d29 Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" am: 9946834795 am: a4c70add80 am: b157ddb8cd am: c14b86f979 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189719

Change-Id: I602f5afb15e46ed7a22e2011c6d12a68920e1643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 02:04:46 +00:00
Wei Sheng Shih
9d38711699 Merge "Correct visible status of an activity if no more transition will happen" into tm-qpr-dev am: dd2f290170 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19728398

Change-Id: I210bb509b82eb8fa4ab6d4d4fb64f9ab521e028f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 02:02:36 +00:00
Aswin Sankar
7dcf414cf1 [automerger skipped] Merge "Add DataFailCause for IWLAN_CONGESTION." into tm-qpr-dev am: 207177c552 -s ours am: 37d76931a4 -s ours 
am skip reason: Merged-In I85e6a1700f72db1d55a7929e5d4d93f8cac66c64 with SHA-1 948cd02535 is already in history

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

Change-Id: I868940d0f0fb35c8feb6b5dbb0d0ddf33c54283d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:56:56 +00:00
Aswin Sankar
9f2e50809e [automerger skipped] Add DataFailCause for IWLAN_CONGESTION. am: 2d24bbc890 -s ours am: 6f269ebb9f -s ours 
am skip reason: Merged-In I85e6a1700f72db1d55a7929e5d4d93f8cac66c64 with SHA-1 948cd02535 is already in history

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

Change-Id: Ie8f039163a5d1bdeffbe4a1f4126765d27433230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:56:29 +00:00
Automerger Merge Worker
2f473648da Merge "[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours" into tm-d1-dev am: 34776f6548 -s ours am: c266737c9b -s ours am: c3fa41f3da -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Ic0edbe56a09c637ee6d7262c9c47e591400ee018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:55:40 +00:00
Yuri Lin
f623a4d6fd [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: 5c6000d8f1 -s ours am: 4c75810b89 -s ours am: 8d81634ed0 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: Ibe49c5f033bf445c58e2b50a61889ec020923ea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:55:07 +00:00
Wei Sheng Shih
dd2f290170 Merge "Correct visible status of an activity if no more transition will happen" into tm-qpr-dev 2022-09-07 01:55:01 +00:00
Yuri Lin
085f84d1f5 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: f3ad8d4700 -s ours am: dc99ca69f1 -s ours am: 89ed3f88fa -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: Iabce9cac353385147b3fcd86b77cdb6884e02596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:54:39 +00:00
Automerger Merge Worker
17b4862ba7 Merge changes from topic "am-9a6031884e6b4d29ae2731d61b39417c" 
* changes:
  [automerger skipped] Merge changes from topic "am-dba211c3a3964fe59ff416a1b50e630e" into tm-d1-dev-plus-aosp am: 747eff2615 -s ours am: c3a3c6959a -s ours
  [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours am: 20e6d6b0f0 -s ours am: ee6eccf039 -s ours am: 6a73454fd5 -s ours
 2022-09-07 01:54:32 +00:00
Automerger Merge Worker
16e6e1c324 [automerger skipped] Merge changes from topic "am-dba211c3a3964fe59ff416a1b50e630e" into tm-d1-dev-plus-aosp am: 747eff2615 -s ours am: c3a3c6959a -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I6ab3b7978beffeef7f99443026a29e169e18a868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:53:57 +00:00
Wilson Wu
30e354347e Merge "Improve lock annotation for InputMethodManager (3/N)" 2022-09-07 01:53:37 +00:00
Yuri Lin
c568099285 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours am: 20e6d6b0f0 -s ours am: ee6eccf039 -s ours am: 6a73454fd5 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I3c439586d76283ae4c7acc830e880862fb710fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:53:22 +00:00
Wilson Wu
b72a652f46 Merge "Improve lock annotation for InputMethodManager (2/N)" 2022-09-07 01:53:00 +00:00
Yuri Lin
44f64b6252 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: 8b2c3672eb -s ours am: e67fc11b30 -s ours am: 6f0ce9596f -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: I43190c91d7e8182ccf22e50d8143c2ddecffc951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:52:34 +00:00
Automerger Merge Worker
84eabd4165 Merge changes from topic "am-caf86fd962d447f18a017351ee55e45c" into tm-qpr-dev-plus-aosp am: 7d532bc7b9 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Ie020510461ef343c7c1d1000c1bfde51251dda6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:52:06 +00:00
Yuri Lin
56e2b22496 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours am: 89737fd70b -s ours am: cc7c7305b7 -s ours am: bf3d83a4ca -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Ia570e9a5b96a6a0fe492f41f75afdac9f3bffb03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:51:35 +00:00
Aswin Sankar
37d76931a4 [automerger skipped] Merge "Add DataFailCause for IWLAN_CONGESTION." into tm-qpr-dev am: 207177c552 -s ours 
am skip reason: Merged-In I85e6a1700f72db1d55a7929e5d4d93f8cac66c64 with SHA-1 948cd02535 is already in history

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

Change-Id: I5dbe06a9ccfd3dd1da7cc993759f9c1597418021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:50:50 +00:00
Aswin Sankar
6f269ebb9f [automerger skipped] Add DataFailCause for IWLAN_CONGESTION. am: 2d24bbc890 -s ours 
am skip reason: Merged-In I85e6a1700f72db1d55a7929e5d4d93f8cac66c64 with SHA-1 948cd02535 is already in history

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

Change-Id: I70ce7d9b44601a7d15d5157b2bd6efe99a894c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:50:44 +00:00
Yuri Lin
3df13d26f9 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours am: 89737fd70b -s ours am: cc7c7305b7 -s ours am: 5e692ba69d -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I706b063ffd66e64f1eb9054f01ccfc4d00ba66df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:50:04 +00:00
Yuri Lin
5ab5a28bad [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 99555b4371 -s ours am: cfe193e76c -s ours am: dfb1c6133b -s ours am: 21ad60b5f8 -s ours am: a03b7bdf17 -s ours am: 553f70442d -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Iad61d70848caf48e983b63c1641a2069b350ca2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:49:45 +00:00
Automerger Merge Worker
41e50c7be9 [automerger skipped] Merge changes from topic "am-3d0ccbdc4ffb41f4bef245a13704911c" into tm-d1-dev-plus-aosp am: c097e5499c -s ours am: f81d7b9400 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Ib73de51a546dabb825b55080025f97ab1a36bf09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:49:00 +00:00
Yuri Lin
11794ec41d [automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f088a -s ours am: 3981fd411c -s ours am: 9af8170c00 -s ours am: 4fb21e59b5 -s ours am: 54848b38c6 -s ours am: 18c1e9ef50 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I96fc9a44b5b6ecf6a668cacb084675aa152b9c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:48:27 +00:00
Automerger Merge Worker
db8b3d82e9 [automerger skipped] Merge changes from topic "am-04b9c25dff264f8f95ac8c6f858a0922" into tm-d1-dev-plus-aosp am: d49c69dc88 -s ours am: aff685658a -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I55976312f98f89ae38bda2d89e2b68e5e61f61b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:46:09 +00:00
Yuri Lin
a488078e8c [automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f088a -s ours am: 3981fd411c -s ours am: 9af8170c00 -s ours am: 97038106f9 -s ours am: 80b30783e2 -s ours am: e607adc2a8 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Iab2eec38e87c3b09280d3473f77b8c829f620fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:45:45 +00:00
Yuri Lin
e728165bc4 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours am: ba06923190 -s ours am: 4eab506bf3 -s ours am: 29361f95f8 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I46c178f366eaffc08a8a7bfb978cd02e3f7510c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:44:47 +00:00
Yuri Lin
5b0f353c70 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 3d8504587c -s ours am: a626a85e00 -s ours am: d9f1803ddf -s ours am: d0df2c33f8 -s ours am: 77f946f63f -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I24bccffc2b97fe1a2a8bf4fe082503b327bacbc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:44:18 +00:00
Yuri Lin
2a758487f7 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours am: 1769811fee -s ours am: c1d7346b13 -s ours am: 2f719a2d15 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: Iff8572c5480959f6e04b44daeb3f5e47e7b64a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:43:43 +00:00
Yuri Lin
e39b22d2cf [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 3d8504587c -s ours am: a626a85e00 -s ours am: eb2e362fa7 -s ours am: 19815724ee -s ours am: 0c2f23fb20 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: Ice07758e9fdd0d9fe21f79512c66e4526255f0a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:43:23 +00:00
Prameet Shah
c14b86f979 Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" am: 9946834795 am: a4c70add80 am: b157ddb8cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189719

Change-Id: I9bb381f9d3183488306b32697b0b3013b8492982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:38:42 +00:00
Automerger Merge Worker
c3fa41f3da Merge "[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours" into tm-d1-dev am: 34776f6548 -s ours am: c266737c9b -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Id459f2615fc889198bbf2bef682e24bc2ce26994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:30:49 +00:00
Yuri Lin
8d81634ed0 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: 5c6000d8f1 -s ours am: 4c75810b89 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: I75c774172e9792662a3db0ec74f87786311f04ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:30:42 +00:00
Yuri Lin
89ed3f88fa [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: f3ad8d4700 -s ours am: dc99ca69f1 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: I5b7e9f21b076464298da575f0810655c4541430d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:30:28 +00:00
Automerger Merge Worker
c3a3c6959a Merge changes from topic "am-dba211c3a3964fe59ff416a1b50e630e" into tm-d1-dev-plus-aosp am: 747eff2615 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I3699e4664782f27209ed8d931b22ecc1265cf4af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:30:16 +00:00
Yuri Lin
6a73454fd5 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours am: 20e6d6b0f0 -s ours am: ee6eccf039 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I6641b7ce63d4f8dcd99fe57868f72e957e1a7e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:30:12 +00:00
Yuri Lin
6f0ce9596f [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: 8b2c3672eb -s ours am: e67fc11b30 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: Idc1a267981c7d30f9cd8ce9a329592394c31b1d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:29:39 +00:00
Automerger Merge Worker
7d532bc7b9 Merge changes from topic "am-caf86fd962d447f18a017351ee55e45c" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours am: 89737fd70b -s ours am: cc7c7305b7 -s ours
  [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 99555b4371 -s ours am: cfe193e76c -s ours am: dfb1c6133b -s ours am: 21ad60b5f8 -s ours am: a03b7bdf17 -s ours
 2022-09-07 01:29:31 +00:00
Yuri Lin
bf3d83a4ca [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours am: 89737fd70b -s ours am: cc7c7305b7 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I8fca19e5da6afa12e2d7015356f0e1289e62571f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:29:23 +00:00
Yuri Lin
8ab1c33ba0 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 99555b4371 -s ours am: cfe193e76c -s ours am: dfb1c6133b -s ours am: 21ad60b5f8 -s ours am: a03b7bdf17 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I1a8ebf5eedb275eb888d129d3ad4e3843c923d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:29:00 +00:00
Aswin Sankar
207177c552 Merge "Add DataFailCause for IWLAN_CONGESTION." into tm-qpr-dev 2022-09-07 01:28:49 +00:00
Yuri Lin
5e692ba69d [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours am: 89737fd70b -s ours am: cc7c7305b7 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Icb0b4d3ee1b7671c83265526a2fba44fb82c6ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:28:18 +00:00
Yuri Lin
553f70442d [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 99555b4371 -s ours am: cfe193e76c -s ours am: dfb1c6133b -s ours am: 21ad60b5f8 -s ours am: a03b7bdf17 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Ifbbac6af81b788c2433a6811ae1510dfbec0a95c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:28:13 +00:00
Automerger Merge Worker
f81d7b9400 Merge changes from topic "am-3d0ccbdc4ffb41f4bef245a13704911c" into tm-d1-dev-plus-aosp am: c097e5499c -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Iaecbe7db97016e50dadb4240dd4fa0570e48755c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:27:59 +00:00
Yuri Lin
18c1e9ef50 [automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f088a -s ours am: 3981fd411c -s ours am: 9af8170c00 -s ours am: 4fb21e59b5 -s ours am: 54848b38c6 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Id4e6d8c010817aef59cf7c53e929c78e24d92d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:27:48 +00:00
Automerger Merge Worker
aff685658a Merge changes from topic "am-04b9c25dff264f8f95ac8c6f858a0922" into tm-d1-dev-plus-aosp am: d49c69dc88 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I5006efefa6a549134a7bbcbd78ed1f1d6a3d1634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:26:57 +00:00
Yuri Lin
e607adc2a8 [automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f088a -s ours am: 3981fd411c -s ours am: 9af8170c00 -s ours am: 97038106f9 -s ours am: 80b30783e2 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I658dabe359e60b56b1c48cb212220d7959d7c818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:26:46 +00:00