Commit Graph

110623 Commits

Author SHA1 Message Date
Treehugger Robot
7813c4a9a3 Merge "Add getSubscriptionId API" 2023-03-04 18:38:35 +00:00
Jack Yu
bc71ee5ece Add getSubscriptionId API
The old getSubId or getSubscriptionIds return multiple sub ids
per slot index, which is not possible in today's implementation
because the slot index here refers to the logical slot index,
which is also known as phone id, or the logical modem index. In
today's telephony, one logical phone can only have one
subscription at one time, so does the modem.

Bug: 239607619
Test: Manual
Merged-In: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
Change-Id: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
2023-03-03 19:40:50 -08:00
Bill Yi
839c6e88b4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-01 00:47:17 +00:00
Bill Yi
798dd47215 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-01 00:47:17 +00:00
Bill Yi
586da77594 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-01 00:47:17 +00:00
Ahaan Ugale
e35606efd3 Merge "Update Autofill OWNERS" 2023-02-28 22:42:36 +00:00
Ahaan Ugale
4ee69bf644 Update Autofill OWNERS
Change-Id: Ibed8c68111fe6cab9152b4e0bf7d4378e4932806
2023-02-27 21:44:20 +00:00
Bill Yi
2ff8ea95f2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I93d99960420b9066bdd86b961f57596bc9cf5175
2023-02-26 20:55:20 -08:00
Bill Yi
10e200b5ad Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6bb25af5ba623e2d04c42829db1220ad5f64211d
2023-02-26 20:54:04 -08:00
Bill Yi
d77ddd6ab3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I34927005a077f306b6c8c0d1c850ed39474f33a4
2023-02-26 20:52:03 -08:00
Henri Chataing
fa88ad84be Merge "Nfc: Rename system properties in Nfc settings" 2023-02-24 18:57:25 +00:00
Anvesh Renikindi
60763d6941 Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" 2023-02-23 06:22:15 +00:00
Anvesh Renikindi
a54ecedde3 Merge changes from topic "androidx_ae"
* changes:
  Fix build for jetpack update
  Update ActivityEmbedding usage.
2023-02-23 06:22:15 +00:00
William Escande
5fd265405c Merge "Snoop Logger: fix descriptions" 2023-02-23 05:58:19 +00:00
Henri Chataing
b2e4e3c85f Nfc: Rename system properties in Nfc settings
The nfc properties are now added to system/libsysprop and
were renamed at the same time for homogenity.

Bug: 268219397
Test: m Settings
Change-Id: I496e128b9db225aac583a1e0b91687f78a268b63
(cherry picked from commit 94e898a02b)
2023-02-23 01:48:42 +00:00
Henri Chataing
4de9ff1a8f Merge changes from topic "nfc_logging_control"
* changes:
  Add test cases for NfcSnoopLog and NfcVerboseVendorLog
  Show reboot dialog when users disable developer options
  Add a new NFC developer setting option for NFC vendor verbose log
  Add a new NFC developer setting option for NFCSNOOP
2023-02-22 17:12:46 +00:00
Treehugger Robot
a0642974a4 Merge "Change API name" 2023-02-22 16:59:10 +00:00
Jakub Rotkiewicz
c0a7e8f8f0 Snoop Logger: fix descriptions
Test: refactoring CL. Existing unit tests still pass
Merged-In: Ie6a6b27247896e2a9a410197135e44a22ab1428c
Change-Id: Ie6a6b27247896e2a9a410197135e44a22ab1428c
2023-02-20 15:12:31 +00:00
Hieu Dang
8115b87ea3 Change API name
Change getCreateBondCaller to getPackageNameOfBondingApplication

