Artem Iglikov
270c692e7f
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
...
am: 5cb6b79400
2018-06-12 06:35:19 -07:00
TreeHugger Robot
5cb6b79400
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
2018-06-12 12:47:36 +00:00
Artem Iglikov
ca85cc9d27
DO NOT MERGE Revert "Fix gray out previously connected device preference issue"
...
This reverts commit 95abf59af4
2018-06-12 11:55:31 +00:00
Ivan Chiang
d718f4bb8b
Merge "Fix gray out previously connected device preference issue" into pi-dev
...
am: 2ffa711cd1
2018-06-12 01:20:56 -07:00
TreeHugger Robot
2ffa711cd1
Merge "Fix gray out previously connected device preference issue" into pi-dev
2018-06-12 07:34:15 +00:00
android-build-team Robot
fa06be0727
Merge cherrypicks of [4315359, 4315389, 4315390, 4315519, 4315520, 4315360, 4317665, 4317701, 4315391, 4316085] into pi-release
...
Change-Id: I913d48556bf01f9baf0b1e2d6dfc41127a9816d1
2018-06-12 01:49:25 +00:00
Fan Zhang
23059f5e5a
Skip device index job if caller is not Settings app.
...
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Fixes: 109713077
Test: robotests
(cherry picked from commit 74ba1a51d79ecf3e0c11
2018-06-12 01:48:58 +00:00
Fan Zhang
251c324646
Skip device index job if caller is not Settings app.
...
am: 9ecf3e0c11
2018-06-11 11:40:07 -07:00
Fan Zhang
9ecf3e0c11
Skip device index job if caller is not Settings app.
...
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Fixes: 109713077
Test: robotests
(cherry picked from commit 74ba1a51d7
2018-06-11 15:54:36 +00:00
android-build-team Robot
da294f14cd
Snap for 4832339 from 29eec443e0 to pi-release
...
Change-Id: I17fd812e30dbfff2a563e67ebfee988306fb5b97
2018-06-10 19:05:22 +00:00
Xin Li
5a0817ce57
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
am: 44de687b93
2018-06-09 03:23:12 -07:00
Beverly
a045b13e0a
Merge "Fix typo" into pi-dev
...
am: 29eec443e0
2018-06-08 11:42:11 -07:00
TreeHugger Robot
29eec443e0
Merge "Fix typo" into pi-dev
2018-06-08 18:32:47 +00:00
ryanywlin
de3d9a0a73
2nd attempt handle BT is not supported on emulator
...
am: 59287d40d1
2018-06-08 11:10:56 -07:00
Xin Li
44de687b93
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
Bug: 79597307
Change-Id: Ibb6c6e3f775ee19127711fcc10b2e00a2289a026
2018-06-08 11:08:02 -07:00
Beverly
78f0f781fa
Fix typo
...
Test: manual
Bug: 109925028
Change-Id: I87ec517249567123df1a8eace17109ed7e0bae2b
2018-06-08 15:17:09 +00:00
android-build-team Robot
c27a211791
Snap for 4829593 from ee96c3a259 to pi-release
...
Change-Id: Iee7304c974f4b903c116c161ec38a4e8c3491c78
2018-06-08 07:21:01 +00:00
ryanywlin
59287d40d1
2nd attempt handle BT is not supported on emulator
...
Error handle before using LocalBluetoothManager in the onStart
and onStop
Bug: 80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42
Change-Id: I47f7d3b7cddc2fbbafb8fb5cf0fb6adb2d0d2d55
2018-06-08 15:05:22 +08:00
Fan Zhang
1fe94d4fd7
Fix context leak in AudioSwitchPreferenceController.
...
am: ee96c3a259
2018-06-07 18:14:01 -07:00
Fan Zhang
ee96c3a259
Fix context leak in AudioSwitchPreferenceController.
...
In this controller the context is stored into a global singleton but was
not cleared, thus leaking context and associated views.
Change-Id: I4247f8ff753bc0a331c6c81a0e4b5b4bc41588de
Fixes: 80507279
Test: robotests
Test: inspected hprof before/after change
2018-06-07 18:53:59 +00:00
Joe Onorato
d4fba82998
Merge "Add comments and additional constants for the known bad anomaly types." into pi-dev
...
am: 32d9f451f9
2018-06-07 10:07:51 -07:00
TreeHugger Robot
32d9f451f9
Merge "Add comments and additional constants for the known bad anomaly types." into pi-dev
2018-06-07 16:48:51 +00:00
Fan Zhang
0e1393ae8c
Delete obsolete activity alias for dev settings
...
This activity alias is here since android 4.x for backward
compatibility. We no longer need it, and keeping it will cause security
issue.
Change-Id: Ib7817fd7cf8c8e66ca50534a0387cdc5773f837b
Merged-In: I3f985e7fe14bd290db73b8c46dd817591df02015
Fixes: 92497653
Test: manual
2018-06-07 16:47:31 +00:00
android-build-team Robot
3f067b0dd3
Snap for 4826885 from daea8be9ab to pi-release
...
Change-Id: I7724348225353adb6ccf98febc86010556248f97
2018-06-07 07:27:26 +00:00
Nathan Harold
1701aaf186
[RadioInfo] Save PreferredNetworkMode to Settings
...
am: daea8be9ab
2018-06-06 19:19:44 -07:00
Beverly
1717b8550e
Merge "If zen settings are updated, don't show onboarding" into pi-dev
...
am: aaac61eb5e
2018-06-06 18:34:25 -07:00
Bill Yi
ac7ce09efe
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: a1be4c0829
2018-06-06 17:30:01 -07:00
Nathan Harold
daea8be9ab
[RadioInfo] Save PreferredNetworkMode to Settings
...
Historically, the debug menu intentionally did not
save the preferred network mode once chosen. This
causes problems because some settings cause a phone
switch which overrides the preferred network mode,
which can cause another phone switch and again
override the preferred network mode, completely
obliterating the requested debug setting. This change
will now save the debug menu setting to the system
settings, which will prevent the circular changes and
loss of setting due to phone switching.
However, caching the debug setting to prevent the phone
switch logic from overriding the setting has a side
effect, which is why it wasn't done historically.
If a debug setting of the preferred network mode
is set, it will cause the UX of the non-debug network
preference screen to change. Thus, someone who uses
the debug menu to make changes must be careful to
re-set the setting to return to the correct UX of the
publicly displayed menu.
Bug: 95133265
Test: -manually set preferred network mode using the
RadioInfo menu and observed that there is no
phone switch when setting CDMA.
-confirmed that changing the network mode in
RadioInfo will cause UX changes to the public
network preference menu.
Change-Id: I91f669956a6d02515530855c4617cd0a767d73fa
2018-06-06 17:27:50 -07:00
Evan Rosky
679c8de583
Request Focus in fingerprint rename dialog
...
am: 7a1d52eb06
2018-06-06 17:24:22 -07:00
Joe Onorato
f4781a79b4
Add comments and additional constants for the known bad anomaly types.
...
They aren't being used now, but by declaring them now we can consolidate
what we are encouraging OEMs to do in the PI timeframe.
Bug: 78013987
Test: treehugger
Change-Id: I7f86491448e799081b18d71274d2629a902d4972
2018-06-06 16:22:33 -07:00
TreeHugger Robot
aaac61eb5e
Merge "If zen settings are updated, don't show onboarding" into pi-dev
2018-06-06 21:40:43 +00:00
TreeHugger Robot
a1be4c0829
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-06-06 21:38:42 +00:00
Beverly
8aef786baa
If zen settings are updated, don't show onboarding
...
Change-Id: I33c328e5d90f1b948c7dacb2e7f6265a1e496d35
Fixes: 109668117
Test: ZenOnboardingActivity
(cherry picked from commit da412f07e5
2018-06-06 20:29:43 +00:00
Bill Yi
ff3c83466c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8cc9d67a4676ed8db1d8c48a76478efc715375fb
2018-06-06 13:20:03 -07:00
Evan Rosky
7a1d52eb06
Request Focus in fingerprint rename dialog
...
Bug: 68841055
Test: Manual. dialog comes up with focused entry
Change-Id: I5bb1b7227c1323595bf7f483e11e87e2c3550093
2018-06-06 12:52:05 -07:00
android-build-team Robot
bcf0f7aa84
Snap for 4824048 from 688d1d81cb to pi-release
...
Change-Id: I9646c90ca902eb5e5cec740582c6336448923041
2018-06-06 07:21:25 +00:00
Doris Ling
6e6ed32a03
Only add entry with unique package name to default browser list.
...
am: 688d1d81cb
2018-06-05 19:42:15 -07:00
Doris Ling
688d1d81cb
Only add entry with unique package name to default browser list.
...
When we query the package manager for activities that can handle the
web data uri, different capable activities within the same package will
be returned as separate entries. However, when we show the default
browser apps to the user, the entries are simply base on package name.
So, if there are multiple activities within the same package that can
handle the web data, they will be shown as duplicate entries.
When we process the resolved activities, check the corresponding package
name for duplicate entries before adding it to the default browser list.
Change-Id: I4e1f1e1ea22781efe24d791b367246423ca7a3c4
Merged-In: I70c88866eb3d5fe6466554749e23c85f429dd30c
Fixes: 84207432
Test: make RunSettingsRoboTests
2018-06-05 17:48:30 -07:00
android-build-team Robot
be7f9c7313
Snap for 4821244 from bed0aff4a2 to pi-release
...
Change-Id: I99b6ac5df600ded3e48e026f2be8f75735017ae3
2018-06-05 07:23:31 +00:00
Atanas Kirilov
5a996aa7fe
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours am: 71046c3d10 -s ours
...
am: bed0aff4a2
2018-06-04 18:17:44 -07:00
Atanas Kirilov
8006c6a726
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3 am: 5e66879b53
...
am: 128334d2c6
2018-06-04 17:47:54 -07:00
Atanas Kirilov
f97fc8eb17
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1 am: 463ea747f6
...
am: 25bd78d7e9
2018-06-04 17:46:21 -07:00
Atanas Kirilov
dabefd5d43
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778 am: 0d59c0d23d
...
am: a6b728c5a3
2018-06-04 17:41:57 -07:00
Atanas Kirilov
bed0aff4a2
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours
...
am: 71046c3d10
2018-06-04 17:41:55 -07:00
Atanas Kirilov
c114a65956
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9 am: 2f38890832
...
am: 5dfb976b21
2018-06-04 17:31:09 -07:00
Atanas Kirilov
224968eebd
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3 am: a50293f72c
...
am: f2a135ec5a
2018-06-04 17:18:51 -07:00
Atanas Kirilov
71046c3d10
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours
...
am: b072779789
2018-06-04 17:10:35 -07:00
Atanas Kirilov
b072779789
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev
...
am: 8994d1f0a4
2018-06-04 16:59:14 -07:00
Atanas Kirilov
128334d2c6
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3
...
am: 5e66879b53
2018-06-04 16:46:48 -07:00
Atanas Kirilov
25bd78d7e9
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1
...
am: 463ea747f6
2018-06-04 16:45:39 -07:00
