PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,446 Commits 1 Branch 0 Tags
721980f0e0d6b32cf803e09e1ec3fead2ab1f64c
Commit Graph

74446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tim peng
c837f1f535 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: fc3f730d98 am: 23917b3826 am: 5375d1e3b1 am: 8cba94d43d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I44b7117b7cac17ae39047b5765da99dc5287f516
 2020-06-20 11:21:39 +00:00
tim peng
b42e467da4 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 593d62d992 am: 826cd4f88f am: 4d956498e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: Ib669b7a54a889ecfaf0d39ed66fbf4e70b93f86e
 2020-06-20 11:21:33 +00:00
tim peng
94e51cecbd Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 34a29d1bb5 am: 253ee8c68a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I9c927cacb0f194bd4bd873d1ccf9787e3431578c
 2020-06-20 11:06:01 +00:00
tim peng
8cba94d43d Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: fc3f730d98 am: 23917b3826 am: 5375d1e3b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: Icf65772fc4d27a1328752d9cb55cb9aad659472b
 2020-06-20 11:05:53 +00:00
tim peng
4d956498e4 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 593d62d992 am: 826cd4f88f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I7caf8d437cfd45979b1e33882c38d65c4fa43f63
 2020-06-20 11:05:46 +00:00
tim peng
253ee8c68a Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 34a29d1bb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I649c9f5a90d9ac2615e715b7a40e907faf40d495
 2020-06-20 11:02:27 +00:00
TreeHugger Robot
493a1fda66 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 am: fb904dcfc1 am: 98a03ef382 am: debe9953ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: I828225f140b65facdd7bd8785fcc9e8701df0ccf
 2020-06-20 10:58:53 +00:00
TreeHugger Robot
c30c865d90 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 128d19f24e am: ab95ad13fb am: 839750298a am: 7b95e27a23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Id07bc6c122b8c7f16187faed58e7dc4adab7dbb3
 2020-06-20 10:58:46 +00:00
TreeHugger Robot
7a370f19c0 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 am: 9c6d33b149 am: d7dbafa800 am: c7e7463625 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Id5fd48aa9019f706d146ed2ef2643833bacd66ae
 2020-06-20 10:58:40 +00:00
tim peng
5375d1e3b1 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: fc3f730d98 am: 23917b3826 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I0aa9b9a205445dd798245fc7b06a49c818287c4c
 2020-06-20 10:58:37 +00:00
tim peng
826cd4f88f Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 593d62d992 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: Ib28d00846fd3f92015248148e6ce83bd44e82c95
 2020-06-20 10:58:26 +00:00
TreeHugger Robot
debe9953ee Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 am: fb904dcfc1 am: 98a03ef382 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: I0bbae487818a626a78b090618be4a8350d44e8b7
 2020-06-20 10:48:47 +00:00
tim peng
34a29d1bb5 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I5424b492896803eb5e20ae2fcc636df7e7b5c6e5
 2020-06-20 10:48:45 +00:00
tim peng
23917b3826 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: fc3f730d98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I73bbbb19f344da5e35a50190ef175e059f4e47dc
 2020-06-20 10:48:45 +00:00
TreeHugger Robot
7b95e27a23 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 128d19f24e am: ab95ad13fb am: 839750298a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: I9967b745caba53e5e689996adb23344e416490e9
 2020-06-20 10:48:40 +00:00
tim peng
593d62d992 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: Ibcab4ea712bcf00fa380c2f449713e6304e766b2
 2020-06-20 10:48:25 +00:00
TreeHugger Robot
c7e7463625 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 am: 9c6d33b149 am: d7dbafa800 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: I99af8c7f3b81be86e3d8b155cf86cb646e9829b6
 2020-06-20 10:48:24 +00:00
Jason Chiu
3ee13ce4d6 Fix homepage cards show up problem after first launch 
ContextualCardLoader was waiting for eligible card checkers with a 300
ms timeout one by one in a loop. So if more than four checkers expire,
the total waiting time will exceed the 1 sec homepage content loading
timeout, which causes no card shows up.

