SongFerngWang
5e65f07c0e
[automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7
am: 5de8fbc299
-s ours am: 0cdfaf2eed
-s ours am: 033d0d96a0
-s ours
...
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: I19d391367cd0ceff9e55298972412dc058af8ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:13:15 +00:00
SongFerngWang
033d0d96a0
[automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7
am: 5de8fbc299
-s ours am: 0cdfaf2eed
-s ours
...
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: I98ee0541846246d87e03eadfd07326d41a61966f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:56:19 +00:00
SongFerng Wang
628229b3cf
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
am: e4d42c1515
am: b5bc3952c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: If0981916b377f4a39d460909a4e011ab81ac77c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:54:54 +00:00
SongFerng Wang
42af662d0d
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
am: e4d42c1515
am: 31fed0ace4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I24945fd96a6fcc131a6fa2ff7db2be252b058550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:40:58 +00:00
SongFerng Wang
a575d9bed0
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
am: d879d59a86
am: 86fd225f79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I6146640d0aab0a0ff5d77aa7d9da4b6ae920032b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:40:51 +00:00
Betty Chang
1fbc7f2e58
[automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d
am: e300781fb8
-s ours am: 34c513f0d4
-s ours am: d1e2280136
-s ours
...
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794
Change-Id: I900395b33cfecebaf05024427101b1a2879183f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:40:23 +00:00
SongFerngWang
0cdfaf2eed
[automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7
am: 5de8fbc299
-s ours
...
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: I790378343eefb8e03232fe325e34209eb290557c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:34:02 +00:00
SongFerng Wang
31fed0ace4
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
am: e4d42c1515
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I6d335c12227d1be9bc6d753e940ac1994c050011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:33:56 +00:00
SongFerng Wang
b5bc3952c5
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
am: e4d42c1515
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: Ie73fca56e20e0c70230ff6823eba12ff63c208f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:33:56 +00:00
SongFerng Wang
86fd225f79
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
am: d879d59a86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I76b7ecd27dcf6b1e682cc104a389c9653b31320b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:26:31 +00:00
Betty Chang
d1e2280136
[automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d
am: e300781fb8
-s ours am: 34c513f0d4
-s ours
...
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794
Change-Id: I3b9751da93651df23cbba4319d540943eced5d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:26:12 +00:00
SongFerng Wang
e4d42c1515
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I4c163ea303beefcf265ba6b67585d7559aab9ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:18:44 +00:00
SongFerngWang
5de8fbc299
Changing the condition since the esim may be removable am: 82bf2a66b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: If58f4e897785dd92ed6de2bd847bb5a7a9728294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:18:28 +00:00
SongFerng Wang
d879d59a86
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I74352201ea603e7786ca6ee686fc9d6f142e7ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:17:25 +00:00
Betty Chang
34c513f0d4
[automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d
am: e300781fb8
-s ours
...
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794
Change-Id: I1e1d2af2be4b97cbbeaa579963a7865f1c25ba40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:03:07 +00:00
SongFerng Wang
a67d5e25a3
Merge "[MEP] The removale slot can read the esim card" into tm-dev
2022-05-27 14:58:43 +00:00
Betty Chang
e300781fb8
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794
Change-Id: I9fedeeaf397e15e8c6a9421604a0cf6def4c743c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 14:47:51 +00:00
Betty Chang
e5a21d345d
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT"
2022-05-27 14:30:02 +00:00
Chaohui Wang
3091ed0dc7
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: 408728d4ab
am: 2ff3a05456
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: Ia5031d9a964012d9f74a5187ed4e2887350b2b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:04:17 +00:00
Chaohui Wang
c7b308a92b
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 7f4341f9aa
am: 71961276bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: Iee528a14f275f65205975922500f8a6ded22781b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:04:10 +00:00
Jason Chiu
e685ee302f
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: aaa3ad0890
am: 9ac3a4c795
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I996e42f26a4f631d2b6f8fdc5744277606234f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:04:03 +00:00
Chaohui Wang
d0de9de36e
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: 408728d4ab
am: fec8a4ebea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: Ie5db69adf21317c7766155e60ebb936179b1c817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:56:42 +00:00
Chaohui Wang
36f4405ef9
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 7f4341f9aa
am: 11e4a52593
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I8b65cf1c5620d4febd9a3d97540ea21ff37fba32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:56:35 +00:00
Jason Chiu
0ca50986d9
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: aaa3ad0890
am: 9d4b8fab04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I18c3c71ae8ff8ffde77ed70490238caf962e7360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:56:29 +00:00
Chaohui Wang
7f7bc9a622
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: c20f0cabf7
am: 551549cf98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I496d94b187a5394c076907dd4fc770baa50dc448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:56:21 +00:00
Chaohui Wang
7f6412b196
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 4eaa0027e7
am: 0b3be6bd9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I95cb82be28dd552bba798530ea3ca712a8c27d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:56:15 +00:00
Jason Chiu
7c75ca2953
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: b83449af1a
am: fa6e470288
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I369ac936a08247bc7dd61fc875ac61d51be45342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:56:08 +00:00
Chaohui Wang
fec8a4ebea
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: 408728d4ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I172b1753457a735337ede73a23705dbe582cc164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:42:55 +00:00
Chaohui Wang
2ff3a05456
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: 408728d4ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: Ied58d877d63ad065e783cadbf401589e065a0d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:42:53 +00:00
Chaohui Wang
11e4a52593
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 7f4341f9aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: Iafb7419fcee9ee71ba2c00be19d26ec4b2c24ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:42:48 +00:00
Chaohui Wang
71961276bd
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 7f4341f9aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I5c6bbd8f0ab3f816492bcf1ecaf34a9acbcd3c63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:42:45 +00:00
Jason Chiu
9d4b8fab04
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: aaa3ad0890
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: Ib48b185d69442e1abdfec35850e639f8f7fbe303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:42:30 +00:00
Jason Chiu
9ac3a4c795
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: aaa3ad0890
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I16bdab3cae1f85976e34b8e0ce781cd2397a837d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:42:28 +00:00
Chaohui Wang
551549cf98
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: c20f0cabf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I80cdbf81ecfdd995c7ebd2838059828ac5caea95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:58 +00:00
Chaohui Wang
0b3be6bd9a
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 4eaa0027e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I28c760ff5825b823fd94b277baa54d4f17cc0454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:51 +00:00
Chaohui Wang
408728d4ab
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I47ff02a503fd52cd79be438647d0f45c74c22a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:44 +00:00
Jason Chiu
fa6e470288
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: b83449af1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I857211b2f211e54c83ac5457bb8878db44efc069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:43 +00:00
Chaohui Wang
c20f0cabf7
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: Ie214b97a1019488909831453470f0d250c11913f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:33:25 +00:00
Chaohui Wang
98429fbe65
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev
2022-05-27 10:29:51 +00:00
Chaohui Wang
7f4341f9aa
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I98bd7e8de5893d0f39fe91c99472346a3a9cadae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:18:53 +00:00
Jason Chiu
aaa3ad0890
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I62b60adb13e8068ef8c16aef67ef01c2ad988161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:18:46 +00:00
Chaohui Wang
4eaa0027e7
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: Iec9150fcc43cac98b72e523be28f2dac79d90c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:17:40 +00:00
Jason Chiu
b83449af1a
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: Ic9302d7b34e827ca55f8cd14709d4e8710823b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:17:29 +00:00
Chaohui Wang
05f6617b64
Merge "Fix flicker for AppDataUsagePreference" into tm-dev
2022-05-27 10:13:41 +00:00
Jason Chiu
bd6107d172
Merge "Don't start two pane for singleInstance deep links" into tm-dev
2022-05-27 09:52:30 +00:00
SongFerngWang
18f10bb8b1
[MEP] The removale slot can read the esim card
...
Revert the wrong logic for removale slot part at ag/18579901,
the removable slot can read the esim card.
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719
2022-05-27 16:44:52 +08:00
SongFerngWang
82bf2a66b7
Changing the condition since the esim may be removable
...
The condition whether the slot is esim slot should use getIsEuicc
api since the esim may be removable.
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
Merged-In: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
2022-05-27 07:10:28 +00:00
Automerger Merge Worker
0f62594f8e
Merge "Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: 968da5c582" into tm-d1-dev-plus-aosp am: 35f2cf8104
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: Id062add6229072e4945a2c6cb745727b4a290a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 07:10:06 +00:00
SongFerng Wang
d2f9b6d9c4
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: 15c33001a2
am: 6b3b355975
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: Ib5fef42588f0ab248d8c103c3e01be67e25d294d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 07:09:57 +00:00
SongFerng Wang
f93d0c2bc8
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: 15c33001a2
am: af87b62083
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: I3ff05011bc5157f82317ab70ba768742bad287a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 07:09:42 +00:00