Chaohui Wang
18ca565035
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: 408728d4ab
am: 2ff3a05456
am: 3091ed0dc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: Ife790cc66eb7245d82d7a528aea642ff8c7c2377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:43:18 +00:00
Chaohui Wang
4ff4f35fee
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 7f4341f9aa
am: 71961276bd
am: c7b308a92b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I5bd45e9f8ccdb9b1830e1142e2260871b3a0472b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:43:09 +00:00
Jason Chiu
4e75728a76
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: aaa3ad0890
am: 9ac3a4c795
am: e685ee302f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: Iad0968d8c77ef78fa0a6c135be6346653e0d563c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:43:01 +00:00
Chaohui Wang
99b5ed9ac6
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: 408728d4ab
am: fec8a4ebea
am: d0de9de36e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I03f884a711a2b29da43eb508a6c0356210ac49d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:42:53 +00:00
Chaohui Wang
f765f6e74e
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 7f4341f9aa
am: 11e4a52593
am: 36f4405ef9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I9123412b828952c5b41d8d62c15b183940fc2432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:42:35 +00:00
Jason Chiu
109b7a87fc
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: aaa3ad0890
am: 9d4b8fab04
am: 0ca50986d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: Ic82e963dcf609cd81d061b8dfbc8438060b264a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:42:17 +00:00
Chaohui Wang
418254bfaf
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: c20f0cabf7
am: 551549cf98
am: 7f7bc9a622
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I4451eaad1bb068c4759223d46101ddb1ab67f2fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:42:07 +00:00
Chaohui Wang
8353923721
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 4eaa0027e7
am: 0b3be6bd9a
am: 7f6412b196
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I190d6f0cb576c74a1e86169241747ac132621c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:41:16 +00:00
Jason Chiu
876b77eefa
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: b83449af1a
am: fa6e470288
am: 7c75ca2953
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: Ic309f12e7a15f68d771a9e52e3bed3781ead0187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 11:38:46 +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
25fd957190
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: b5b436b420
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I8644936ef0941e53b0d30cd100c5a823ef5d7b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:28 +00:00
Chaohui Wang
fec030ac2a
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 14fb9deb8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I79bbdb33d3556d48fb19c5384d227c96737fa566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:20 +00:00
Jason Chiu
4b25af3766
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: c003fd2688
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I5dedef2e67aa2ea2d4259f1a94cbb919da4fe70b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:08 +00:00
Chaohui Wang
b5b436b420
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: I5b65f6ea41d906f769358bfdca52809774e330f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:33:48 +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
14fb9deb8c
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: Ic323b3edeb5c2e1579cbc782b9ef1311433cfb0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:18:00 +00:00
Jason Chiu
c003fd2688
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: Ie56147110734f46528e940b52de69f905680f112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:17:51 +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
7d71d3f451
[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
Merged-In: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719
2022-05-27 08:54:09 +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
Automerger Merge Worker
c0d2fff003
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
am: 0f62594f8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: I37da68dead0389eb1629fa355d051e7c3da729a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 07:25:53 +00:00
SongFerng Wang
0812f59089
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: 15c33001a2
am: 6b3b355975
am: d2f9b6d9c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: I32a8db702f887a37ce66c2a2058c8be42f682e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 07:25:44 +00:00
SongFerng Wang
825d93d7bd
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: 15c33001a2
am: af87b62083
am: f93d0c2bc8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: If6284e4c0db3f540661cb0600dd6462e63b1bb9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 07:25:23 +00: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