Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
770,025 Commits 3 Branches 0 Tags
aa134f2f895c6cfa28fc532ef1fc59d31cd74742
Commit Graph

770025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
aa134f2f89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73b4d5b76 -s ours am: 9f9a70de0f -s ours am: 562c247877 -s ours am: be4ef867b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia63a58f05b2e5349e2d04c9365658de51a5aaeca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:17:31 +00:00
Bill Yi
68a2575c68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 529f0bbda2 -s ours am: deb7f6a92d -s ours am: 373c7eb269 -s ours am: eab3dc0ec4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c239536048e1f1168ba57cc36df9030229ee01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:15:39 +00:00
The Android Open Source Project
73843a6c36 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ee90dd892 -s ours am: 01b3bb3c6e -s ours am: c6d1e92e3f -s ours am: 9b3b95f93a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1530ce293db39408ba6157a7c40827bcc7598fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:15:37 +00:00
Bill Yi
5efa61ab1b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 047085b773 -s ours am: 06d19be7d2 -s ours am: f28fae6bae -s ours am: b905965318 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a8e11f9cb028c263412e4626357e962c2a31ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:15:34 +00:00
The Android Open Source Project
8b85b1be29 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 727a3f1ec3 -s ours am: 23aa2ad04f -s ours am: eb6999e9a5 -s ours am: f9102bfa95 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3795b7e72240d569087ef4f38e9bb27bd2d933e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:15:30 +00:00
The Android Open Source Project
18959b76d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73b4d5b76 -s ours am: 9f9a70de0f -s ours am: 562c247877 -s ours am: 1510a27898 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I692283b4890d6db3d75279aaaaa674c2d1e8d275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:15:05 +00:00
Jack He
605b32aa9c Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162f4 am: 950bc624d3 am: 74fbf32ba3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951713

Change-Id: I8f5bb199872ab61bc3e201cccd966cc1cb0eedd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:13:15 +00:00
Jack He
7db6d5c21b Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162f4 am: da9f830378 am: dce7dda3e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951713

Change-Id: I1dbcc8f983436041b375315847b3d7da51a90d2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:13:00 +00:00
Automerger Merge Worker
a807021337 Merge changes from topic "am-e65585e4385447fca4f3702b7d2fbbe3" into tm-qpr-dev-plus-aosp 
* changes:
  Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe507 am: 56a4a118bd am: 82981571c0
  DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc9a am: dbf7d03b5d am: 3d1bb0e140
 2022-05-11 01:11:48 +00:00
Shaowei Shen
a38d6dc743 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe507 am: 56a4a118bd am: 82981571c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I0353adc1999fea050d965bbf698b612f2c28421f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:11:41 +00:00
Jack He
7e5edddcf1 Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162f4 am: 950bc624d3 am: facc0ea0bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951713

Change-Id: I2c74514c914f0d25ff4a52a0a04ad6418852d7f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:11:37 +00:00
shaoweishen
e972e71b8d DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc9a am: dbf7d03b5d am: 3d1bb0e140 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I06e5d671417ced5ec6c3023ba41d9a9760247dff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:11:31 +00:00
Shaowei Shen
c3cf3e9d90 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe507 am: ab8b300903 am: 4ff80e5b0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I17bea539663ce822f8057c86880041bd1d923b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:09:52 +00:00
shaoweishen
150cc11bec DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc9a am: f54409e92f am: a16b152824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I8773fbd44f95457dfd783832d7d09f915483ce08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:09:43 +00:00
Shaowei Shen
26e06b7307 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe507 am: 56a4a118bd am: fbcaaf4486 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I9cb722daaba2528ce8bca1f4c157215b6764f80a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:09:20 +00:00
shaoweishen
6aa55facb3 DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc9a am: dbf7d03b5d am: 5f84977c03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I5b30d9b4e1613e2e8e650f63e9359dc357dbfb2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:09:13 +00:00
Bill Yi
eab3dc0ec4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 529f0bbda2 -s ours am: deb7f6a92d -s ours am: 373c7eb269 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36caf502c72af300e0c76fcf157b795d9db0dd66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:49:29 +00:00
The Android Open Source Project
9b3b95f93a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ee90dd892 -s ours am: 01b3bb3c6e -s ours am: c6d1e92e3f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3959eba48e03a6e9f9d96b57b98aae4d37b4ce95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:49:27 +00:00
The Android Open Source Project
be4ef867b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73b4d5b76 -s ours am: 9f9a70de0f -s ours am: 562c247877 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93ef17e36147f5a3938a4e2ee99998e6f5c27247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:49:22 +00:00
Bill Yi
b905965318 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 047085b773 -s ours am: 06d19be7d2 -s ours am: f28fae6bae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8fe85f4ac93c8474e257d962ee6bd0730698a214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:49:20 +00:00
The Android Open Source Project
f9102bfa95 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 727a3f1ec3 -s ours am: 23aa2ad04f -s ours am: eb6999e9a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4caaa4f49d2cbe1246d5723a9d9bd15a1b624f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:49:16 +00:00
The Android Open Source Project
1510a27898 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73b4d5b76 -s ours am: 9f9a70de0f -s ours am: 562c247877 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cab0eda62d5243a2a5369e6ccb577a956e23cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:48:54 +00:00
Jack He
74fbf32ba3 Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162f4 am: 950bc624d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951713

