Commit Graph

108898 Commits

Author SHA1 Message Date
SongFerngWang
5031a2b55a The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5 am: 4b1585ebe7 am: 11ea0c10e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: I011c909ec2b0d3177b0dab9e22c846662259efab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:25:08 +00:00
Calvin Pan
b2426316b1 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 4d728de8bc am: c452fe1a61 am: db453f1058
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I338747caf6721db96102f1f5a266dde8f1ebfdd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:24:18 +00:00
SongFerng Wang
9782c4093c Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 am: d28816fcc3 am: db328a03fb am: 50ca1ab7fd am: b9973caf84
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: Ie97ebf38b61e71004ed270f485f974c63b6bc7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:15:07 +00:00
SongFerngWang
11ea0c10e1 The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5 am: 4b1585ebe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: If32ce25534681d4cbfe71eb96e7129f016cec2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:54:00 +00:00
Calvin Pan
db453f1058 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 4d728de8bc am: c452fe1a61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: Ia1fb506b1c64d2b69040ca2132f177b9c77edc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:52:23 +00:00
SongFerng Wang
b9973caf84 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 am: d28816fcc3 am: db328a03fb am: 50ca1ab7fd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: I9958a7a658b20187f163417ac24b989ecca14e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:45:07 +00:00
SongFerngWang
4b1585ebe7 The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: Ic5a01ae982ad4ba467ea4ec3ded3db57f244729f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:28:47 +00:00
SongFerngWang
ee2536f3f5 The settings crash when it add the RTL mark on MEP message am: 7de5f99847
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: I9c2f7b7388b9281a5a90cd11155cbac14b950aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:24:37 +00:00
Calvin Pan
c452fe1a61 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 4d728de8bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I3fac504db317f77f42de06ad360e3d128fb3bfc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:24:09 +00:00
Calvin Pan
4d728de8bc Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: Ifa5695455810d3c54239463a0c6aae447e08b09e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:22:27 +00:00
SongFerngWang
7de5f99847 The settings crash when it add the RTL mark on MEP message
The MEP message string is one line, so it did not need to add more
RTL marks.
hsv: https://hsv.googleplex.com/5694452275347456

