OSDN Git Service
Bolun Shan [Thu, 18 Jan 2018 02:59:45 +0000 (02:59 +0000)]
Merge "DO NOT MERGE: Keep access point list updated once in short time" am:
d7682e6d3c -s ours
am:
bc00e361d5
Change-Id: Ie4be52fa2e0d304aa268a4610ba03cb52997dd5d
Bolun Shan [Thu, 18 Jan 2018 02:57:28 +0000 (02:57 +0000)]
Merge "DO NOT MERGE: Keep access point list updated once in short time"
am:
d7682e6d3c -s ours
Change-Id: I134755ec0ec77dea80649440b969f9bcee8eab17
Treehugger Robot [Thu, 18 Jan 2018 02:48:31 +0000 (02:48 +0000)]
Merge "DO NOT MERGE: Keep access point list updated once in short time"
tiansiming [Thu, 18 Jan 2018 02:25:19 +0000 (02:25 +0000)]
Merge "Fix NPE crash in AppInfoBase" am:
e49cc3d659
am:
abcb069d95
Change-Id: Id60245ba109dc977ee1078e8d3f50288e5bdbcc7
tiansiming [Thu, 18 Jan 2018 02:15:29 +0000 (02:15 +0000)]
Merge "Fix NPE crash in AppInfoBase"
am:
e49cc3d659
Change-Id: I719b50356e890e57a8d6574aae23a2d5d0fd989b
Bolun Shan [Thu, 12 Oct 2017 07:17:08 +0000 (15:17 +0800)]
DO NOT MERGE: Keep access point list updated once in short time
The function onAccessPointsChanged will be called many times
and access points will be updated many times in 300ms. So check
if the same event exists before calling postDelayed.
Bug:
68230819
Test: Manual test
Change-Id: Id098e1b77c28b62a5495c3369ed950531e59dba2
Lei Yu [Wed, 17 Jan 2018 23:22:47 +0000 (23:22 +0000)]
Revert "DO NOT MERGE Add metric log for anomaly."
This reverts commit
adf11594d3510cd947e186ce4dec254223f1da10.
Merged-In: I83761e2a9c206ea7a04f7d031a6961fdab7ca9a0
Change-Id: I015d8c0d05c7ae9abfd4939f7a95e1f0daecc1fc
jackqdyulei [Wed, 17 Jan 2018 21:22:12 +0000 (21:22 +0000)]
DO NOT MERGE Add metric log for anomaly.
am:
adf11594d3
Change-Id: I2b55df61278b9c64d80cd9ba43b8d9b1686ff6e4
Treehugger Robot [Wed, 17 Jan 2018 19:44:16 +0000 (19:44 +0000)]
Merge "Fix NPE crash in AppInfoBase"
tiansiming [Sun, 14 Jan 2018 08:46:05 +0000 (16:46 +0800)]
Fix NPE crash in AppInfoBase
This crash can hardly happen under the normal operation of the user,
but it may have a chance to appear in monkey test. To enhance the
robustness of the program, intent.getData() here should not be null
in any situations.
Bug: N/A
Test: adb shell am start -n
'com.android.settings/.Settings\$AppDrawOverlaySettingsActivity'
Change-Id: I732b564056e3e585405f146d99efe3b410edbc41
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Hansong Zhang [Tue, 16 Jan 2018 18:13:44 +0000 (18:13 +0000)]
Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices" am:
ea5243e28d -s ours
am:
b4ed2b2005
Change-Id: I0b80d8c673b680ab530f34420bb330665ab904b8
Hansong Zhang [Tue, 16 Jan 2018 18:04:48 +0000 (18:04 +0000)]
Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices"
am:
ea5243e28d -s ours
Change-Id: I57c326c97f19597bd2865c328e024de4da889e77
Treehugger Robot [Tue, 16 Jan 2018 17:48:53 +0000 (17:48 +0000)]
Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices"
jackqdyulei [Wed, 25 Oct 2017 17:41:30 +0000 (10:41 -0700)]
DO NOT MERGE Add metric log for anomaly.
This cl creates metric log when anomaly surfaces in battery page or
anomaly dialog.
Each anomaly action contains two fields:
1. FIELD_CONTEXT(int): determine which fragment start this action.
2. FIELD_ANOMALY_ACTION_TYPE(int): determine action type for this
anomaly.
**Cherry-picked from ag/
3120176. Fix merge conflict in import part
in AdvancedPowerUsageDetail**
Bug:
68215016
Test: RunSettingsRoboTests
Change-Id: I83761e2a9c206ea7a04f7d031a6961fdab7ca9a0
jackqdyulei [Thu, 11 Jan 2018 01:53:47 +0000 (01:53 +0000)]
Add metric id for anomaly fragments.
am:
2fd1c9839c
Change-Id: Iff6c41c8549cdc102e954d6a429a9ab56d4e10c6
Hansong Zhang [Wed, 10 Jan 2018 23:42:56 +0000 (15:42 -0800)]
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
jackqdyulei [Tue, 24 Oct 2017 01:21:33 +0000 (18:21 -0700)]
Add metric id for anomaly fragments.
1. PowerUsageAnomalyDetails
2. AnomalyDialogFragment
Bug:
37681923
Test: Build
Change-Id: Ia82fde0fa3e61b6284dc18db3018dd223a0e435b
(cherry picked from commit
725562c7484439172dece19c72b5c76943144638)
Malcolm Chen [Wed, 10 Jan 2018 00:07:09 +0000 (00:07 +0000)]
Merge "Rename setDataEnabled to setUserDataEnabled." am:
43b1b97e3e
am:
5e90d8ea7a
Change-Id: I62b5c85e1737ef5ca23b2037b221a70e58121fe3
Malcolm Chen [Tue, 9 Jan 2018 23:56:14 +0000 (23:56 +0000)]
Merge "Rename setDataEnabled to setUserDataEnabled."
am:
43b1b97e3e
Change-Id: Ib11eca12b1331494972c86a18670c348abae3d2c
Treehugger Robot [Tue, 9 Jan 2018 23:46:55 +0000 (23:46 +0000)]
Merge "Rename setDataEnabled to setUserDataEnabled."
Malcolm Chen [Thu, 30 Nov 2017 02:01:25 +0000 (18:01 -0800)]
Rename setDataEnabled to setUserDataEnabled.
Test: unittest
Bug:
69814555
Change-Id: I1d43dc1d2f720383a2f0be18560fc0fd4ff349fd
Merged-In: I1d43dc1d2f720383a2f0be18560fc0fd4ff349fd
Jack He [Mon, 8 Jan 2018 20:20:47 +0000 (20:20 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am:
80c0656ca6
am:
e34375b88c
Change-Id: Ie9a167aa6310643465238510831eee8cfab34965
Jack He [Sat, 6 Jan 2018 17:33:02 +0000 (17:33 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
am:
80c0656ca6
Change-Id: Ifab1cde7af9421ce140c298df295c75e5e9055ed
Treehugger Robot [Fri, 5 Jan 2018 20:41:01 +0000 (20:41 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
Jack He [Thu, 7 Dec 2017 23:09:07 +0000 (15:09 -0800)]
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
Akiya Utsumi [Wed, 27 Dec 2017 21:45:58 +0000 (21:45 +0000)]
Merge "Fix the format of wifi_carrier_content string" am:
985b432fc0
am:
47ba3b400c
Change-Id: I39a694ec83185fa6eb5d13cffa6d0390fe7d568a
Akiya Utsumi [Wed, 27 Dec 2017 21:43:20 +0000 (21:43 +0000)]
Merge "Fix the format of wifi_carrier_content string"
am:
985b432fc0
Change-Id: Ic77ff6da5081cae7a3b7fba31bc4902645188763
Treehugger Robot [Wed, 27 Dec 2017 21:36:40 +0000 (21:36 +0000)]
Merge "Fix the format of wifi_carrier_content string"
Akiya Utsumi [Tue, 31 Oct 2017 02:11:15 +0000 (11:11 +0900)]
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
Fan Zhang [Fri, 22 Dec 2017 01:22:59 +0000 (01:22 +0000)]
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest" am:
7c46a79a00 -s ours
am:
7e3fdede58
Change-Id: I650211969d19051a5ba69ff86c1c3f087fcaa453
Fan Zhang [Fri, 22 Dec 2017 01:13:32 +0000 (01:13 +0000)]
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
am:
7c46a79a00 -s ours
Change-Id: I83bb99c73fcd2818105b51633ea8c5c42bcd74a0
Treehugger Robot [Fri, 22 Dec 2017 01:01:41 +0000 (01:01 +0000)]
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
Fan Zhang [Fri, 15 Dec 2017 19:58:56 +0000 (11:58 -0800)]
DO NOT MERGE: Fix test failure in CodeInspectionTest
Change-Id: I74fbd30261fa66636c915936270d873e7612cbc6
Fixes:
70496869
Test: robotests
goneil [Wed, 20 Dec 2017 00:41:52 +0000 (00:41 +0000)]
Merge "Set EDITED column to USER_EDITED when editing APN" am:
90d284cab7
am:
1b0c8335e3
Change-Id: I0b37b48e160f8fcd7b96f6515b34e1cb765d2b24
goneil [Wed, 20 Dec 2017 00:39:32 +0000 (00:39 +0000)]
Merge "Set EDITED column to USER_EDITED when editing APN"
am:
90d284cab7
Change-Id: I32cb408436e755e6452dacafc3dc5808f5a2a60d
Treehugger Robot [Wed, 20 Dec 2017 00:36:53 +0000 (00:36 +0000)]
Merge "Set EDITED column to USER_EDITED when editing APN"
Bill Yi [Tue, 19 Dec 2017 18:26:45 +0000 (18:26 +0000)]
Import translations. DO NOT MERGE am:
596de5e45c -s ours
am:
1f229d3710 -s ours
Change-Id: I645bf5d31fcb64d19b2e2b81771d62831e0997e1
Bill Yi [Tue, 19 Dec 2017 18:24:44 +0000 (18:24 +0000)]
Import translations. DO NOT MERGE
am:
596de5e45c -s ours
Change-Id: Id2b718512440b8d3703244fc6825bfad8579e8cc
Bill Yi [Tue, 19 Dec 2017 18:24:12 +0000 (18:24 +0000)]
Import translations. DO NOT MERGE
am:
1e9183e0c0 -s ours
Change-Id: If5b2efde1e32b8ea773c29bbd14c65e9cb0f5996
Bill Yi [Tue, 19 Dec 2017 04:43:20 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie62b3a6c465b7d0f011cfdc5e51fb3f195ed4306
Bill Yi [Tue, 19 Dec 2017 04:37:58 +0000 (20:37 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib8ace3f2052b60e0623095c5647b9c9c3b2c199c
rongrong.x.gao [Mon, 18 Dec 2017 22:19:28 +0000 (22:19 +0000)]
Merge "Launch new Home app when selecting Home app in Settings" am:
f05fc290b7
am:
b0ab6da4e3
Change-Id: I741b464e9903c13d68a3025d6cfbb057159ee950
rongrong.x.gao [Mon, 18 Dec 2017 22:16:32 +0000 (22:16 +0000)]
Merge "Launch new Home app when selecting Home app in Settings"
am:
f05fc290b7
Change-Id: I5b9e419fb420351dba76c5dfe1f238f5e4a7e562
Treehugger Robot [Mon, 18 Dec 2017 22:09:25 +0000 (22:09 +0000)]
Merge "Launch new Home app when selecting Home app in Settings"
rongrong.x.gao [Thu, 2 Mar 2017 09:29:34 +0000 (17:29 +0800)]
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
tiansiming [Fri, 15 Dec 2017 22:38:29 +0000 (22:38 +0000)]
Merge "Fix NPE when press ttsEngines settings icon" am:
4b6e1b0758
am:
57b9039750
Change-Id: Iae5884c2950e479c746e7b7761a40c250121dc16
tiansiming [Fri, 15 Dec 2017 22:35:52 +0000 (22:35 +0000)]
Merge "Fix NPE when press ttsEngines settings icon"
am:
4b6e1b0758
Change-Id: I7d90bfce2e4f5d13b66f0e408ab9ff4273f6eac6
Treehugger Robot [Fri, 15 Dec 2017 22:30:04 +0000 (22:30 +0000)]
Merge "Fix NPE when press ttsEngines settings icon"
goneil [Tue, 12 Dec 2017 00:25:16 +0000 (16:25 -0800)]
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
Philip P. Moltmann [Fri, 15 Dec 2017 11:04:48 +0000 (11:04 +0000)]
Merge "Switch to modern ArgumentMatchers" am:
b8bf3bbc72
am:
ced2263d48
Change-Id: Iccb726dc2166bb1e30f39f7f6539fb74e1d83997
Philip P. Moltmann [Fri, 15 Dec 2017 10:48:38 +0000 (10:48 +0000)]
Merge "Switch to modern ArgumentMatchers"
am:
b8bf3bbc72
Change-Id: I81455eceac3a4273dc0bfd439fefa21c3b6f571c
Treehugger Robot [Fri, 15 Dec 2017 10:33:13 +0000 (10:33 +0000)]
Merge "Switch to modern ArgumentMatchers"
Philip P. Moltmann [Thu, 23 Nov 2017 00:07:48 +0000 (16:07 -0800)]
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
Robin Lee [Wed, 13 Dec 2017 17:28:34 +0000 (17:28 +0000)]
Merge "Handle getActiveAdmins() == null safely." am:
d46153c3d3
am:
70a6dfd647
Change-Id: I98ccb0e4eb0882e10c0266d3f1fbbddaa1073db8
Robin Lee [Wed, 13 Dec 2017 17:24:00 +0000 (17:24 +0000)]
Merge "Handle getActiveAdmins() == null safely."
am:
d46153c3d3
Change-Id: If8a1bcdaa5c106394e4c00add45765d27c80e0ef
Treehugger Robot [Wed, 13 Dec 2017 17:16:38 +0000 (17:16 +0000)]
Merge "Handle getActiveAdmins() == null safely."
Android Build Merger (Role) [Wed, 13 Dec 2017 13:23:07 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE am:
1d6d60f251 -s ours" into oc-mr1-dev
am:
ad44ea442b -s ours
Change-Id: I8d26666caaa62bb95fed60d484368fc5b191bdcd
Bill Yi [Wed, 13 Dec 2017 13:22:04 +0000 (13:22 +0000)]
Import translations. DO NOT MERGE
am:
e30af484ff -s ours
Change-Id: If2100d09d2f2c16f27e3c77ecaeded8fee5ebc90
Android Build Merger (Role) [Wed, 13 Dec 2017 13:19:40 +0000 (13:19 +0000)]
Merge "Import translations. DO NOT MERGE am:
1d6d60f251 -s ours" into oc-mr1-dev
Bill Yi [Wed, 13 Dec 2017 13:19:06 +0000 (13:19 +0000)]
Import translations. DO NOT MERGE
am:
1d6d60f251 -s ours
Change-Id: I3a20f9e9061dbaf15f5f61a3f5f0a146c128ff2e
Hemant Gupta [Wed, 13 Dec 2017 01:57:51 +0000 (01:57 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference" am:
f689d1aaa7
am:
0b4c0ebbe4
Change-Id: I5419efe379ee5bf0622ac8070b6ef3886d277bdf
Wang wenrui [Wed, 13 Dec 2017 01:56:50 +0000 (01:56 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode" am:
2051822bb9
am:
b2a6489139
Change-Id: I791f25687e37448659b3e0d91ad35f28dca0fed6
Hemant Gupta [Wed, 13 Dec 2017 01:27:46 +0000 (01:27 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
am:
f689d1aaa7
Change-Id: Ic4ffc6a26b11cdf0a937402c3bdcd68441fe4aed
Wang wenrui [Wed, 13 Dec 2017 01:26:52 +0000 (01:26 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode"
am:
2051822bb9
Change-Id: I974abe3dd2114aa439c0db46fa4930a947912de6
Treehugger Robot [Wed, 13 Dec 2017 00:30:42 +0000 (00:30 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
Bill Yi [Wed, 13 Dec 2017 00:25:18 +0000 (16:25 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If249fffda6df063fd39ec95e4ba04b412a1ea9e1
Bill Yi [Wed, 13 Dec 2017 00:19:14 +0000 (16:19 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I37fb135ddf373093ede9b1d56bf6452ea52ef093
Treehugger Robot [Tue, 12 Dec 2017 23:59:23 +0000 (23:59 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode"
Adam Lesinski [Tue, 12 Dec 2017 23:16:37 +0000 (23:16 +0000)]
Merge "Update the way OMS records details about overlays" into oc-mr1-dev
am:
15b42b89b8
Change-Id: I15809e100fc46691f0f60ed2729c18a07d904313
TreeHugger Robot [Tue, 12 Dec 2017 21:48:17 +0000 (21:48 +0000)]
Merge "Update the way OMS records details about overlays" into oc-mr1-dev
Robin Lee [Mon, 11 Dec 2017 17:24:03 +0000 (18:24 +0100)]
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
Bill Yi [Fri, 8 Dec 2017 06:01:46 +0000 (06:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
814fb3b7a1 -s ours
Change-Id: Ic4696096352546cb962ab57470ed569535791665
TreeHugger Robot [Fri, 8 Dec 2017 05:52:37 +0000 (05:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 8 Dec 2017 05:42:43 +0000 (05:42 +0000)]
Import translations. DO NOT MERGE am:
3ed385256a -s ours
am:
14c47203b3 -s ours
Change-Id: Ic512ba80a6900175986841430f1b69e170bbd845
Bill Yi [Fri, 8 Dec 2017 05:39:41 +0000 (05:39 +0000)]
Import translations. DO NOT MERGE
am:
3ed385256a -s ours
Change-Id: Idb17affa2264a9b46343c3bc9dea1978e5a92a32
Bill Yi [Fri, 8 Dec 2017 01:08:40 +0000 (17:08 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I35a94b9a271e88bf4f0384d5619c59661516131d
Bill Yi [Fri, 8 Dec 2017 01:08:11 +0000 (17:08 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I59dde21252b7681bb6dfcf9dae1f27192a3cd19e
Fan Zhang [Fri, 8 Dec 2017 00:25:31 +0000 (00:25 +0000)]
Merge "Update asset for no search result image" into oc-mr1-dev
am:
afa1efabad
Change-Id: Ib77d2973bf4f2155a7bdd73174fd4c4b9903bc17
TreeHugger Robot [Fri, 8 Dec 2017 00:19:09 +0000 (00:19 +0000)]
Merge "Update asset for no search result image" into oc-mr1-dev
Adam Lesinski [Tue, 14 Nov 2017 19:10:08 +0000 (11:10 -0800)]
Update the way OMS records details about overlays
Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.
Bug:
69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586
Xin Li [Thu, 7 Dec 2017 15:23:18 +0000 (15:23 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
cb1056f9b4 -s ours
am:
4f83509810
Change-Id: I72dd8e97a660beaca9343cea99ef117a202fdf35
Xin Li [Thu, 7 Dec 2017 15:17:25 +0000 (15:17 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am:
cb1056f9b4 -s ours
Change-Id: Iba281b420566a85ffebf98941dbb5e456b724362
Xin Li [Thu, 7 Dec 2017 07:05:14 +0000 (07:05 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am:
7b017d5a2f -s ours
am:
2ba6a22abb
Change-Id: Id5dd78948fe46817fdb0c65b2c4dc8d6536f3a37
Xin Li [Thu, 7 Dec 2017 04:36:38 +0000 (04:36 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
7b017d5a2f -s ours
Change-Id: I38ef4306a74fb9c1ca39903d5a74df5db0753290
Hemant Gupta [Wed, 4 Nov 2015 11:08:15 +0000 (16:38 +0530)]
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
tiansiming [Wed, 6 Dec 2017 13:29:15 +0000 (21:29 +0800)]
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>
Xin Li [Wed, 6 Dec 2017 23:18:29 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 19:52:09 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Iab7fd863c422780055277093cb9621197e09d969
Wang wenrui [Mon, 13 Feb 2017 04:51:24 +0000 (12:51 +0800)]
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
Antony Sargent [Tue, 5 Dec 2017 23:23:05 +0000 (23:23 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9 am:
26e5f828f7 am:
fe20f69e3f
am:
51950965e9
Change-Id: I30014b81a3eb514caf030ea5efb72694f434e305
Antony Sargent [Tue, 5 Dec 2017 23:17:11 +0000 (23:17 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9 am:
26e5f828f7
am:
fe20f69e3f
Change-Id: I1d1eb74920d9b191bb7f0365620d0dd1d372b923
Antony Sargent [Tue, 5 Dec 2017 23:10:05 +0000 (23:10 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9
am:
26e5f828f7
Change-Id: Ia88d8014f221c5079ff33f9a10e58c2eed7b329a
Antony Sargent [Tue, 5 Dec 2017 17:36:29 +0000 (17:36 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1
am:
db6e747ab9
Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63
Antony Sargent [Tue, 5 Dec 2017 17:32:41 +0000 (17:32 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85
am:
acacd658f1
Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
Antony Sargent [Tue, 5 Dec 2017 17:28:54 +0000 (17:28 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407
am:
9867a3ef85
Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1
Antony Sargent [Tue, 5 Dec 2017 17:26:51 +0000 (17:26 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207
am:
3d7dbd6407
Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
Antony Sargent [Tue, 5 Dec 2017 17:24:48 +0000 (17:24 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1
am:
24f063a207
Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
Antony Sargent [Tue, 5 Dec 2017 17:21:14 +0000 (17:21 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846
am:
9cf1fc73f1
Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
Antony Sargent [Tue, 5 Dec 2017 17:19:12 +0000 (17:19 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3
am:
eee62e1846
Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
Antony Sargent [Tue, 5 Dec 2017 17:17:08 +0000 (17:17 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383
am:
b2b401b5f3
Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b