Commit Graph

90772 Commits

Author SHA1 Message Date
tom hsu
427906c29e [Tetheirng] Show a dialog indicate tethering is unsupported by carrier.
Bug: 161206517
Test: manual
Change-Id: I45a2e42367850ab6fc901fe508671677d843b793
2022-03-01 18:10:10 +08:00
Colin Cross
3f67f87efe Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions
Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY which will show a user
friendly version name for preview releases, and the release version
for final releases.

Bug: 221950960
Test: manual
Change-Id: I3a7e6a3c996d52614b89888afd35da8cff458b43
2022-02-28 18:03:23 -08:00
Xiao Ma
b3fedd0633 Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461

Change-Id: Icc3b8d9fd42ee9712cfc81c74ae886576695ee2a
2022-02-24 05:22:10 +00:00
Xiao Ma
3340b8e3c3 Merge "Adapt new EthernetManager APIs in Settings." 2022-02-24 04:58:26 +00:00
Xiao Ma
db7d7de3b4 Adapt new EthernetManager APIs in Settings.
EthernetManager is going to be moved to Connectivity mainline module and
new EthernetManager management APIs have been exposed. This CL adapts
new APIs in the settings in advance, the changes include:

1. use addInterfaceStateListener and removeInterfaceStateListener.
2. rely on the onInterfaceStateChanged callback to receive the Ethernet
   interface state update, to replace the getAvailableInterfaces and
   getConfiguration.
3. after the Ethernet mainline migration completes, Settings cannot
   access the platform resource such as config_ethernet_iface_regex,
   instead, check the availability of Ethernet interface by checking
   if either any of FEATURE_ETHERNET and FEATURE_USB_HOST is supported.

Bug: 210586283
Bug: 218798003
Test: m
Test: manually verify that device can access the Internet via Ethernet
Test: manually verify that device can share the Internet via Ethernet
      tethering
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<modified test cases>
      EthernetTetherPreferenceControllerTest
      AllInOneTetherSettingsTest
Change-Id: I9e10481e1751975772a24db29568aa26bb85cd70
2022-02-24 01:49:57 +00:00
Rahul Sabnis
19d5264723 Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcfff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146

Change-Id: Icf270075cf196c75e797f967e721cab8aa0db332
2022-02-16 22:56:11 +00:00
Rahul Sabnis
2e6f2dcfff Merge "Remove hidden Bluetooth dependencies" 2022-02-16 22:36:25 +00:00
William Escande
a95180f228 Remove hidden Bluetooth dependencies
Bug: 217736913
Test: pre-submit
Change-Id: Ib4e12e8e350ffa08b48f58e8256991d7ed4fa013
2022-02-16 20:00:59 +01:00
Treehugger Robot
df16e4b74c Merge "Restart the MTP connection when changing transcode enabled" am: 8109ad8033
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1882150

Change-Id: I180666f8edc9fdb69fcdec20b9ae2730240ff923
2022-02-16 13:08:35 +00:00
Treehugger Robot
8109ad8033 Merge "Restart the MTP connection when changing transcode enabled" 2022-02-16 09:58:58 +00:00
Treehugger Robot
3ac72d1fd6 Merge "Show identity address in the bluetooth details page" am: 5d17cfd938
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171

Change-Id: I07ff71fbb60abae09d8a3116542260b709a6a81e
2022-02-15 06:13:57 +00:00
Treehugger Robot
5d17cfd938 Merge "Show identity address in the bluetooth details page" 2022-02-15 05:07:42 +00:00
Treehugger Robot
58fb784e7d Merge "Fix dream settings OWNERS path" am: c6bf492db4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346