Bug: 233082642
Test: manually test and take the hsv.
Change-Id: Iad4d469eb6a74805f3c8d5fe5c7eacea1e7a25d3
2022-05-20 12:15:06 +08:00
SongFerng Wang
50ca1ab7fd Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 am: d28816fcc3 am: db328a03fb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: Ic231c276f1f7726e35599bcdcfad4fcfd71ac3bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 02:35:33 +00:00
Calvin Pan
9d6cf4255d Merge "Avoid getting app locale config for each app" into tm-dev 2022-05-20 01:52:46 +00:00
SongFerng Wang
db328a03fb Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 am: d28816fcc3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: I82cf7c07333fced96063ce0653d37c7b9e6f346b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 00:49:21 +00:00
SongFerng Wang
d28816fcc3 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: I4b1e2ca82609c4c37f74839ff1e404c428cdec8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 00:18:52 +00:00
SongFerng Wang
27b4578002 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" 2022-05-19 23:56:08 +00:00
Bonian Chen
1468ba54ca Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 1cdd01268a am: 4b03edd4cc am: 61038b77ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I532953e5e4c63f599485154aebc21ff1a73678b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 12:08:14 +00:00
Bonian Chen
e0b34b1564 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 2034695af7 am: cbc5f8a756 am: 27e9d39b69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I58a2b5998db0982b0eb9fe6c5fc58ad114884599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 12:08:07 +00:00
Automerger Merge Worker
31cf60e572 Merge "Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 8bd1ac8ad2" into tm-d1-dev-plus-aosp am: 85f5fa0c01 am: f033860c4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I165f36e36024f87ce7826870c965d76df9e8f63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 12:08:00 +00:00
Bonian Chen
30108e8050 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 2034695af7 am: d84a2b10f8 am: f2b70c1a08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I648d520f750513407d1adb572b5d5b47f1a1e9f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 12:07:51 +00:00
Bonian Chen
cd0043a861 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 7e7ef59813 am: ec2b35fe87 am: 32451865de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I9198f363fb50fae6587ea1b151a258c4cff8fec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 12:07:30 +00:00
Bonian Chen
c2719b2924 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 7e7ef59813 am: cb9e5a8076 am: 08628287f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I3c507f4faf2739ec6b9fc1661ebe64208b64684e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 12:07:07 +00:00
Bonian Chen
61038b77ee Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 1cdd01268a am: 4b03edd4cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I222680da686057f9cbad6933ef32f4650138c7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:40:48 +00:00
Bonian Chen
27e9d39b69 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 2034695af7 am: cbc5f8a756
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I7756a5f71911627163fd08988ea8139a46affbc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:40:41 +00:00
Automerger Merge Worker
f033860c4c Merge "Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 8bd1ac8ad2" into tm-d1-dev-plus-aosp am: 85f5fa0c01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: Ia74a026d3e54d3b887adc62601a1b684f7c001d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:40:23 +00:00
Bonian Chen
f2b70c1a08 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 2034695af7 am: d84a2b10f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: Idd1e9882cfc79eb31bfd0721be8a5c9874ee1a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:40:08 +00:00
Bonian Chen
32451865de Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 7e7ef59813 am: ec2b35fe87
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I8458bbb1c361a8e38d96ae0c5874ef6d49ad8cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:40:00 +00:00
Bonian Chen
08628287f5 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 7e7ef59813 am: cb9e5a8076
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: Ibe346fa196d8a71afba2c164c418d9fb43d1e9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:39:53 +00:00
Bonian Chen
4b03edd4cc Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 1cdd01268a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I5b880b2c38485830253a04b5b84902db1c8a5cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:25:08 +00:00
Bonian Chen
d84a2b10f8 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 2034695af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I9a2e943ebe76959b4ba9f6cace61429876ff8c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:24:56 +00:00
Bonian Chen
cbc5f8a756 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 2034695af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: Ie96d1ab046c988058dca50e0bfa8107d5babce8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:24:54 +00:00
Bonian Chen
cb9e5a8076 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 7e7ef59813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I158f6542124f5260ddf64eddd589de654ff086b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:24:44 +00:00
Automerger Merge Worker
85f5fa0c01 Merge "Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 8bd1ac8ad2" into tm-d1-dev-plus-aosp 2022-05-19 11:24:36 +00:00
Bonian Chen
ec2b35fe87 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 7e7ef59813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I4aff0efcc0bd667d952f23695d6c7db7dac85ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:24:32 +00:00
Bonian Chen
fd79110356 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 8bd1ac8ad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I2d2ea978b37da3ca0a2737ff5f267c5026132ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:24:31 +00:00
Bonian Chen
2034695af7 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: Id5e3b9d471b378a65c195179cac6da4b38e3723c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:08:34 +00:00
Bonian Chen
7e7ef59813 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: Ie45deeea978e1a87b4d34e930bfd068a05f43ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:08:27 +00:00
Bonian Chen
1cdd01268a Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I7fd11293633fd718210bf59a83c5db28a12852f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:07:08 +00:00
Bonian Chen
8bd1ac8ad2 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I390e0565a2ebfea00ad464117a63eec193fc6282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:06:42 +00:00
Bonian Chen
08b7f53383 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev 2022-05-19 10:28:21 +00:00
Bonian Chen
fccca65c0e Merge "[Settings] Stop network mode query when changing config" into tm-dev 2022-05-19 10:27:07 +00:00
Yi-Ling Chuang
ff3ef50a7b Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: 562977ee66 am: 4c592c3baf am: 3d15dd9f8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I269d44ce50bec4613c8ef3e260767c3353b96478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 10:07:53 +00:00
Yi-Ling Chuang
163cc7852c Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e am: 07438e359d am: eb7afaa167
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Idcae5b9c2174bf781f03108030f88e513fb9555a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 10:07:38 +00:00
Yi-Ling Chuang
f933f1b65e Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e am: e8aaf2ba6f am: 4bd95131c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Ibb82102d632d497117411513adcdb5b298e51cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 10:06:59 +00:00
Yi-Ling Chuang
3d15dd9f8b Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: 562977ee66 am: 4c592c3baf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Iea79f9f9e7b5d8aecb8d4cfc5b269a1170fa9cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:47:53 +00:00
Yi-Ling Chuang
eb7afaa167 Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e am: 07438e359d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Ib6eb196cc4a3f617c440160896201169e43c2b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:47:30 +00:00
Yi-Ling Chuang
4bd95131c6 Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e am: e8aaf2ba6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I0b5f36f13dfabe114ffa88d74423e14c3e65573a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:46:41 +00:00
Yi-Ling Chuang
4c592c3baf Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: 562977ee66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I4f7e7a14f83f2e18880978472aa71ac02ae37dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:21:07 +00:00
Yi-Ling Chuang
07438e359d Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I57ad7d8c54d8441b2dfa4daa2cf900bdae76914a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:20:51 +00:00
Yi-Ling Chuang
e8aaf2ba6f Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I8a7b1e0af688bfaaab35374bb7c1db1f881863ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:20:48 +00:00