Commit Graph

69916 Commits

Author SHA1 Message Date
Sunny Shao
ea8d70b9b1 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours am: b345896d55 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I299271b7dd23771e023ec0774caef49df5d89bf2
2020-06-20 05:21:11 +00:00
Sunny Shao
c325b11117 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours am: b345896d55 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I5deef4dc950efeb61a7e669c50b6cc37b7c7663c
2020-06-20 05:20:52 +00:00
Sunny Shao
b345896d55 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I1746a3d5fc38f521bf421d3a986f01f0c369ae7b
2020-06-20 05:08:14 +00:00
TreeHugger Robot
d157126eb8 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 914f8e7d07 am: f8c4277924
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: Ic10f29af66200bb89371fdfb575c4d39294a9ea5
2020-06-20 05:02:30 +00:00
Sunny Shao
b6503ecd60 [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: e4e335c662 -s ours am: b9d8eebcdb -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I8ce6b1685e62e8f8f49eb0c980d7274e1468a7c5
2020-06-20 05:02:25 +00:00
TreeHugger Robot
be1215c864 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f am: 58c4a5bf48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I49201c827abd6ca288a2d360873d17d4420148c6
2020-06-20 05:02:18 +00:00
Sunny Shao
0293bd3222 [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: a3c637e61b -s ours am: 0d8086c16c -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I64968076496262183764f213193035fd2636e2c1
2020-06-20 05:02:06 +00:00
Mark Chien
22fef7d38b [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 92eb12c0e2 am: cbfe64ea94 -s ours am: 0614f6da80 -s ours am: 2a77178e63 -s ours
am skip reason: Change-Id I3b0da2672246997aee16b11576ce5ae9bfe596dc with SHA-1 efb029c067 is in history

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

Change-Id: I9fffe44f3caa9c0e8a8c26d5f68bbad812337544
2020-06-20 04:58:46 +00:00
markchien
e70ac94408 [automerger skipped] Get entitlement configuration from intent extra am: 6d2c010891 am: 017dd38916 -s ours am: f5dc453a8b -s ours am: 5497e1a929 -s ours
am skip reason: Change-Id I3d06df01302a9c1f0893712d9250fe394dc66588 with SHA-1 e22bd7a2e8 is in history

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

Change-Id: If09c2e2108fa76a53bd870f09fbf7164fa31ec9d
2020-06-20 04:58:44 +00:00
markchien
eb0febd059 [automerger skipped] Remove isProvisioningNeededButUnavailable usage am: e48a3d7a76 am: 1932ef4389 -s ours am: c0d484c488 -s ours am: 1abe88eb28 -s ours
am skip reason: Change-Id If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c with SHA-1 92b09e825f is in history

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

Change-Id: I37c98ba13f3bb842a4e2e3b70d3fd4e0d29af5b3
2020-06-20 04:58:41 +00:00
Sunny Shao
2bc77c01e6 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: fab0388dc5 -s ours am: a2264d9a09 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: Ie739d5c2356a4640a90216fb057c949b7175d8cd
2020-06-20 04:58:17 +00:00
Sunny Shao
2e978b2d0f [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: 6b54959afe -s ours am: 426b2576a2 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: Ia1df4eb334da9bf84674eb13e8d7ee2b0a0aece1
2020-06-20 04:58:10 +00:00
TreeHugger Robot
33e5429474 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f am: d9d63ebea6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I24a7976f0928ddf8fb4755a57b6659393164f91b
2020-06-20 04:57:22 +00:00
Sunny Shao
b97e04f8da [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: a3c637e61b -s ours am: 73e27b249f -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

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

Change-Id: I76463a2ff1c75bc868f4cea49b4a27b0e7874f46
2020-06-20 04:57:01 +00:00
Sunny Shao
d6812eb371 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: 6b54959afe -s ours am: 0322929036 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

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

Change-Id: I32af44f0f73e927fb198b55fd1677a47c0440da8
2020-06-20 04:56:53 +00:00
TreeHugger Robot
d9d63ebea6 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: If2bece909901622ae43762ed24f1fc2853d278ba
2020-06-20 04:56:52 +00:00
TreeHugger Robot
f8c4277924 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 914f8e7d07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: Ia3b9d654d0d62e10daec80c1b5e05b9739f62272
2020-06-20 04:56:51 +00:00
Sunny Shao
73e27b249f [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: a3c637e61b -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

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

Change-Id: I27a04f69e54108cc16b472b096ba135221099950
2020-06-20 04:56:46 +00:00
Sunny Shao
b9d8eebcdb [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: e4e335c662 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I646cae8a5c2b5530803e018bde6b628124b3d299
2020-06-20 04:56:44 +00:00
TreeHugger Robot
58c4a5bf48 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: Ia862cf87cf256805fb0b6ab27101cdfc41614778
2020-06-20 04:56:28 +00:00
Sunny Shao
2a2639f193 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I8dc9137ebe410ae8b4484c2fe489a9e7caa6ac59
2020-06-20 04:56:22 +00:00
Sunny Shao
0d8086c16c [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: a3c637e61b -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

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

Change-Id: Ifb3a75afc4c130396ad28cd3d7fa2d8b95648f38
2020-06-20 04:56:22 +00:00
Sunny Shao
2b11f44b90 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I4dd7f5ec61df98fd6ab2b7c7f9c76d29517fa42a
2020-06-20 04:44:00 +00:00
TreeHugger Robot
914f8e7d07 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I6607dc1cea3303faf895dbacbd5528f4600118e2
2020-06-20 04:43:49 +00:00
TreeHugger Robot
731e6d8e5f Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I924680694eb54be8e4447e873aa195aa1f5c19c4
2020-06-20 04:43:49 +00:00
Sunny Shao
e4e335c662 [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

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

Change-Id: I35c521acfe9cacdf2189606addb8d9e5532a9f82
2020-06-20 04:43:41 +00:00
Sunny Shao
a3c637e61b [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

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

Change-Id: I3f5b3413b533a0474de2ce783f0d0740a6193841
2020-06-20 04:43:38 +00:00
Mark Chien
2a77178e63 [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 92eb12c0e2 am: cbfe64ea94 -s ours am: 0614f6da80 -s ours
am skip reason: Change-Id I3b0da2672246997aee16b11576ce5ae9bfe596dc with SHA-1 efb029c067 is in history

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

Change-Id: I19f31fdbad6afd512c6728fd8d09799b06570af2
2020-06-20 04:39:08 +00:00
markchien
5497e1a929 [automerger skipped] Get entitlement configuration from intent extra am: 6d2c010891 am: 017dd38916 -s ours am: f5dc453a8b -s ours
am skip reason: Change-Id I3d06df01302a9c1f0893712d9250fe394dc66588 with SHA-1 e22bd7a2e8 is in history

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

Change-Id: Id2df5e5ebad706e4269075294aba0a09ce12ed14
2020-06-20 04:39:06 +00:00
markchien
1abe88eb28 [automerger skipped] Remove isProvisioningNeededButUnavailable usage am: e48a3d7a76 am: 1932ef4389 -s ours am: c0d484c488 -s ours
am skip reason: Change-Id If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c with SHA-1 92b09e825f is in history

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

Change-Id: I9d822817789f46a481da335692f409cf4b7ea350
2020-06-20 04:39:03 +00:00
Sunny Shao
a2264d9a09 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: fab0388dc5 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

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

Change-Id: I233c5adf67d8c88f0dc551b8c5da0221599fcb5a
2020-06-20 04:38:38 +00:00
Sunny Shao
0322929036 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: 6b54959afe -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

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

Change-Id: Id9f4b77e5d32c7862d3f0106b903360cab9c267a
2020-06-20 04:38:31 +00:00
Sunny Shao
426b2576a2 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: 6b54959afe -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

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

Change-Id: Iee0d191e928b96dea7e663caa1cd8d961aa78ddc
2020-06-20 04:38:21 +00:00
TreeHugger Robot
5b849d8ac8 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev 2020-06-20 04:35:24 +00:00
Sunny Shao
9c6ab4cbd3 Allows to launch only authenticator owned activities am: 818fef48f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014

Change-Id: I931654780a07f5e8f52dc875854545771d99bcde
2020-06-20 04:32:24 +00:00
Mark Chien
0614f6da80 [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 92eb12c0e2 am: cbfe64ea94 -s ours
am skip reason: Change-Id I3b0da2672246997aee16b11576ce5ae9bfe596dc with SHA-1 efb029c067 is in history

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

Change-Id: I9cc809b0e7d479356d1b360896376d7514b08b16
2020-06-20 04:32:24 +00:00
markchien
f5dc453a8b [automerger skipped] Get entitlement configuration from intent extra am: 6d2c010891 am: 017dd38916 -s ours
am skip reason: Change-Id I3d06df01302a9c1f0893712d9250fe394dc66588 with SHA-1 e22bd7a2e8 is in history

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

Change-Id: Ib868520194f880ad5b19e64e6fb42f6d1e31487e
2020-06-20 04:32:21 +00:00
markchien
c0d484c488 [automerger skipped] Remove isProvisioningNeededButUnavailable usage am: e48a3d7a76 am: 1932ef4389 -s ours
am skip reason: Change-Id If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c with SHA-1 92b09e825f is in history

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

Change-Id: Id4d3b26e9bd79a116ccd96329e13c25e3df4436c
2020-06-20 04:32:19 +00:00
Sunny Shao
0f995b348c [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

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

Change-Id: Ie2bf08f396f0f56abe4e16cb911f2f0ad4ae711b
2020-06-20 04:32:10 +00:00
Sunny Shao
fab0388dc5 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

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

Change-Id: If28a5f3cfe247d1f0d9427c30cc08f364f021060
2020-06-20 04:26:37 +00:00
Sunny Shao
6b54959afe [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

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

Change-Id: I03039040a71397c3970badd1f39d546bf2b0cf42
2020-06-20 04:26:17 +00:00
Sunny Shao
af9bdcb4b5 [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

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

Change-Id: I744c94080ee322f7def92065538b39ef0b9213d4
2020-06-20 04:20:17 +00:00
Mark Chien
cbfe64ea94 Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 92eb12c0e2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344640

Change-Id: I872b45c0a3d824f173d29ad1665148af54091e7f
2020-06-20 04:17:02 +00:00
markchien
017dd38916 Get entitlement configuration from intent extra am: 6d2c010891
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344639

Change-Id: Ica0ea1d13697ceffc0b4f3b9b13ebd4479d6935f
2020-06-20 04:17:00 +00:00
markchien
1932ef4389 Remove isProvisioningNeededButUnavailable usage am: e48a3d7a76
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344638

Change-Id: I51f35111c46cc080baf2a462c67fde749148e8d4
2020-06-20 04:16:58 +00:00
Sunny Shao
cd328fdf28 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

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

Change-Id: I7ceb020038b0dcc729e7e5a406f5bd3479ee199c
2020-06-20 04:14:04 +00:00
Mark Chien
ec043b4bbb [automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496 am: ba4af7020c -s ours am: f6c4022554 -s ours am: b7b32ad983 -s ours
am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecffae is in history

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

Change-Id: I9f7d5cf1613f0a4b6c03b5dabdb3a704bf83848e
2020-06-20 04:04:24 +00:00
Mark Chien
b55043f479 [automerger skipped] Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda am: 3548a5eb0e -s ours am: f19ef641c8 -s ours am: 4d929f894c -s ours
am skip reason: Change-Id Ie45859c19b96d0689c45dd610501fae0506742ff with SHA-1 257b9bcdfa is in history

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

Change-Id: I9051bfdccee99bb80b977d036cef720eb0565fbe
2020-06-20 04:03:51 +00:00
Mark Chien
92eb12c0e2 Merge changes from topics "pass-res", "remove-isProvisioningNeeded"
* changes:
  Remove unused resource from TetherServiceTest
  Get entitlement configuration from intent extra
  Remove isProvisioningNeededButUnavailable usage
2020-06-20 04:02:15 +00:00
Mark Chien
b7b32ad983 [automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496 am: ba4af7020c -s ours am: f6c4022554 -s ours
am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecffae is in history

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

Change-Id: I68d06a70f2fe19be55e8dc4f02174d65987334a2
2020-06-20 03:52:11 +00:00