Commit Graph

40012 Commits

Author SHA1 Message Date
Hansong Zhang
b4ed2b2005 Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices"
am: ea5243e28d  -s ours

Change-Id: I57c326c97f19597bd2865c328e024de4da889e77
2018-01-16 18:04:48 +00:00
Treehugger Robot
ea5243e28d Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices" 2018-01-16 17:48:53 +00:00
Hansong Zhang
4b367aba78 DO NOT MERGE Add developer menu to select max number of connected audio devices
The new developer option modifies the system property
"persist.bluetooth.maxconnectedaudiodevices"; it allows testing
multiple connected devices for A2DP, AVRCP, HFP.

Bug: 71603731
Test: Robolectric test
Change-Id: If8c2c26ad4c9a2b7458a2d16a0c29d5f9b4df5c7
2018-01-10 15:42:56 -08:00
Malcolm Chen
5e90d8ea7a Merge "Rename setDataEnabled to setUserDataEnabled."
am: 43b1b97e3e

Change-Id: Ib11eca12b1331494972c86a18670c348abae3d2c
2018-01-09 23:56:14 +00:00
Treehugger Robot
43b1b97e3e Merge "Rename setDataEnabled to setUserDataEnabled." 2018-01-09 23:46:55 +00:00
Malcolm Chen
3aaf94b518 Rename setDataEnabled to setUserDataEnabled.
Test: unittest
Bug: 69814555
Change-Id: I1d43dc1d2f720383a2f0be18560fc0fd4ff349fd
Merged-In: I1d43dc1d2f720383a2f0be18560fc0fd4ff349fd
2018-01-08 18:08:01 -08:00
Jack He
e34375b88c Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
am: 80c0656ca6

Change-Id: Ifab1cde7af9421ce140c298df295c75e5e9055ed
2018-01-06 17:33:02 +00:00
Treehugger Robot
80c0656ca6 Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" 2018-01-05 20:41:01 +00:00
Jack He
7d563bd1de Bluetooth: Use "Disable" in-band ringing instead of "Enable"
* Given that in-band ringing is enabled by default on supported devices,
  the corresponding development settings should be rephrased from
  "Enable in-band ringing" to "Disable in-band ringing" to hint that it
  is enabled by default
* This also gets rid of special logic to check that option in
  initialization
* Add strings to reflect this change as well

Bug: 65383086
Test: make, try toggling the preference and verify whether in-band
ringing works or not

Change-Id: I29f91c7d12c725b12452ec163b75051ff28f500d
Merged-In: I29f91c7d12c725b12452ec163b75051ff28f500d
2018-01-04 17:23:57 -08:00
Akiya Utsumi
47ba3b400c Merge "Fix the format of wifi_carrier_content string"
am: 985b432fc0

Change-Id: Ic77ff6da5081cae7a3b7fba31bc4902645188763
2017-12-27 21:43:20 +00:00
Treehugger Robot
985b432fc0 Merge "Fix the format of wifi_carrier_content string" 2017-12-27 21:36:40 +00:00
Akiya Utsumi
28fcc97d1b Fix the format of wifi_carrier_content string
Carrier name is not displayed on the dialog due to the
incorrect format "%1%s". This should be "%1$s".

Test: String change, manually verified
Bug: 70814622
Change-Id: Ie30b8d1eb85d390e4023e0a251e1f1c7fa6deec0
2017-12-22 05:38:12 +00:00
Fan Zhang
7e3fdede58 Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
am: 7c46a79a00  -s ours

Change-Id: I83bb99c73fcd2818105b51633ea8c5c42bcd74a0
2017-12-22 01:13:32 +00:00
Treehugger Robot
7c46a79a00 Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest" 2017-12-22 01:01:41 +00:00
Fan Zhang
6be8dfc9b7 DO NOT MERGE: Fix test failure in CodeInspectionTest
Change-Id: I74fbd30261fa66636c915936270d873e7612cbc6
Fixes: 70496869
Test: robotests
2017-12-21 15:42:41 -08:00
goneil
1b0c8335e3 Merge "Set EDITED column to USER_EDITED when editing APN"
am: 90d284cab7

Change-Id: I32cb408436e755e6452dacafc3dc5808f5a2a60d
2017-12-20 00:39:32 +00:00
Treehugger Robot
90d284cab7 Merge "Set EDITED column to USER_EDITED when editing APN" 2017-12-20 00:36:53 +00:00
rongrong.x.gao
b0ab6da4e3 Merge "Launch new Home app when selecting Home app in Settings"
am: f05fc290b7

