PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,604 Commits 1 Branch 0 Tags
35430e6c79b3586404ae72ca3afaff7831f1534c
Commit Graph

105604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
734ada269b Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I5e3948fb746aa2eb485cc0a2113f9f06a4ed234f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:31 +00:00
Jason Chiu
81ee2037ed Merge "Renew the highlight state color" into tm-dev 2022-04-26 06:08:40 +00:00
TreeHugger Robot
5a083d2bfe Merge "Change the alignment of the foreground preferernce controller" into tm-dev 2022-04-26 05:44:37 +00:00
Hugh Chen
00a8568b1b Merge "Implement advanced vpn ui in vpn settings" 2022-04-26 05:33:27 +00:00
Abel Tesfaye
939e0e0d9d Merge auto-rotate comment/style fixes from tm-dev that couldn't be cherry picked into master 
Test: none

Bug: 230378938
Change-Id: Ia0e9e5bf25d005aa6b8ccaa07a1901779b88588c
 2022-04-25 23:16:45 +00:00
Eric Biggers
8c25415736 MainClear: remove obsolete check for multi-volume FDE 
It is never the case that '!isExternalStorageEmulated() &&
!isExternalStorageRemovable() && isExtStorageEncrypted()', so stop
checking for this.

It's easy to see that even just the last part, isExtStorageEncrypted(),
is never true, since it checks whether the property "vold.decrypt" is
non-empty.  That system property was only set on devices that used FDE
(Full Disk Encryption), and FDE support was removed in Android T.