Change-Id: Ifeb24520760d02cefc9ab12ff648203dbd2a988b
2022-02-15 00:42:12 +00:00
Treehugger Robot
c6bf492db4 Merge "Fix dream settings OWNERS path" 2022-02-15 00:22:02 +00:00
Xin Li
da7237b2ed Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:30:11 +00:00
Lucas Silva
55ce0f7cdd Fix dream settings OWNERS path
Change-Id: I4ebcec52d96cee03448a872984036c314c760eaa
2022-02-14 17:02:16 +00:00
Treehugger Robot
1a16975a36 Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977698

Change-Id: Icecb9f0232a86fbbaf8f8d9a22c86aaa40ab234d
2022-02-14 11:27:00 +00:00
Treehugger Robot
57238d653c Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" 2022-02-14 10:50:17 +00:00
Treehugger Robot
43b7ae19fb Merge changes Idadf8487,I84d87024 am: e489d46b7c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981855

Change-Id: I4ee8583862f590206240d107d9a2a509edea03df
2022-02-12 12:21:09 +00:00
William Escande
f859d0f15d Use allowed system value am: 088a7b87f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854

Change-Id: I757da4bdfd98e460ae66ff1c31d74e2838480a8a
2022-02-12 12:21:08 +00:00
Treehugger Robot
e489d46b7c Merge changes Idadf8487,I84d87024
* changes:
  Resolve bluetooth hidden API usages
  Use allowed system value
2022-02-12 12:06:16 +00:00
William Escande
6de80163b1 Resolve bluetooth hidden API usages
Bug: 143245666
Test: build
Change-Id: Idadf84873c88155382c48bb9108cf28d88aaef0a
Merged-In: Idadf84873c88155382c48bb9108cf28d88aaef0a
2022-02-11 14:19:38 +01:00
William Escande
088a7b87f2 Use allowed system value
Test: build
Change-Id: I84d87024423869515937ab87381be572fed0ba65
Merged-In: I84d87024423869515937ab87381be572fed0ba65
2022-02-11 13:05:33 +01:00
Xin Li
b9e9ca119c Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I962c318f41adcf180b885f2052ce0ec4952edfb6
Change-Id: I77764eaf895ac3c13c7440adb5b3f597a516d690
2022-02-11 07:29:32 +00:00
Tsung-Mao Fang
144f23be39 Merge "Update OWNERS for dream settings" am: e294a5a1db
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1979791

Change-Id: I0eee5bb9c89621f84bc43bc9e8763991b782c292
2022-02-11 06:25:15 +00:00
Tsung-Mao Fang
e294a5a1db Merge "Update OWNERS for dream settings" 2022-02-11 06:12:16 +00:00
Lucas Silva
c3f78bce8d Update OWNERS for dream settings
Change-Id: Ie4b483907918986c3b1b4b284ec0f977569cfd58
2022-02-10 19:40:25 +00:00
Julia Reynolds
e2d790725c Merge "Update notification settings OWNERS" am: 49b9583ea1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665

Change-Id: I3bdeaab21beed6c214d28516b9699a20c5b09dd5
2022-02-10 14:04:25 +00:00
Julia Reynolds
49b9583ea1 Merge "Update notification settings OWNERS" 2022-02-10 13:48:25 +00:00
Tom Hsu
f9355dcc95 Merge "Add a OWNER file for per-app language" am: 38cb70ffd9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704

Change-Id: I35dceb538404edcbe552b87c6c615c0c8d16c69b
2022-02-10 09:52:36 +00:00
Tom Hsu
38cb70ffd9 Merge "Add a OWNER file for per-app language" 2022-02-10 09:31:50 +00:00
tom hsu
085e5fc946 Add a OWNER file for per-app language
Change-Id: I5b0d9491db1f1ba602306289d6df2e4282c2bece
2022-02-10 15:27:09 +08:00
Jack Yu
c7b568751e Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT
Use Intent.EXTRA_USER to pass the UserHandle as the extra field of
ACTION_CHANGE_DEFAULT.

Bug: 215300017
Test: manual
Change-Id: I8862ae509638c7c264f49c4bc5753a65e8fdcfbc
2022-02-09 21:34:59 +08:00
Junyu Lai
35dea12973 Merge "Remove dependencies on hidden network stats APIs" am: e299e37585
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976626