Change-Id: I5b9e419fb420351dba76c5dfe1f238f5e4a7e562
2017-12-18 22:16:32 +00:00
Treehugger Robot
f05fc290b7 Merge "Launch new Home app when selecting Home app in Settings" 2017-12-18 22:09:25 +00:00
rongrong.x.gao
b573e23b48 Launch new Home app when selecting Home app in Settings
Launches the newly selected Home app when it has been selected in
Default Home app settings. This CL makes the change take effect
immediately, instead of when the Home button is pressed.

Bug: 70697830
Test: make RunSettingsRoboTests
Test: Manual - Change default home app in Settings
Change-Id: If7e2956bc6f8ddba0a7e8da48a0d38e3936c57e9
2017-12-16 12:44:01 +09:00
tiansiming
57b9039750 Merge "Fix NPE when press ttsEngines settings icon"
am: 4b6e1b0758

Change-Id: I7d90bfce2e4f5d13b66f0e408ab9ff4273f6eac6
2017-12-15 22:35:52 +00:00
Treehugger Robot
4b6e1b0758 Merge "Fix NPE when press ttsEngines settings icon" 2017-12-15 22:30:04 +00:00
goneil
a05db0fac9 Set EDITED column to USER_EDITED when editing APN
TelephonyProvider switched from defaulting EDITED to USER_EDITED and now
defaults to CARRIER_EDITED in https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/570244.
Therefore, when the user edits the APN, we can no longer rely on the
default implementation

Bug: 67750905
Test: None
Change-Id: I4996b24da94f7c1883c3c802b8edd5e23db580b2
2017-12-15 21:54:25 +00:00
Philip P. Moltmann
ced2263d48 Merge "Switch to modern ArgumentMatchers"
am: b8bf3bbc72

Change-Id: I81455eceac3a4273dc0bfd439fefa21c3b6f571c
2017-12-15 10:48:38 +00:00
Treehugger Robot
b8bf3bbc72 Merge "Switch to modern ArgumentMatchers" 2017-12-15 10:33:13 +00:00
Philip P. Moltmann
a56f6c5bdb Switch to modern ArgumentMatchers
Test: adb shell am instrument -w -e class com.android.settings.vpn2.PreferenceListTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner

Change-Id: Id2e4684f6d3048cfb60fee1f747d0796c157a3da
2017-12-14 09:48:33 -08:00
Robin Lee
70a6dfd647 Merge "Handle getActiveAdmins() == null safely."
am: d46153c3d3

Change-Id: If8a1bcdaa5c106394e4c00add45765d27c80e0ef
2017-12-13 17:24:00 +00:00
Treehugger Robot
d46153c3d3 Merge "Handle getActiveAdmins() == null safely." 2017-12-13 17:16:38 +00:00
Hemant Gupta
0b4c0ebbe4 Merge "Bluetooth: Add support for PBAP UI preference"
am: f689d1aaa7

Change-Id: Ic4ffc6a26b11cdf0a937402c3bdcd68441fe4aed
2017-12-13 01:27:46 +00:00
Wang wenrui
b2a6489139 Merge "Fix screen freeze when changing display size in Multi-Window mode"
am: 2051822bb9

Change-Id: I974abe3dd2114aa439c0db46fa4930a947912de6
2017-12-13 01:26:52 +00:00
Treehugger Robot
f689d1aaa7 Merge "Bluetooth: Add support for PBAP UI preference" 2017-12-13 00:30:42 +00:00
Treehugger Robot
2051822bb9 Merge "Fix screen freeze when changing display size in Multi-Window mode" 2017-12-12 23:59:23 +00:00
Robin Lee
1aeca095d3 Handle getActiveAdmins() == null safely.
Test: adb install -r $OUT/system/priv-app/Settings/Settings.apk && adb shell am start -n com.android.settings/.DeviceAdminAdd --es android.app.extra.DEVICE_ADMIN_PACKAGE_NAME com.example.nonexistent
Change-Id: I1e3cf406e8053f6dbf99669f33b7c16648c9c8f8
Fix: 70491813
2017-12-11 21:01:58 +01:00
Xin Li
4f83509810 Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: cb1056f9b4  -s ours

Change-Id: Iba281b420566a85ffebf98941dbb5e456b724362
2017-12-07 15:17:25 +00:00
Xin Li
2ba6a22abb DO NOT MERGE: Merge Oreo MR1 into master
am: 7b017d5a2f  -s ours

Change-Id: I38ef4306a74fb9c1ca39903d5a74df5db0753290
2017-12-07 04:36:38 +00:00
Hemant Gupta
13197bcc1e Bluetooth: Add support for PBAP UI preference
Usecase:
1) Connect with carkit that supports PBAP/MAP
2) Try to uncheck the checkbox for contact sharing from device sub
   settings menu

Expected Result:
1) DUT should display "Connected (No Media or Phone)"
1) Should be able to disconnect when checkbox moves from selected->unselected,
and carkit should be able to connect when checkbox is selected again