Bug: 269604212
Test: atest BluetoothDeviceTest
Tag: #refactor
Change-Id: Ib596f94a6a718069ca9fb3a1c572ee3583f7504b
2023-02-19 15:11:42 +00:00
Jack Yu
733b317406 Add test cases for NfcSnoopLog and NfcVerboseVendorLog
Bug: 204397062
Test: make RunSettingsRoboTests
Merged-In: Id12e3c10dc04816d4a69692b2d922840a8e84c61
Change-Id: Id12e3c10dc04816d4a69692b2d922840a8e84c61
(cherry picked from commit bcf2efe31e)
2023-02-17 17:29:56 +00:00
Jack Yu
d91e7a0565 Show reboot dialog when users disable developer options
When NFC detailed logging mechanisms are enabled and users try to
disable develoepr options, show reboot request dialog to make sure
NFC logging mechanisms are also disabled.

Bug: 204397062
Test: manual
Merged-In: I531c85fd77934ad7821c480df07465a8cd8f24f9
Change-Id: I531c85fd77934ad7821c480df07465a8cd8f24f9
(cherry picked from commit d270f29cc8)
2023-02-17 17:29:15 +00:00
Jack Yu
8f1794043c Add a new NFC developer setting option for NFC vendor verbose log
Add a new developer setting option to enable vendor verbose log.

Bug: 204397062
Test: manual
Merged-In: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
Change-Id: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
(cherry picked from commit 3d2aff896e)
2023-02-17 17:28:36 +00:00
Jack Yu
a2f8944942 Add a new NFC developer setting option for NFCSNOOP
Add a new developer setting option to enable full NFCSNOOP log.

Bug: 204397062
Test: manual
Merged-In: I3fd34500e5e7093c9d77ff737987a35f6866814e
Change-Id: I3fd34500e5e7093c9d77ff737987a35f6866814e
(cherry picked from commit b71de640b5)
2023-02-17 17:27:38 +00:00
Jiaming Liu
b9f82bed98 Fix build for jetpack update
Fix build for jetpack update

Bug: 265818545
Test: build

Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a)
2023-02-17 04:15:28 +00:00
Diego Vela
42004f3b6b Update ActivityEmbedding usage.
Update ActivityEmbedding usage.

Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796)
2023-02-17 12:04:26 +08:00
Arc Wang
dd97d9cc71 Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property
Future WM Jetpack library updates will ask for the property to
enable ActivityEmbedding feature.

Bug: 264733035
Test: build pass
Change-Id: I0f5e5a10250049fb9425eac7c113b803b6701cc7
Merged-In: I0f5e5a10250049fb9425eac7c113b803b6701cc7
2023-02-17 11:25:23 +08:00
Treehugger Robot
dcb1dbc7f5 Merge "Make Media Vibration setting configurable" 2023-02-16 09:56:25 +00:00
David Magno
4e816be889 Make Media Vibration setting configurable
Add a configuration boolean to control whether or not to display
Media Vibration switch (default: display the switch).
This configuration can then be overriden by OEMs for devices
that don't support media vibration.

Bug: 268657239
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
        "com.android.settings.accessibility.MediaVibration"
Change-Id: I91857fbb04abc97b290559895010c3cbeef7ebab
2023-02-16 09:49:01 +01:00
Hieu Dang
e1e657dac3 Merge "Show Bluetooth dialog in a specific case" 2023-02-14 01:55:09 +00:00
Jakub Rotkiewicz
cfde422f91 Merge "SnoopLogger: Debug enhancements added settings" 2023-02-13 13:01:01 +00:00
Jakub Rotkiewicz
5a1b8a11a6 SnoopLogger: Debug enhancements added settings
Bug: 247859568
Tag: #feature
Test: make RunSettingsRoboTests3
Test: make RunSettingsRoboTests4

Change-Id: I132a1558ea67400d9c10dda523456f99eb815b92
Merged-In: I132a1558ea67400d9c10dda523456f99eb815b92
2023-02-13 11:35:55 +00:00
My Name
2e552331e9 Show Bluetooth dialog in a specific case
If the application that initiate the bonding with
BluetoothDevice#createBond is in foreground, then should dialog only
instead of showing the notification & dialog

