Peter Wang
41eab93b70
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
am: 44ed1b24f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: I82c4c78e8b9876ca2851b3388cfe1d4a3d9b0f32
2021-08-04 18:52:58 +00:00
Peter Wang
b9db3d3a04
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
am: 429dc94cfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: I252e0b00a54d5d31f1419b58261e3c8c3fed3b64
2021-08-04 18:52:36 +00:00
Peter Wang
44ed1b24f8
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: I030fa95efa6105bced4592e15cc7b07b5722d757
2021-08-04 18:07:06 +00:00
Peter Wang
429dc94cfa
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: Id9bfd7d9b9668d8fdeb0251902c1002a99ff833e
2021-08-04 18:06:15 +00:00
Peter Wang
e098b85711
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: I2f8fdf57c5bf00ffd68861daaf2701ac0c1196c0
2021-08-04 18:06:10 +00:00
Peter Wang
831d1153e9
Merge "Update broadcast intent string to correct format" into sc-dev
2021-08-04 17:54:03 +00:00
TreeHugger Robot
cbacb4aec0
Merge "Handle blobs and leases that never expire correctly."
2021-08-04 16:05:31 +00:00
TreeHugger Robot
a59a192625
Merge "Job Scheduler TARE page implementation"
2021-08-04 15:54:12 +00:00
TreeHugger Robot
cb1a6a7755
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: f42a8893c6
am: 2c857e96de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I1b9f97f227008f27a37e3fbd3545982b4313a79e
2021-08-04 07:55:50 +00:00
TreeHugger Robot
09005917e6
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: b40dabe916
am: 91321b329a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I995ed02b3a668e4ae678b05cc87335ba40cb9f3a
2021-08-04 07:55:41 +00:00
TreeHugger Robot
2c857e96de
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: f42a8893c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I66e7ba48d137ec97305081a5c4cbebe25f9d0239
2021-08-04 07:43:12 +00:00
TreeHugger Robot
91321b329a
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: b40dabe916
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I8c6d26177c24f8670db66dd04c52623ab224949d
2021-08-04 07:42:53 +00:00
TreeHugger Robot
c3d193572f
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: 1741a0bd6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I7315ee315f79f8ec724353621aac9b82b3f71837
2021-08-04 07:42:27 +00:00
TreeHugger Robot
b40dabe916
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: Idc444434a9c06cb1890b147c06fa6cf084beb401
2021-08-04 07:30:00 +00:00
TreeHugger Robot
1741a0bd6c
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: Ie4cfa9b52049abd6e8e4fb5f152cecbed0c602ab
2021-08-04 07:29:18 +00:00
TreeHugger Robot
f42a8893c6
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I0daddb467799ae48f25a1ecbf2e9b76081f96f1b
2021-08-04 07:28:12 +00:00
TreeHugger Robot
6f1bc2f52e
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev
2021-08-04 07:16:35 +00:00
Treehugger Robot
dc958f27e8
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717
am: 93a418718f
-s ours am: 8f0658f24d
-s ours am: 4fa35e41b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: Id083ac4906df682d8774a9f0f21d5aa7bb5c74d2
2021-08-04 02:28:35 +00:00
Xin Li
db19ea7e4b
[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b
am: 4785355302
-s ours am: 1d2519ade1
-s ours am: 0924dc7b5c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I1b10f69c8bb44c3f5bedc5f3f5effbf0d76b199b
2021-08-04 02:28:30 +00:00
Treehugger Robot
4fa35e41b9
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717
am: 93a418718f
-s ours am: 8f0658f24d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I70994758c7410f4cd98e61a64e22cdf496962436
2021-08-04 02:15:04 +00:00
Xin Li
0924dc7b5c
[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b
am: 4785355302
-s ours am: 1d2519ade1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I4ad6a89859c1c8db0dff384dd876eab1486bc8a1
2021-08-04 02:15:00 +00:00
Treehugger Robot
8f0658f24d
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717
am: 93a418718f
-s ours
...
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I1ba07ac8c0a20cf6f1422d2be60c00a10e304ba7
2021-08-04 01:59:51 +00:00
Xin Li
1d2519ade1
[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b
am: 4785355302
-s ours
...
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: Ic475987a1d6f0435fb4c4c77e28ada1b687878ff
2021-08-04 01:59:46 +00:00
Treehugger Robot
93a418718f
Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I86a2d120881f268b479b8a0e1bda3832fcb867bc
2021-08-04 01:28:25 +00:00
Xin Li
4785355302
DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I1cc9538054669c2c71105d44c8601fb1bf6e8579
2021-08-04 01:28:22 +00:00
Treehugger Robot
a529d8c717
Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1."
2021-08-04 01:05:56 +00:00
Yifan Hong
045354fa8c
Merge "PairDevice to structured Parcelable." am: f7ff663887
am: eddbc8a356
am: bbd851fea7
am: e3aecc8290
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: Ib469a94982990b0cb98a9146a7a4da474f0bbe20
2021-08-04 00:37:59 +00:00
Yifan Hong
e3aecc8290
Merge "PairDevice to structured Parcelable." am: f7ff663887
am: eddbc8a356
am: bbd851fea7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: I2c334127de069f834cf4d955ac18cf0df4ed5f83
2021-08-04 00:22:13 +00:00
Yifan Hong
bbd851fea7
Merge "PairDevice to structured Parcelable." am: f7ff663887
am: eddbc8a356
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: Ife1bbb4e839ee6115b2809113c715068cdb94e59
2021-08-04 00:07:38 +00:00
Yifan Hong
eddbc8a356
Merge "PairDevice to structured Parcelable." am: f7ff663887
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: I6dcf1c7dab645aae4461a1100b580b5c8b2781ad
2021-08-03 23:46:26 +00:00
Yifan Hong
f7ff663887
Merge "PairDevice to structured Parcelable."
2021-08-03 23:32:27 +00:00
Xin Li
27ade80e6b
DO NOT MERGE - Merge RQ3A.210805.001.A1.
...
Bug: 192585466
Merged-In: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
Change-Id: I2bf4a9589a121a8bc2d2c4680a1fa081784a2e8a
2021-08-03 16:07:50 -07:00
Yifan Hong
1b586ec8dc
IAdbManager.getPairDevices returns FingerprintAndPairDevice[].
...
Map is not supported in C++ backend. To compile IAdbManager in C++,
Map is translated into a list of key, value tuples.
Test: pass
Bug: 190867939
Change-Id: I1a057306161a4f8eaef33e3c40b1db9494aea3e5
2021-08-03 14:05:32 -07:00
Yifan Hong
d61750990d
PairDevice to structured Parcelable.
...
Bug: 194829333
Test: pass
Change-Id: I202ae5aa16d4323afa2a48cc3070f8e13c701efd
2021-08-03 14:05:31 -07:00
Varun Shah
eefce6a1f3
Handle blobs and leases that never expire correctly.
...
Add logic to properly handle blobs and leases that never expire.
Also add the relevant strings required in this package.
Fixes: 194439893
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SharedDataPreferenceControllerTest
Test: manual (visual)
Change-Id: Ifeb216a92a3be8d1db3574b4f63e2d04adace4ea
2021-08-03 12:09:14 -07:00
Bonian Chen
e421a7265d
Merge "[Settings] eSIM existance detection rule change"
2021-08-03 13:12:20 +00:00
Bonian Chen
848d097b94
[Settings] eSIM existance detection rule change
...
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.
2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.
Bug: 195090132
Bug: 195091953
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
2021-08-03 11:04:27 +00:00
Joy Babafemi
130a7228d6
Merge "UWB: Re-enable UWB toggle"
2021-08-03 04:14:34 +00:00
alinasuarez
8073d4eb92
Job Scheduler TARE page implementation
...
A Job Scheduler policy page is needed in the TARE developer options
settings to allow developers to both view and edit the current values of
all the factors under the job scheduler policy. The page uses a dropdown
so that the user can easily switch between the different policies. For
the factors with subfactors, the user simply clicks on the factor and
the subfactors wil pop up under it.
Bug: 191877052
Test: Manual (open Settings > System > Developer Options > TARE >
JobScheduler and verify all factors are there)
Change-Id: Icea6cda5e4b59d1736f85defcb9532839c3720f5
2021-08-03 02:26:19 +00:00
Joe Bolinger
765b7f4073
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825
am: 8a8f607218
am: 7f94e57003
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652
Change-Id: I508b81f7a56ce0362309528dea91d62a4aa7aa01
2021-08-02 21:54:50 +00:00
Joe Bolinger
903e7151ef
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825
am: 7324d75b4f
am: b67ebf0c5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652
Change-Id: Iac6e4041aaa84d327d5760ce04ace8c767dc323f
2021-08-02 21:54:29 +00:00
Joe Bolinger
7f94e57003
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825
am: 8a8f607218
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652
Change-Id: I78054fc148d39cd7728a976c1406ddf38a5d0a32
2021-08-02 21:44:35 +00:00
Joe Bolinger
b67ebf0c5c
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825
am: 7324d75b4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652
Change-Id: Ifc1a660def75b1b781b40dae6da9e3e608e0ef7a
2021-08-02 21:44:10 +00:00
Joe Bolinger
7864beaafd
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825
am: c76d3e5af7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652
Change-Id: I15f97e1dee53c996e294b70b924e5949cfbd0f61
2021-08-02 21:43:53 +00:00
Joe Bolinger
7324d75b4f
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652
Change-Id: I0fda8c0922e45b45a4fb2b10431289724ea26851
2021-08-02 21:28:29 +00:00
Joe Bolinger
c76d3e5af7
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652
Change-Id: I9d2c3c9daf090f26244f42b730507ba64a279500
2021-08-02 21:27:44 +00:00
Joe Bolinger
8a8f607218
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652
Change-Id: I7912e8ac26ee4c5cd611a8d7e535fb3f4f93d018
2021-08-02 21:26:51 +00:00
Joe Bolinger
fdb80de825
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev
2021-08-02 21:15:40 +00:00
TreeHugger Robot
32ef854a8d
Merge "Alarm Manager policy TARE page implementation"
2021-08-02 19:37:17 +00:00
alinasuarez
aef6ac2889
Alarm Manager policy TARE page implementation
...
An alarm manager policy page is needed in the TARE developer option
settings to allow developers to both view and edit the current values of
all the factors under the alarm manager policy. The page uses a dropdown
so that the user can easily switch between the different policies. For
the factors with subfactors, the user simply clicks on the factor and
the subfactors will pop up under it.
Bug: 191876714
Bug: 191876567
Test: Manual (open Settings > System > Developer Options > TARE > Alarm
Manger and verify all factors are there)
Change-Id: Ie036e26df80947d23041bedfd5b1385e48069b6b
2021-08-02 17:39:36 +00:00