Mark Chien
3548a5eb0e
Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536
Change-Id: If30d8e11f18380b3ab5f2ef840951d550532077a
2020-06-20 03:17:20 +00:00
Akshay Thakker
d6f41c192f
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: I8e84d908df0edd77d13579ab95e7aedf3d370d04
2020-06-20 03:10:39 +00:00
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
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
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
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
Dan Sandler
9c3cb64e08
Add bubble and shortcut info to notification log debug
...
Bug: 159442644
Test: adb shell am start -n com.android.settings/.Settings\\\$NotificationStationActivity
Change-Id: I5c628ed52bfb44af1cc99ec9fd3dc436fe296344
2020-06-19 15:44:49 -04: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
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
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
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
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
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
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
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