The solution is to leverage all the checkers' timeout starting time,
and increase the timeout for all checkers. So that ContextualCardLoader
just needs to wait for all checkers for at most 400 ms and then can get
the results.

Bug: 159236069
Test: robotest
Change-Id: I601ac4151bf8be68b30eaabdb45a4e1ace95653f
 2020-06-20 18:36:38 +08:00
TreeHugger Robot
98a03ef382 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 am: fb904dcfc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Ib7183b5ea5b46e6f04ea8e037bf414982bef9357
 2020-06-20 10:25:23 +00:00
tim peng
fc3f730d98 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: Iadc1abf749b34eb94956dd9e21a910d56069d4d4
 2020-06-20 10:25:18 +00:00
TreeHugger Robot
839750298a Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 128d19f24e am: ab95ad13fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Icc29fe3093baa653323b57c55ba06bf9b4d6a425
 2020-06-20 10:25:09 +00:00
tim peng
9ff43d2fa3 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: Ida3ffa1110238057993e4ce345dce3cb3a8791d6
 2020-06-20 10:25:04 +00:00
TreeHugger Robot
d7dbafa800 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 am: 9c6d33b149 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: If6b5062dd334b53b3cb90f10dccd97b4a7ae7fa9
 2020-06-20 10:25:02 +00:00
TreeHugger Robot
fb904dcfc1 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: I5bcce3784d3192fab5dcbec2f13b8cf6e22694e8
 2020-06-20 10:12:26 +00:00
TreeHugger Robot
ab95ad13fb Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 128d19f24e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: I9296c9684b70222b8cabb39fd2c89093ca21d980
 2020-06-20 10:12:25 +00:00
tim peng
02e311e537 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev 2020-06-20 10:12:03 +00:00
TreeHugger Robot
9c6d33b149 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: I570056028a1605984de1d0e657bc540a8d6fe045
 2020-06-20 10:12:02 +00:00
TreeHugger Robot
128d19f24e Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Icc40ad462d75fdd5d104681fac707b0562119dfc
 2020-06-20 09:57:19 +00:00
TreeHugger Robot
74bb0edf99 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Ib482b91a0fc2b10d17150f212b2990ef753347a1
 2020-06-20 09:57:03 +00:00
TreeHugger Robot
cab1329f0f Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev 2020-06-20 09:42:23 +00:00
Mill Chen
a99b8799ee Make Telephony related PreferenceController un-sliceable 
Since the structure of Telephony is changed, some of Telephony
related PreferenceController cannot be converted to slices
smoothly whether devices have mobile data or not. So we
decided to make them un-sliceable.

Bug: 155846002
Test: robotests, manual
1. Settings -> Settings search -> search for roaming
2. Check that roaming result has no toggle widget.
Change-Id: I7cba8f6a750d9780a59411942665f68dac61248c
 2020-06-20 08:20:07 +00:00
Jason Chiu
ad9a214fff Revert "Revert "Fix SecurityException while accessing Slice Uris"" 
This reverts commit 52ac47d9c8.

Reason for revert: This CL is what we wanted to merge in RVC and has already got Code-Review +2, Owner-Approval, and DrNo-Review from other folks regardless of the accident.

Bug: 159195420
Change-Id: I6c646269cd3e13e015dcc06418e21db66372e680
 2020-06-20 07:04:52 +00:00