Bug: 175931562
Tag: #refactor
Test: manual
Change-Id: I3673a0b58cbf9caabf62c951b84b49e17cfb13b8
2023-02-10 08:31:34 +00:00
Treehugger Robot
0a9affaaab Merge "Merge TQ1A.230205.002" 2023-02-08 10:40:37 +00:00
Xin Li
c660135971 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
Change-Id: I1457d9362378bd893f557e1c998308cf8ee8904a
2023-02-06 21:05:31 -08:00
Patrick Rohr
b0ddc1833d Merge "Enable ethernet data usage when FEATURE_USB_HOST is present" 2023-02-03 17:28:34 +00:00
Patrick Rohr
d2d340146e Enable ethernet data usage when FEATURE_USB_HOST is present
Ethernet is enabled when either FEATURE_ETHERNET *or* FEATURE_USB_HOST
is present. See ConnectivityService#deviceSupportsEthernet.

ConnectivityService#deviceSupportsEthernet should really be moved to
some commonly accessible location.

Test: TH
Change-Id: I497d99169248db7e5948b3a19134ab42e66d5b9b
2023-02-03 03:32:02 +00:00
Treehugger Robot
888759dd9f Merge "Fixes resource file exemption." 2023-01-30 20:28:12 +00:00
Treehugger Robot
3272025234 Merge "Add mtv engineers to owners for emergency code reviews" 2023-01-27 19:21:59 +00:00
Yang Lu
b9862e79df Add mtv engineers to owners for emergency code reviews
Change-Id: I440120397c11b8ebce617649c700b63dbca30ee8
Test: N/A
2023-01-27 05:21:25 +00:00
Treehugger Robot
5f27701d95 Merge "Fix NullPointerException when renaming a fingerprint" 2023-01-25 01:39:07 +00:00
Ilya Matyukhin
67d47f6b4a Fix NullPointerException when renaming a fingerprint
(Original change made by xingbin.feng@sony.com)

Fix NullPointerException when rotating the screen while renaming
a registered fingerprint

Bug: 236873593
Test: Click a registered fingerprint to open the Rename dialog,
rotate the device and press OK. Verify that Settings does not
crash

Change-Id: I1350c4bd121e0a7aaa291b3b8f96c80ef777150b
2023-01-24 23:55:29 +00:00
Treehugger Robot
f846e5cf0e Merge "Update OWNER list" 2023-01-20 06:53:33 +00:00
Yanting Yang
5c959d8610 Update OWNER list
Test: N/A
Change-Id: Ibb67601aa44b690fd4ac3016329277f8cb89be64
Merged-In: I9ab91f21558513b85847d9c513e7d50f9486c6ea
2023-01-20 05:06:37 +00:00
Daniel Norman
f86a0718b0 Fixes resource file exemption.
The previous version missed out on other file types (JSON motion files, mp4, etc.)

Change-Id: I2d1846ff1ab2461fe0c3716b02d1a323cb8af85b
2023-01-19 19:37:01 +00:00
Betty Chang
d7e16c22f6 Merge "[LE Audio] To add the vibrate when the scan is successful" 2023-01-13 10:34:12 +00:00
changbetty
ca475a5d37 [LE Audio] To add the vibrate when the scan is successful
Bug: 242023882
Test: manual test
Change-Id: Iabff5fb81e307222fb33541e4bf0008830321d3e
2023-01-13 02:30:23 +00:00
Treehugger Robot
aef592eb18 Merge "Amend "Reset notification importance" list item style" 2023-01-11 10:31:55 +00:00
Shen Lin
1721d0f276 Amend "Reset notification importance" list item style
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.

Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
2023-01-11 05:21:59 +00:00
Becca Hughes
ce5d029670 Merge "Add credential manager team to OWNERS" 2023-01-06 20:03:13 +00:00
Bill Yi
2e7924abcf Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" 2023-01-06 19:33:51 +00:00