Moreover, the full condition of '!emulated && !removable && FDE'
actually checked for devices that used multi-volume FDE, which
apparently was never actually used, and was removed 8 years ago by vold
commit 87999173dd79 (http://ag/423222).  This is consistent with the
fact that this code was added 11 years ago by commit 2a32192329
(http://ag/134210), when probably this feature was still planned.

Bug: 208476087
Change-Id: I4c2b5c9aed8812367a70d0dd1bbcc94008fec529
 2022-04-25 23:15:31 +00:00
Joshua Mccloskey
79463db83b Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: eb4fa99d5a am: b44da73e77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: Ie2f0a6cba4ad3f5b868ba41fb5fb81b75d032ee7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:31:44 +00:00
Joshua Mccloskey
8d094ff541 Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: 0a41ad016f am: 872c5b533c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: Ife81fcfe043fb74098f94e25d58c01117362ac6e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:31:29 +00:00
Joshua Mccloskey
b44da73e77 Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: eb4fa99d5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: I950af7978c4af50afbcde4d59395780973762764
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:00:36 +00:00
Joshua Mccloskey
872c5b533c Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: 0a41ad016f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: I67b2e8a129697483bd0f0a410284efb9a61fdb5f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:00:21 +00:00
Joshua Mccloskey
eb4fa99d5a Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: I6d5b095918d499447fa67f2e0ac2b28345885e32
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 21:37:30 +00:00
Joshua Mccloskey
0a41ad016f Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: Ia50eaa82757cb61f1851bfa7c5e352646076162f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 21:37:13 +00:00
Joshua Mccloskey
e7c507070d Merge "Modified Fp -> Face setup flow" into tm-d1-dev 2022-04-25 21:14:39 +00:00
TreeHugger Robot
d6dc5cd830 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78 am: 3f5a3ce250 am: c0d3713453 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I0b80d5524811e93a51cdd679aa217010996e697d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 20:00:15 +00:00
TreeHugger Robot
e621e63f1f Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: 7e8278e3cc am: de8bff5446 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I55bdc367369d4e7cbde82219e0d4771a040295ba
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:58:23 +00:00
TreeHugger Robot
5a05d9d198 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: bc6d056015 am: 394c83c085 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I100a7a613f1e46817a3b96a02948d711482dd2fd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:56:59 +00:00
TreeHugger Robot
c0d3713453 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78 am: 3f5a3ce250 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I9a037d94d134ee9d61bfd71f8e65cac02ff00f0c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:16:00 +00:00
TreeHugger Robot
de8bff5446 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: 7e8278e3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I6d00f1859f76d2715771c9b49d9d1b66fe736774
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:15:47 +00:00
TreeHugger Robot
394c83c085 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: bc6d056015 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I94e6a462619de1b26c9e1fe8d357913139782823
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:15:37 +00:00
TreeHugger Robot
3f5a3ce250 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Ic0825c41a3879402d05a27bdffa48678143361aa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:59:07 +00:00
TreeHugger Robot
bc6d056015 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Ic3ea00d800f8baf0432d10be1900245a5749393d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:59:00 +00:00
TreeHugger Robot
7e8278e3cc Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Id1d714a163113bebcc44243be6f75330b6312039
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:58:57 +00:00
TreeHugger Robot
b2744ea5b2 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 62b2539aae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Id7773c5410e672ec08cc2e0d7a05acf0117706ef
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:58:28 +00:00
Ben Murdoch
cab2b2c4d0 Fix NPE in Bluetooth Settings. 
Bug: 230347816
Test: Manual
Change-Id: I210ce81217466897c59509a31fb53d57eed71118
 2022-04-25 18:40:54 +00:00
TreeHugger Robot
09c7795dfa Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I7b6f267436a95259a68e1cfcc7be3545e83e49e1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:36:52 +00:00
TreeHugger Robot
62b2539aae Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Icd32bbd11e1bcd24503b59659d05d4c3484bf0af
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:35:50 +00:00
TreeHugger Robot
6abf8e2f78 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I1931a6139fd93fe5781a1743b695a36ddc0c8579
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:35:50 +00:00
TreeHugger Robot
5d218d9fa4 Merge "Allow intent into Privacy Controls page" into tm-dev 2022-04-25 18:09:39 +00:00
Jason Chang
f38cec326a Fix the description of one-handed mode doesn't change immediately in 
Gestures page after users turn on/off in Quick Settings

Add ContentObserver URI for observing when settings key
"one_handed_mode_enabled" changes.

Bug: 230041450

Test: manually verified on System > Gestures >
One-handed mode item when turned  on/off in Quick Settings

Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures.
OneHandedEnablePreferenceControllerTest"

Change-Id: Id6bb53692181dfc3c8a1006017b5a22462dc4ad9
 2022-04-26 01:50:43 +08:00
Lais Andrade
cc8790f7b3 Create separate On/Off string resources for Vibration & haptics 
Some translators need to be able to adapt the text for On/Off preference
state to match the preference title "Vibration & haptics", which
requires a different inflection and plural form on some languages.

This change separates this resource string from the more generic one
that was used before to allow this flexible translation.

Fix: 228342641
Fix: 229060423
Test: VibrationPreferenceControllerTest
Change-Id: Ib46b3e0d0a980ff57e91f55c73348c440327bad7
 2022-04-25 17:15:39 +01:00
Jan Tomljanovic
316b8ad6c9 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 am: cfd80d65f0 am: 1e9e82e937 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: Ib39351a67daafb3c690555b4629e852c5c6366d5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 15:50:33 +00:00
Jan Tomljanovic
ef18587813 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: a474c51a04 am: d6c1353a80 am: 973ad536c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I2fab1eb28d42fcf2f1fd308ce7334562b9190806
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 15:49:39 +00:00
Jan Tomljanovic
8022a9f491 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 am: 66d62cb61e am: df90e9b05f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: Iab8bedb5e18a411d092544f3984ff88079d79e05
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 15:47:46 +00:00
Jan Tomljanovic
1e9e82e937 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 am: cfd80d65f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: Ica692daa7426b5b58126b29dd9f8c71f7ee84272
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 15:14:04 +00:00
Jan Tomljanovic
973ad536c8 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: a474c51a04 am: d6c1353a80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: Ic6e6d1654463ef13c352eb3b959f1593077a790b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 15:12:55 +00:00
Jan Tomljanovic
df90e9b05f Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 am: 66d62cb61e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I8d019b8af584bc5df1ee4c7d9d315a19e4703050
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 15:12:43 +00:00
Bill Yi
9e65eae1eb [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 12b3ef3439 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17929613

Change-Id: Id231a083105b937057fcb2e3ce09fe9798084340
 2022-04-25 15:05:30 +00:00
Jan Tomljanovic
66d62cb61e Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I85990569eb583b2ca2df96eca5a536ecfdc6bdbc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:57:45 +00:00
Jan Tomljanovic
cfd80d65f0 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I45d7b7dcd48b82d68d80ad72bfa1619ffec831b3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:57:24 +00:00
Jan Tomljanovic
d6c1353a80 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: a474c51a04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I66d3322cdc54151f685d31fa71caa0bfeacd0ff3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:57:20 +00:00
Jan Tomljanovic
aac9102d75 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 70c4143751 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I0d1e49ca3b154d521897c15595614e0846609234
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:56:44 +00:00
Jan Tomljanovic
2a9fb8aa47 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I6b8ae6593ba12751b4eb2be7cea75256e18638a9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:23:57 +00:00
Jan Tomljanovic
a474c51a04 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I070dae172e3998101c04bc58edccf3aed262840b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:23:05 +00:00
Jan Tomljanovic
70c4143751 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I08a4ffc1e1c0c4b71a3a2292c58e9545e3bf3b36
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:23:01 +00:00
Jan Tomljanovic
e22fa138aa Merge "Don't show back arrow in Security when in split mode." into tm-dev 2022-04-25 13:52:31 +00:00
SongFerngWang
e5fff060a2 [MEP] show the DSDS mode selection dialog for user when user insert esim 
If device has esim, then user inserts esim in SS mode. Then, UI should show
the DSDS mode selection dialog for user.

Bug: 230050990
Test: build pass and manual test.
Change-Id: Ia4e695ae2c4e86d6039e03738378989a0879cc71
 2022-04-25 21:07:26 +08:00
Betty Chang
03120268c1 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: 21b9bb97d9 am: 0027d94245 am: 1049bce891 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ic72afce0ac4f15bc48b41503c1e5d67f4eed6452
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 12:11:12 +00:00
Automerger Merge Worker
d1886c4851 Merge "Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26 am: 4f1eb41a64" into tm-qpr-dev-plus-aosp am: 3fbe1e0568 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: I6536b6cb48c136a89d83152bc9382a2a1af18c44
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 12:10:28 +00:00
Betty Chang
4ff4455f02 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26 am: 571ef48801 am: b350f15a60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: I0690bd9fee39ad2616a7df127dc438b84cc5d8f0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 12:08:12 +00:00
Betty Chang
1049bce891 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: 21b9bb97d9 am: 0027d94245 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ia59e388cc2af3f37a47e67b29dd458985cd86a20
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 11:21:57 +00:00