Sunny Shao
fdf8c69143 [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: c325b11117 -s ours am: b1756d3c50 -s ours am: aac6f22c8e -s ours am: a8dbe1ea3c -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I3c8e89a509dfe088f3ddcd2f88239f1c099569d6
 2020-06-20 06:13:37 +00:00
Sunny Shao
5db5a91e09 [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: ea8d70b9b1 -s ours am: 7bf05608b0 -s ours am: 1ad160b1df -s ours am: d38f2c64da -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I46dd9942d017c48d5b524aa632bb13e1c6e4e11e
 2020-06-20 06:13:29 +00:00
Sunny Shao
f69d9d46a1 [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: c325b11117 -s ours am: 064fb53d3f -s ours am: 40d3319974 -s ours am: d06761f504 -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: If29431252c84ec39ef9ce44ca62472513b4b5908
 2020-06-20 06:13:15 +00:00
Sunny Shao
a8dbe1ea3c [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: c325b11117 -s ours am: b1756d3c50 -s ours am: aac6f22c8e -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I4f9f4056a38e4da19752d611829f490af80f141e
 2020-06-20 05:58:17 +00:00
Sunny Shao
d38f2c64da [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: ea8d70b9b1 -s ours am: 7bf05608b0 -s ours am: 1ad160b1df -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: If7d9d205d6dd3ce1011d0329152402f6c9449a79
 2020-06-20 05:58:04 +00:00
Sunny Shao
d06761f504 [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: c325b11117 -s ours am: 064fb53d3f -s ours am: 40d3319974 -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: I3aa0cf097b82e4215e1632e996da78e1f2c58d48
 2020-06-20 05:57:46 +00:00
Sunny Shao
aac6f22c8e [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: c325b11117 -s ours am: b1756d3c50 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I08fa60d5d540d4cff58dff4bea6602b42803241e
 2020-06-20 05:47:28 +00:00
Sunny Shao
1ad160b1df [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: ea8d70b9b1 -s ours am: 7bf05608b0 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I11abcb84ddb10e7df9579e035c6e664ed2753445
 2020-06-20 05:47:16 +00:00
Sunny Shao
40d3319974 [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: c325b11117 -s ours am: 064fb53d3f -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: If338dadd0b609617d0d6213a7a5c6248f8fea76c
 2020-06-20 05:47:07 +00:00
Sunny Shao
b1756d3c50 [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: c325b11117 -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: I950880fd50f253fa3ba4e24fc5a6fa56a1d49888
 2020-06-20 05:35:15 +00:00
Sunny Shao
7bf05608b0 [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: ea8d70b9b1 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I22613bd66dcd88ddf7ddbf2ce2b3f7a5acbd25fc
 2020-06-20 05:35:11 +00:00
Sunny Shao
064fb53d3f [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: c325b11117 -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: I6f05f88204e0de2fdebf5a94d1333bcc0b41709f
 2020-06-20 05:34:53 +00:00
TreeHugger Robot
8db977f82f Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 914f8e7d07 am: f8c4277924 am: d157126eb8 am: b344462cb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I37bb0a7b096111c0324bdfdf647985af255a7bc2
 2020-06-20 05:24:00 +00:00
Sunny Shao
885386f2fc [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: b6503ecd60 -s ours am: 5cfc8c522b -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: Ic99bb246db69b0ba0888b803c25478b2fd8a3a0a
 2020-06-20 05:23:53 +00:00
TreeHugger Robot
07bdd7d88d Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f am: 58c4a5bf48 am: be1215c864 am: 24560b57a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I49fa6b9e2cca022283b08873397ce4421692a1d2
 2020-06-20 05:23:46 +00:00
Sunny Shao
842d7af3d2 [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: 0293bd3222 -s ours am: 2e1816cb35 -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: I96fbe12be63a9b3e8f00d9ec33b27fcbed1e1c81
 2020-06-20 05:23:38 +00:00
Mark Chien
5a9afcf3b7 [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: 22fef7d38b -s ours am: 4ac8a5a72c -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: Ide1dba199535ed51d28bbfcba24c60fb3ac357d4
 2020-06-20 05:23:24 +00:00
markchien
2696bbad69 [automerger skipped] Get entitlement configuration from intent extra am: 6d2c010891 am: 017dd38916 -s ours am: f5dc453a8b -s ours am: 5497e1a929 -s ours am: e70ac94408 -s ours am: 6b52dee0f3 -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: I86b06d95701e56adea2136220c8b538b4a7f8201
 2020-06-20 05:23:23 +00:00