Change-Id: Icee2e87f11d9244999f5368f132638a3683fbd8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:46:39 +00:00
Jack He
facc0ea0bd Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162f4 am: 950bc624d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951713

Change-Id: Iab129909c6c3ca57fd788252bf12a6ac074539a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:46:27 +00:00
Jack He
dce7dda3e6 Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162f4 am: da9f830378 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951713

Change-Id: I4e7269aed84f6deb2681572b7d407561ad26eeb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:46:16 +00:00
Shaowei Shen
82981571c0 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe507 am: 56a4a118bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: Ie5516ca951610b380c288fa2b9af18edcf3ccc74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:45:10 +00:00
shaoweishen
3d1bb0e140 DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc9a am: dbf7d03b5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I85fd9772de7536d3acd3b6198c3e4a0b1fe3e47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:45:07 +00:00
Shaowei Shen
fbcaaf4486 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe507 am: 56a4a118bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I4fb210699e31307fbd340116152c4f5d9b0aef85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:45:07 +00:00
shaoweishen
5f84977c03 DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc9a am: dbf7d03b5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I8356ad296d7b17b9682cd9d8a89748ebd99c97a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:45:05 +00:00
Shaowei Shen
4ff80e5b0b Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe507 am: ab8b300903 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I6bf92ee4638f418403550158605b4384a4f85742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:44:12 +00:00
shaoweishen
a16b152824 DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc9a am: f54409e92f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: Icfd33c6e481e7d5d77a759410a3371e5b75fdf6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:44:09 +00:00
Bill Yi
373c7eb269 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 529f0bbda2 -s ours am: deb7f6a92d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec684ef06066f324a4e76be24cccd4ee3c776a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:38:02 +00:00
The Android Open Source Project
c6d1e92e3f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ee90dd892 -s ours am: 01b3bb3c6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4df1c8dc7fb33328fe93eda010d0f13d03f62431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:38:00 +00:00
Bill Yi
f28fae6bae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 047085b773 -s ours am: 06d19be7d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7c4d68bde57a1e5ba77a6ab7e2382e163a93be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:37:57 +00:00
The Android Open Source Project
eb6999e9a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 727a3f1ec3 -s ours am: 23aa2ad04f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica1db7ff529fd18b3e0b3ec6cee03a21501ecca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:37:49 +00:00
The Android Open Source Project
562c247877 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73b4d5b76 -s ours am: 9f9a70de0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id684b070e5f4d60bacca6ed4a0eb65958b9e9046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:37:29 +00:00
Bill Yi
deb7f6a92d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 529f0bbda2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47e5e7f8b90e7da54b54e7b8791be7e23acdbf4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:29:17 +00:00
The Android Open Source Project
01b3bb3c6e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ee90dd892 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62e9b4c051e19e0598ebc3e4886b538a802a2f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:28:49 +00:00
Bill Yi
06d19be7d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 047085b773 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbd0865bd4473b914c21e3d6672868f953aeb703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:28:39 +00:00
Jack He
950bc624d3 Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951713

Change-Id: I6887b7b1e2a4ed41ad27838ea36688497e7eb57d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:28:31 +00:00
The Android Open Source Project
23aa2ad04f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 727a3f1ec3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice4595e1c0af19ce4a562514d2850964128ea48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:28:19 +00:00
The Android Open Source Project
9f9a70de0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73b4d5b76 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fb08edde159da1e18d09de370cfd192f55f0fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:27:54 +00:00
Shaowei Shen
56a4a118bd Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe507 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I4a00af893d510db3c05a280c1e54b09aa66872b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:26:00 +00:00
shaoweishen
dbf7d03b5d DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I5fd929ab488d529185123753492204347680bbe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:58 +00:00
Jack He
da9f830378 Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951713

Change-Id: I66d0a1fd0cdf7ba8769d9f87913b54f3fbe24490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:34 +00:00
Shaowei Shen
ab8b300903 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe507 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I5bd27985faa927cf316962bb2d539538686b7bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:23:54 +00:00
shaoweishen
f54409e92f DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937

Change-Id: I2b4377a55cfd72754817a5bdbcbd3e53aeed83e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:23:51 +00:00
Jack He
8f114162f4 Merge "Correct stream type for BLE input device" into tm-dev 2022-05-11 00:08:21 +00:00
Shaowei Shen
57fb8fe507 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev 2022-05-10 23:58:44 +00:00
Beverly Tai
1b4a6b6373 Merge "Change a nullable get to getOrDefault(,false)" into tm-dev am: 89c3325804 am: 895dafdb97 am: df7c541d05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18247862

Change-Id: I9af7a4fe75171cfa38fcf4fa052c58c5039b5c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 22:49:00 +00:00