Observation:
1) No UI updates when PBAP/MAP are connected.
2) On unchecking Contact sharing checkbox nothing happens. PBAP connection
   remains active and user is not asked to disconnect profile level connection.

Fix:
Add support for PBAP UI preference in SettingsLib. Also Fix issues related to MAP
profile addition/removal.
Test: Connect from carkit, try disconnecting from sub settings menu by unchecking
Contact Sharing checkbox and check if PBAP is successfully disconnected.

Bug: 35014213
Change-Id: I4981aa063b2541b58ce1d36e3576578cbeb02acc
2017-12-07 09:31:03 +05:30
tiansiming
b65c4c3e25 Fix NPE when press ttsEngines settings icon
settingsIntent is obtained by method getSettingsIntent in
TtsEngines.java, and it has the chance to return null directly in
which case will lead to NPE crash when we startActivity in
TextToSpeechSettings.java with a null intent.
So, a judgement here makes sense.

Bug:https://issuetracker.google.com/issues/70266990
Test:
1) Install the apk "partner-BaiduSpeechService.apk" offered in the Bug link above.
2) Go to Settings -> Languages & input -> Advance -> Text-to-speech output
3) Choose "Duer voice engine 3.0" as the preferred engine
4) Press the settings icon in the right

Change-Id: I497a745ce62989f3ff1aee661648e90af25fb99e
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-12-07 10:08:34 +08:00
Xin Li
cb1056f9b4 Merge "DO NOT MERGE: Merge Oreo MR1 into master" 2017-12-06 23:18:29 +00:00
Xin Li
7b017d5a2f DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Iab7fd863c422780055277093cb9621197e09d969
2017-12-06 14:24:54 -08:00
Wang wenrui
09c44bf78d Fix screen freeze when changing display size in Multi-Window mode
The device screen freezes when launching two Display size settings
screen and changing display size in Multi-Window mode.
To fix this issue, OnSeekBarChangeListener should be set in onStart() to
avoid onProgressChanged() is called during onRestoreInstanceState which
is caused by display size change.

Fixes: 70253030
Test: manual - open two Display size settings in Multi-Window mode.

Change-Id: I779954aeeb1da526ba1b0fac2676e2f7d8289352
2017-12-06 07:01:56 +00:00
Jordan Liu
ed9508f3a6 Merge "Hide signal strength when told by carrier"
am: 9afa720abe

Change-Id: I64b6eece29d475d8fdbaf8f6d1fb2c62701fd6e4
2017-12-04 23:45:57 +00:00
Jordan Liu
9afa720abe Merge "Hide signal strength when told by carrier" 2017-12-04 23:20:31 +00:00
TreeHugger Robot
ec4fe2a0c6 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-11-30 20:59:07 +00:00
Hemant Gupta
a84a535729 Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE"
am: b21a10b2ff

Change-Id: Id0378b1c410afcc0566652e3308cd812dcd68470
2017-11-30 17:40:31 +00:00
Treehugger Robot
b21a10b2ff Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE" 2017-11-30 17:38:01 +00:00
Bill Yi
e55bc2b591 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I4c880093e20e7178ce80006b158fefd490b4e061
2017-11-30 04:05:41 -08:00
Hemant Gupta
5b84cfae44 Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE
Step by step:
1. Pair and connect with BTHS (e.g. SBH50).
2. Click the settings icon of paired device, and check "Use for" items.
-----------------------------------------------------------------
Expected Result:
After step 2, "Contact sharing" should not be checked.

Actual Result:
After step 2, "Contact sharing" is checked.

Fix:
Set phone book permission as REJECTED if class of Device is
not AUDIO_VIDEO_HANDSFREE

Test: Checked above usecase and issue is not observed

Bug: 64372703
Change-Id: I178a09dd9e76d67c461c4b04d9b2ee0078ed24c9
2017-11-29 20:37:05 +00:00
Patrik Bannura
5a84add99f Hide signal strength when told by carrier
Bug: 69730732
Test: Add different values for two carriers in vendor.xml
and see them change when swapping sim card
Depends-On: I155c8f619a451edab85cf6422cef73e8e1686629
Change-Id: I241ddb3c20002db781308d94c6c165b8d13b2474
2017-11-29 12:18:49 +00:00
Malcolm Chen
9d30592308 Merge "Remove extra newline in AndroidManifest."
am: 8aeb69396d

Change-Id: I36ea57db56ff985da118fb7ab117bf939b7b2dc1
2017-11-29 00:31:49 +00:00
Treehugger Robot
8aeb69396d Merge "Remove extra newline in AndroidManifest." 2017-11-29 00:22:47 +00:00