Commit Graph

69916 Commits

Author SHA1 Message Date
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
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
TreeHugger Robot
fecc48bf53 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 87c77496a5 am: 16c66d916d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: Ib8c0f14839a114ba336edf332d294a0304b55e65
2020-06-19 13:19:27 +00:00
TreeHugger Robot
01d0ea7443 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 74a89fb9fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I5973f425cb7c0568a763ea0172ff5f61f672ddff
2020-06-19 13:19:19 +00:00
TreeHugger Robot
3015d09885 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I18c5baef9c87cf8a38a6b9f3333a280c9264b066
2020-06-19 13:02:31 +00:00
TreeHugger Robot
16c66d916d Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 87c77496a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: If0d6aa52c9029aab39d2aeda623e05f66632e555
2020-06-19 13:02:30 +00:00
TreeHugger Robot
74a89fb9fd Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: If0cb802f53b37094ebc66d26e625a514f9d77ebb
2020-06-19 13:02:11 +00:00
TreeHugger Robot
87c77496a5 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I6c594580c54b6b979d6044f14181cedb5311ed37
2020-06-19 12:48:56 +00:00
TreeHugger Robot
5b5c335b01 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I650b4a287132e3b6b8c8dce5f7f88cdc148d08ad
2020-06-19 12:48:41 +00:00
TreeHugger Robot
6217af3fe1 Merge "Improved UX when no debuggable apps are available." into rvc-dev 2020-06-19 12:32:52 +00:00
Yanting Yang
7adecf0d27 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: 95a27be9b2 am: 5b8300dfaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: Ie696d1c4f9dd13d6fd3cf556c601243316e262d7
2020-06-19 08:28:43 +00:00
Yanting Yang
7a965eb59f Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632 am: 0c61ab039f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I32e465ee7043ef2fa49deb6840f874bf314accc7
2020-06-19 08:28:22 +00:00
Yanting Yang
d208cb29c4 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632 am: 570f8e54f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: Ieee50c71705156b64ba1fe795df2fe85abf5b9bb
2020-06-19 08:28:06 +00:00
Yanting Yang
5b8300dfaf Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: 95a27be9b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I4a7899cf5cf6f9a5664ed7ff78cb534a4a8128df
2020-06-19 08:17:25 +00:00
Yanting Yang
0c61ab039f Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I9af4a1f4a16f638b6908b3bed52633b84b5afaed
2020-06-19 08:16:54 +00:00
Yanting Yang
570f8e54f7 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I0cebc3bef3647df08ab11e4d0886654bc300c265
2020-06-19 08:16:46 +00:00
Yanting Yang
95a27be9b2 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I5898459457a73270e973304c2cb3a8c0a1c80527
2020-06-19 08:00:27 +00:00
Yanting Yang
bd27683632 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I021a1ef7170000c297e83a806d3272456011da2c
2020-06-19 08:00:14 +00:00
Yanting Yang
ec606d6cdf Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev 2020-06-19 07:42:03 +00:00
Mark Chien
4efacef2f5 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: c3a501c02e am: cd0ffda87d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I4cb2fb3e8a8c14f64a3bf55ad22fc9eecd0c95a1
2020-06-19 06:20:02 +00:00
Automerger Merge Worker
291a2249ad Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254 am: af7ac88c6d" into rvc-qpr-dev-plus-aosp 2020-06-19 06:19:59 +00:00
Mark Chien
dd328aea20 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: 89eb0d1e41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: Idea3de3667db6930bf87cea80a8de34277244d0e
2020-06-19 06:19:49 +00:00
TreeHugger Robot
136854528e Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254 am: af7ac88c6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I426210dea47d05cb0603e3f92f2f8c7e8ac0607f
2020-06-19 06:19:47 +00:00
Mark Chien
211a604243 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: e35a89ef62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I4feb2c65b0d18bbcee4fb3c276364c99b0b2ecb8
2020-06-19 06:19:38 +00:00
Automerger Merge Worker
d9de06b059 Merge "[automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours" into rvc-d1-dev-plus-aosp am: 26016b54c5 -s ours
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

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

Change-Id: I3ddbe3ba18855570428c3b0e6cbafb69be0eaa05
2020-06-19 06:19:12 +00:00
TreeHugger Robot
79c3dc7f09 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 53d99db577
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I844fd32fddb45756aa8ba7326cd6ff584b7902d4
2020-06-19 06:18:58 +00:00
Automerger Merge Worker
510920bab8 Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 6c0d2225c0" into rvc-qpr-dev-plus-aosp 2020-06-19 06:18:56 +00:00
PETER LIANG
76e422608e [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 18e02caa18 -s ours
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

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

Change-Id: I7ed78016be291926e5c1f8647d9fe0d4842138ae
2020-06-19 06:18:46 +00:00
TreeHugger Robot
43e9340dfb Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 6c0d2225c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I86b2dd6ed85175a1c9e2bbcc1b7ce525eccd419a
2020-06-19 06:18:41 +00:00
PETER LIANG
15ca8b0e0c Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 31b09df257
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: If2a9375b5a305f001e3fcfe5b47629086b22e887
2020-06-19 06:18:32 +00:00
Mark Chien
cd0ffda87d Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: c3a501c02e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I0041d5af77b37b6ef1435453230371c752dea9f9
2020-06-19 06:00:40 +00:00
TreeHugger Robot
af7ac88c6d Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I6204226d9bd72d3173f5b2af981cf4b276c48dff
2020-06-19 06:00:31 +00:00
Mark Chien
89eb0d1e41 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I07100cdc9f4d2ef5b0b3ead0ad74c6f718d88be4
2020-06-19 06:00:23 +00:00
Mark Chien
e35a89ef62 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: Ib91bb507b01b4b0e9994cb9edbadf21bc57e4886
2020-06-19 06:00:23 +00:00
Automerger Merge Worker
26016b54c5 Merge "[automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours" into rvc-d1-dev-plus-aosp 2020-06-19 06:00:23 +00:00
PETER LIANG
0284214e0c [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

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

Change-Id: If83b964e060e3c4a7af87b6f1c2eb614d2301158
2020-06-19 06:00:17 +00:00
TreeHugger Robot
53d99db577 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I5a715f26585a7af1c142aac930f1e196e5ebcb10
2020-06-19 06:00:10 +00:00
TreeHugger Robot
6c0d2225c0 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: Ib006da6de06a17c7e30055f71b2c403dba8afe22
2020-06-19 06:00:08 +00:00
PETER LIANG
18e02caa18 Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Ie227f2a09632c63d60d72e25d2fe118732274a1b
2020-06-19 05:59:59 +00:00
PETER LIANG
31b09df257 Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: I0d867616b7b83cb9b5f1eb4f2c5aaab5e10461bb
2020-06-19 05:59:59 +00:00
Mark Chien
c3a501c02e Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I89a1b4747662611dc2a103ab6835afff0e05086b
2020-06-19 05:45:18 +00:00
Mark Chien
5f643bb4db Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I63a125c5291f71811e2c010d946c0440c1eca29c
2020-06-19 05:45:00 +00:00
TreeHugger Robot
25a8c13254 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I3da9493dff22054dd6250a17d8ea6ed7a5226457
2020-06-19 05:44:59 +00:00
TreeHugger Robot
a68b7cc6bf Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: Idc85a865b5579bc08dbb4b0e6b92726bb2e6cf08
2020-06-19 05:44:52 +00:00
PETER LIANG
479c1cb24a Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Ia7a45d3e919c7910b4c26d7d460a88d7917b5648
2020-06-19 05:44:47 +00:00