Akshay Thakker
efbdb099fd
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: I00d9c3ce6b3213de8dd04de38da7e60737c5d5fd
2020-06-20 03:10:27 +00:00
Mark Chien
4064368496
Merge "Replace ConnectivityManager as TetheringManager"
2020-06-20 03:08:37 +00:00
Mark Chien
9f1fe57bda
Merge "Remove schedule recheck logic from TetherService"
2020-06-20 03:08:14 +00:00
Jason Chiu
442de5c4dd
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
am: 468e567368
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: I2c9b54011db4a9269f2cb01539ab5a793783c482
2020-06-20 03:04:39 +00:00
Jason Chiu
4a48011fba
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
am: 5381571891
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: Iad6aac126e058bc6293d0587debb345506e7b643
2020-06-20 03:04:27 +00:00
Jason Chiu
cfe50a6f60
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
am: 5381571891
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: If672ca9668dd95afba4b8d859a7fad2389a45c13
2020-06-20 03:04:24 +00:00
Akshay Thakker
826459695f
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev
2020-06-20 02:56:49 +00:00
Akshay Thakker
52ac47d9c8
Revert "Fix SecurityException while accessing Slice Uris"
...
This reverts commit 2e790e1859
.
Reason for revert: I accidentally +2'd this CL and it got merged. Sorry about that.
Change-Id: Ia1b2e0a264e16b368601bbb7a32148ec6c183e84
Bug: 159195420
Exempt-From-Owner-Approval: Just a revert
2020-06-20 02:56:09 +00:00
Jason Chiu
468e567368
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: I0023e814f8bf3b86ddbcc879427efd5d4038f700
2020-06-20 02:52:16 +00:00
Jason Chiu
5381571891
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: I8f016042af7f617ba0cebda0aab717912a7e9225
2020-06-20 02:51:56 +00:00
Tim Peng
c34c5d994b
In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions.
...
-Add "disableRecyclerViewItemAnimator" style to disable animation
Bug: 152605598
Test: manual test
Change-Id: Ibb43231d8734a4f20d13fc014eaa6c9142064e20
2020-06-20 10:44:51 +08:00
Jason Chiu
4b6e900e64
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev
2020-06-20 02:39:21 +00:00
Kevin Chyn
95e05d8d07
Merge "Remove setActiveUser together with frameworks/base (see 12/n)"
2020-06-20 01:02:24 +00:00
Beth Thibodeau
59cbd11c04
Add toggle for media resumption
...
Adds a toggle under Settings > Sound > Media to toggle media resumption
Bug: 154039093
Test: manual
Test: atest SettingsProviderTest
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="MediaControls"
Change-Id: I803c57031bc3252cab35c06ea124d1c22a3c3aeb
2020-06-20 00:12:23 +00:00
Automerger Merge Worker
851b51308f
Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp am: f2ebba9025
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Iaf9258d43189a94ce16eccf4bdff12006aafc3a7
2020-06-19 23:18:39 +00:00
Beth Thibodeau
67126bdb74
[automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
am: e9691bdc94
am: bd62fc7dae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I0d76ca4f1a0e08fbe0a3e356d6b439c2fecc0128
2020-06-19 23:18:37 +00:00
Automerger Merge Worker
a28c2c57dd
Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 0701bcefbc
am: ca5ce305af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I33aad3b30406b95a3cf5fce3a4c019702a5b8c56
2020-06-19 23:16:35 +00:00
Beth Thibodeau
57b516cddc
[automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 5e6f05a533
am: 941a4369d8
am: 87441e00b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I2bed6465f6ad7fd70ac18eb1ecc12488683c4cc3
2020-06-19 23:16:33 +00:00
Beth Thibodeau
090802c1fd
[automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
am: 8b9b226bcf
am: 2f749ba768
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I016ffc0a718e14fb1b4c79588befebeb7a6aa9f0
2020-06-19 23:14:47 +00:00
Beth Thibodeau
91d1e64d5c
[automerger skipped] [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
am: c30c0c381c
am: e92c41ee14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I6c02289fc7911d226e37e4f3237e166ed1c4fa14
2020-06-19 23:14:44 +00:00
Automerger Merge Worker
f2ebba9025
Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp
...
* changes:
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
am: e9691bdc94
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
am: 44ce07125a
2020-06-19 22:57:06 +00:00
Automerger Merge Worker
ca5ce305af
Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 0701bcefbc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I605fa7f7c2225713a267a4e60f26461a91e536d9
2020-06-19 22:56:53 +00:00
Beth Thibodeau
87441e00b9
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 5e6f05a533
am: 941a4369d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I7e796e5e1b757d90d8f42ffe4230c3ff5e156db7
2020-06-19 22:56:50 +00:00
Beth Thibodeau
bd62fc7dae
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
am: e9691bdc94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I0ea0cf9d615041521a5bdbe2de483c8d94cec294
2020-06-19 22:56:49 +00:00
Beth Thibodeau
ae0cf1d24b
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
am: 44ce07125a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I349e8fc01405d897a9219dd51118d7cf432e5a4a
2020-06-19 22:56:46 +00:00
Beth Thibodeau
2f749ba768
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
am: 8b9b226bcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I2c732e309e17767ce72edcd9605cb978c3aa2e76
2020-06-19 22:55:39 +00:00
Beth Thibodeau
e92c41ee14
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
am: c30c0c381c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I59ea65df35ecc811e22dc57165982634b8806a7a
2020-06-19 22:55:36 +00:00
Automerger Merge Worker
0701bcefbc
Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp
...
* changes:
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 5e6f05a533
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: a648d121b7
2020-06-19 22:44:12 +00:00
Beth Thibodeau
941a4369d8
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 5e6f05a533
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Idd424e240102e9bf2c096711a76d7b60a54884af
2020-06-19 22:44:00 +00:00
Beth Thibodeau
26c5f5082f
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: a648d121b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I27e4dc2c479259ec7d0ef5797f2a773d6b22baf9
2020-06-19 22:43:58 +00:00
Beth Thibodeau
8b9b226bcf
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I02078c493b6d952b5b52d7accd5b248c77d4e234
2020-06-19 22:43:47 +00:00
Beth Thibodeau
c30c0c381c
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I2b9690779b8cf6f5e6b8ae6c6dc6f428fb55c3bf
2020-06-19 22:43:44 +00:00
Beth Thibodeau
e9691bdc94
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Iad23f9254826d04f5b8c7f3ff22fa0dc780a27b9
2020-06-19 22:41:18 +00:00
Beth Thibodeau
44ce07125a
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I90c457110b1bd444e08894560fccba483e2699f9
2020-06-19 22:41:16 +00:00
Beth Thibodeau
5e6f05a533
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Ib4dfa5a23c490651c0bc540866f4f99e77b70c6d
2020-06-19 22:40:42 +00:00
Beth Thibodeau
a648d121b7
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Ifed5f6e94045c09bcb5009827c24e668a11ac0a2
2020-06-19 22:40:39 +00:00
Beth Thibodeau
3ef895694d
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I2a1b2ee94f990485cf8f80b98daec71241eca000
2020-06-19 22:40:27 +00:00
Beth Thibodeau
43834d78ff
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Ib4fffb001ffe58da7e0a9ed759dc75c475b3ae8a
2020-06-19 22:40:24 +00:00
Beth Thibodeau
0b152c29d0
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev
2020-06-19 22:26:59 +00:00
David Su
a9a7f65a10
Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast
...
WifiConfig is no longer sent in this broadcast
due to privacy concerns, so stop reading this
extra. Instead, query WifiManager to find the
matching WifiConfiguration to update.
Bug: 158874479
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.wifi.details.WifiDetailPreferenceControllerTest"
Change-Id: Ie52339220acbbe111a6aa5f785fbfa409c405b5b
2020-06-19 11:20:21 -07:00
markchien
77c297df4f
Remove unused resource from TetherServiceTest
...
TetherService is no longer query resource by itself after ag/11524847.
That CL miss to remove unused getResources code.
Now remove unused resource in this change.
Bug: 146918263
Test: atest TetherServiceTest
Change-Id: I3b0da2672246997aee16b11576ce5ae9bfe596dc
Merged-In: I3b0da2672246997aee16b11576ce5ae9bfe596dc
2020-06-19 23:23:02 +08:00
markchien
6d2c010891
Get entitlement configuration from intent extra
...
Tethering resource configuration is move from framwork to tethering
module. The resource would not be accessible from outside of tethering
module.
List the replacements of framework resources usage and intent extra:
1. R.string.config_mobile_hotspot_provision_response
--> android.net.extra.TETHER_PROVISIONING_RESPONSE.
2. R.string.config_mobile_hotspot_provision_app_no_ui
--> android.net.extra.TETHER_UI_PROVISIONING_APP_NAME
3. R.array.config_mobile_hotspot_provision_app
--> android.net.extra.TETHER_SILENT_PROVISIONING_ACTION
Besides, the current active subId would put in
android.net.extra.TETHER_SUBID
Note: They are not APIs because of API freeze. Now both tethering module
and Settings define these strings independently. Will replace hard code
string as tethering module-lib APIs in b/159085857.
Also move the entitlement response intent registeration from onCreated
to onStartCommand, this can avoid wrong intent registeration if subId
changed between onCreate and when the intent arrived.
Bug: 146918263
Test: atest TetherServiceTest
atest TetherProvisioningActivityTest
Change-Id: I3d06df01302a9c1f0893712d9250fe394dc66588
Merged-In: I3d06df01302a9c1f0893712d9250fe394dc66588
2020-06-19 23:21:17 +08:00
markchien
e48a3d7a76
Remove isProvisioningNeededButUnavailable usage
...
config_mobile_hotspot_provision_app would be move out of framework and
only private for tethering only. TetherUtil#isProvisioningNeeded and
isProvisioningNeededButUnavailable are no longer needed because
tethering would ensure entitlement app is valid if entitlement check is
needed. Otherwise, tethering would return not supported that tethering
settings would be hidden.
Bug: 146918263
Test: m
Change-Id: If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c
Merged-In: If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c
2020-06-19 23:16:30 +08:00
markchien
dfd8d235a1
Replace ConnectivityManager as TetheringManager
...
Tethering APIs are all move to TetheringManager from Android R.
1. Replace ConnectivityManager tethering API usage as TetheringManager.
2. Use TetheringManager#stopTethering to disable usb tethering instead
of using deprecated ConnectivityService#setUsbTethering
3. Use TetheringManager#stopTethering to disable bluetooth tethering
instead of directly use BluetoothPan#setBlueoothTethering. So bluetooth
getProfileProxy is not needed in TetherService because tethering would
do that when calling #stopTethering.
4. Also support TETHERING_ETHERNET entitlement check that
TETHERING_ETHERNET is new added from Android R.
Bug: 146918263
Test: atest TetherServiceTest
Change-Id: Id969f29d7210f2ee32719c76439049bbc86cd4f6
Merged-In: Id969f29d7210f2ee32719c76439049bbc86cd4f6
2020-06-19 23:05:27 +08:00
markchien
500ce1d4c8
Remove schedule recheck logic from TetherService
...
This change just remove unused code.
Tethering no longer ask TetherService to schedule recheck
(use #EXTRA_SET_ALARM) from Android Q. Intead Tethering
(EntitlementManager) would schedule the recheck by itself.
This change is necessary in order to move the resourcesout
of the framework because TetherService needs to know when
it need to re-run entitlement recheck from framework res
(config_mobile_hotspot_provision_check_period).
Bug: 146918263
Test: atest TetherSerivceTest
Change-Id: Ie45859c19b96d0689c45dd610501fae0506742ff
Merged-In: Ie45859c19b96d0689c45dd610501fae0506742ff
2020-06-19 23:04:43 +08:00
TreeHugger Robot
992d31cd03
Merge "Add BatteryStatusFeatureProvider"
2020-06-19 14:02:13 +00:00
TreeHugger Robot
0fe5efacda
Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1
am: 5b5c335b01
am: 3015d09885
am: 207d0a0af5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592
Change-Id: I151f59004f19a4e3120202ef29f468585809d7c3
2020-06-19 13:29:29 +00:00
TreeHugger Robot
d3cf5eb03d
Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1
am: 87c77496a5
am: 16c66d916d
am: fecc48bf53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592
Change-Id: I63d2c17dab131e718550ce52c6a4a55748909411
2020-06-19 13:29:22 +00:00
TreeHugger Robot
c4471d716b
Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1
am: 5b5c335b01
am: 74a89fb9fd
am: 01d0ea7443
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592
Change-Id: Iadd7046da7869a864db428f78a122a250d8f98c3
2020-06-19 13:29:13 +00:00
TreeHugger Robot
207d0a0af5
Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1
am: 5b5c335b01
am: 3015d09885
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592
Change-Id: Ic441a6eec4d8bddefd5f7edac9dec9a219a9be44
2020-06-19 13:19:37 +00:00