Change-Id: Iad8e74e3158f1775372cdc3ba6bd1414952c79be
2022-02-09 09:55:37 +00:00
Junyu Lai
e299e37585 Merge "Remove dependencies on hidden network stats APIs" 2022-02-09 09:30:37 +00:00
Tsung-Mao Fang
1e680abc54 Merge "Owners updates" am: af7fc198fb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1962927

Change-Id: I55a50aa88fe57fe70c81e625668cfdb47d6cb476
2022-02-09 06:38:50 +00:00
Tsung-Mao Fang
af7fc198fb Merge "Owners updates" 2022-02-09 06:22:48 +00:00
Treehugger Robot
ae65af5986 [automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b38a7fa23d1cdd1af6646b09c990c53fce397b5
2022-02-08 21:01:36 +00:00
Treehugger Robot
46fc8079dd Merge "DO NOT MERGE Fix of crash when error messages are triggered" 2022-02-08 20:39:45 +00:00
Treehugger Robot
428e9e636e Merge "Merge SQ1A.220205.002" am: c45b4ab9ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976020

Change-Id: I38d97dff8fcb284120608d2bbfb369a7374a4398
2022-02-08 19:12:24 +00:00
Treehugger Robot
c45b4ab9ae Merge "Merge SQ1A.220205.002" 2022-02-08 18:52:08 +00:00
Chienyuan
84a9b23ba8 Show identity address in the bluetooth details page
Bug: 197044261
Test: build pass
Change-Id: Ic1ef1d575f35c4b37d6f9195ec10dd31ed5bdd5b
2022-02-08 11:29:03 +00:00
Remi NGUYEN VAN
74cf5865cf Remove dependencies on hidden network stats APIs
Replace usage with equivalent stable APIs.

Bug: 197717846
Test: atest SettingsRoboTests
  (cherry-picked from ag/16779860)
Change-Id: I4151b831fc83dee9b36292cd7991f9b294ed4ff2
Merged-In: I4151b831fc83dee9b36292cd7991f9b294ed4ff2
2022-02-08 19:06:02 +08:00
Treehugger Robot
6040d46cb0 Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1961121

Change-Id: If94e29e72c3ce461e27d028148d2c0e4bdbba9e9
2022-02-08 09:36:17 +00:00
Treehugger Robot
17e8159641 Merge "Settings: Fix FC when learn more textview help intent is NULL" 2022-02-08 09:15:53 +00:00
Xin Li
3160c1adb3 Merge SQ1A.220205.002
Bug: 213904741
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: I6008378cd10c04b931186540b36c93705de6b5c8
2022-02-07 23:19:53 -08:00
Etienne Ruffieux
d020a96da1 Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844

Change-Id: I87f5bbb080291bbbf93bad56b77eefe2d67f37bd
2022-02-07 21:34:12 +00:00
Etienne Ruffieux
a6d4788fa0 Merge "Removed mocked BluetoothAdapter" 2022-02-07 21:17:41 +00:00
pingzhi wang
d565d8679f DO NOT MERGE Fix of crash when error messages are triggered
Issue is caused by call FragmentTransaction.commit after
activity saved it's state, then IllegalStateException will be thrown
and Settings will crash.

Bug: 216492911
Test: Manual. First boot up the device and follow the wizard till the
  point when register the fingerprint. While adding the fingerprint,
  short press the power button and turn off the screen.

Change-Id: I96244fc26d2aa8639538f967d645a6ca4fc7c0ba
Merged-In: I1de23885a9b80fabdc199ad09c35c3f98e86c831
2022-02-04 23:38:47 +00:00
Etienne Ruffieux
3ddfa01d4d Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615

Change-Id: Ie61c0613fd3124401ab0478685bfc189ca107a87
2022-02-03 00:00:40 +00:00