OSDN Git Service
Bill Yi [Sun, 5 Aug 2018 01:21:26 +0000 (18:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
000f97dcf9 -s ours
Change-Id: Ia6cce5c5529998a45fa52d353f63a8edc8e2c0ef
Bill Yi [Sat, 4 Aug 2018 14:43:29 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I89c83219dfbf228054284db00548647b94fc398b
Auto-generated-cl: translation import
Dario Freni [Tue, 24 Jul 2018 11:02:45 +0000 (04:02 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition." am:
aa2ec5f239 -s ours
am:
1e56e69a46 -s ours
Change-Id: I0282749b861a6571326c725b5c62a0ebda99dff9
Dario Freni [Tue, 24 Jul 2018 10:58:08 +0000 (03:58 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition."
am:
aa2ec5f239 -s ours
Change-Id: I5341a7ab21758d1a47b0618cd8b1779f063b1406
Treehugger Robot [Tue, 24 Jul 2018 10:35:44 +0000 (10:35 +0000)]
Merge "Include NOTICE file in /product partition."
Chalard Jean [Fri, 20 Jul 2018 19:33:56 +0000 (12:33 -0700)]
Merge "Use the SSID of the network in the no internet dialog" am:
692f989b98 am:
9971303508
am:
28a2b521cf
Change-Id: Iae1632372659849d2f61377d0b31d171c50491ab
Chalard Jean [Fri, 20 Jul 2018 19:29:46 +0000 (12:29 -0700)]
Merge "Use the SSID of the network in the no internet dialog" am:
692f989b98
am:
9971303508
Change-Id: Ie1eecd52e31477bf7cac2fbe542f34be308ec5b6
Chalard Jean [Fri, 20 Jul 2018 19:25:39 +0000 (12:25 -0700)]
Merge "Use the SSID of the network in the no internet dialog"
am:
692f989b98
Change-Id: I6921cab3a99a3b4e2ad5919acb1e01f814d26289
Treehugger Robot [Fri, 20 Jul 2018 18:57:09 +0000 (18:57 +0000)]
Merge "Use the SSID of the network in the no internet dialog"
Bill Yi [Fri, 20 Jul 2018 18:33:55 +0000 (11:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
0a8de9d763 -s ours
Change-Id: Ic192d76bf26a37373d18944f459bcacae754c174
Xin Li [Fri, 20 Jul 2018 06:45:48 +0000 (23:45 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am:
e8858cc954
Change-Id: Ide9e745efe8952ac27fb9fb79053557aa6a1caef
Bill Yi [Fri, 20 Jul 2018 02:35:10 +0000 (19:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I26fa1f1f72571d0541556649bf104446c9522830
Xin Li [Thu, 19 Jul 2018 20:50:34 +0000 (13:50 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
Bug:
111615259
Change-Id: I0bbc44c97afd0ed6ff7799e866d4b36beee6c3be
Brad Ebinger [Mon, 16 Jul 2018 20:55:25 +0000 (13:55 -0700)]
Merge "IMS: Use the slot based ImsManager factory reset API." am:
9e4ff6fca6
am:
15ca33865c
Change-Id: I5fcdcb5b74a828d4377d2bc4e8e567f61ff9a899
Brad Ebinger [Mon, 16 Jul 2018 20:32:55 +0000 (13:32 -0700)]
Merge "IMS: Use the slot based ImsManager factory reset API."
am:
9e4ff6fca6
Change-Id: I42b0a06ed5707475d105646233ac49958de29d75
Brad Ebinger [Mon, 16 Jul 2018 19:57:31 +0000 (19:57 +0000)]
Merge "IMS: Use the slot based ImsManager factory reset API."
Doris Ling [Mon, 16 Jul 2018 18:46:54 +0000 (11:46 -0700)]
[automerger skipped] DO NOT MERGE Fix summary text for advanced button.
am:
20e7c9d0ba -s ours
Change-Id: I357656196bb6d24404aa797f380e1935264c1ac6
Doris Ling [Fri, 13 Jul 2018 19:32:00 +0000 (12:32 -0700)]
DO NOT MERGE Fix summary text for advanced button.
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.
Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes:
111195268
Test: manual
Hall Liu [Fri, 13 Jul 2018 18:27:19 +0000 (11:27 -0700)]
Fix usage of SubscriptionInfo ctor
am:
f0072b7345
Change-Id: I0ec1335abfef8fc30c638636e3bb1ac24a221743
Hall Liu [Tue, 12 Jun 2018 22:20:50 +0000 (15:20 -0700)]
Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc
Bug:
35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit
02c5f3c7acb1fd6a33168fc299411eb46bf42685)
Hall Liu [Tue, 12 Jun 2018 22:20:50 +0000 (15:20 -0700)]
Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc
Bug:
35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit
02c5f3c7acb1fd6a33168fc299411eb46bf42685)
xiamin [Wed, 11 Jul 2018 22:16:20 +0000 (15:16 -0700)]
Merge "new password shouldn't be empty string" am:
dd7bd6b15a
am:
bfb61ed2ed
Change-Id: I97c536fc0aaaec4e317944564519a908a762e9f5
xiamin [Wed, 11 Jul 2018 21:51:09 +0000 (14:51 -0700)]
Merge "new password shouldn't be empty string"
am:
dd7bd6b15a
Change-Id: I8e3fb81aba487df22573b6fa67a36e2973c9a54b
Treehugger Robot [Wed, 11 Jul 2018 20:23:29 +0000 (20:23 +0000)]
Merge "new password shouldn't be empty string"
Bill Yi [Wed, 11 Jul 2018 17:48:27 +0000 (10:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
11ebb14241 -s ours
Change-Id: Idb03e6fbae91f20729a4ebbd504255c99bbba606
Dario Freni [Wed, 11 Jul 2018 09:52:53 +0000 (10:52 +0100)]
Include NOTICE file in /product partition.
Test: flashed on a device with /product partition and verified licences
are correctly loaded
Bug:
111179267
Change-Id: I2667029128a56baefbec376b0ec4e4ecdb3c3ad4
Merged-In: I12e9169b1d3d313a6c5da0d575a6526327268381
Bill Yi [Wed, 11 Jul 2018 05:28:21 +0000 (22:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id9deb2f66c09d1b17c35d8226673768d40d7eef7
Salvador Martinez [Tue, 10 Jul 2018 19:41:50 +0000 (12:41 -0700)]
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
am:
4804c2c7a5
Change-Id: I81b835965ee39d8c877e834820ca21543d18d654
TreeHugger Robot [Tue, 10 Jul 2018 19:33:29 +0000 (19:33 +0000)]
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
xiamin [Tue, 10 Jul 2018 02:48:56 +0000 (10:48 +0800)]
new password shouldn't be empty string
enter "Home screen backup password" in "Developer Settings",
do nothings and then click "Set backup password", There will
be a toast display "New backup password set".
The new password field cannot be empty.
Bug: https://partnerissuetracker.corp.google.com/u/2/issues/
111261338
Test: empty string can not be set as a password
Signed-off-by: xiamin <xiamin@xiaomi.com>
Salvador Martinez [Mon, 9 Jul 2018 18:52:34 +0000 (11:52 -0700)]
Fix incorrect method call to wifiManager in Tether
In the WifiTetherApBandController the incorrect method was
being called to check if the device is 5Ghz compatible. We
were calling is5GhzBandSupported directly, but we were
supposed to call isDualBandSupported instead.
Test: robotests updated
Bug:
110793581
Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9
Pavel Grafov [Mon, 9 Jul 2018 17:49:22 +0000 (10:49 -0700)]
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
am:
dc2db6c6c9
Change-Id: Id0362b8917255d81dfc83ecccc913aaa8c8349a2
TreeHugger Robot [Mon, 9 Jul 2018 17:37:19 +0000 (17:37 +0000)]
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
Bill Yi [Fri, 6 Jul 2018 03:03:16 +0000 (20:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e338a41dac -s ours
Change-Id: Ifb7f5f0271381fb960b74722457a58ddb82429cf
Bill Yi [Thu, 5 Jul 2018 04:09:50 +0000 (21:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id2d2fbe5bc2473fa6de24605fc5dbef0ae4e626f
Pavel Grafov [Tue, 3 Jul 2018 19:31:42 +0000 (20:31 +0100)]
Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.
Bug:
111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
Merged-In: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
(cherry picked from commit
f14de789f4cc7d145e6011e5a5562876e25c3f31)
Matthew Fritze [Tue, 3 Jul 2018 21:39:07 +0000 (14:39 -0700)]
Merge "Conditionally block battery percantage from search" into pi-dev
am:
ea97a66383
Change-Id: If61f6e81aebd70c88e8fc75a525f53bed3ddbac1
TreeHugger Robot [Tue, 3 Jul 2018 21:35:32 +0000 (21:35 +0000)]
Merge "Conditionally block battery percantage from search" into pi-dev
Lei Yu [Tue, 3 Jul 2018 20:42:30 +0000 (13:42 -0700)]
Merge "Unrestrict app if it been set as device admin app" into pi-dev
am:
f406fd7976
Change-Id: Ic085eeee8d18999d56e7432bb13af342c0e00786
TreeHugger Robot [Tue, 3 Jul 2018 20:24:58 +0000 (20:24 +0000)]
Merge "Unrestrict app if it been set as device admin app" into pi-dev
Matthew Fritze [Mon, 2 Jul 2018 18:22:59 +0000 (11:22 -0700)]
Conditionally block battery percantage from search
The PowerUsageSummary fragment doesn't use the regular pattern
of a static method to build preference controllers, which can be
accessed by both DashboardFragment and BaseSearchIndexProvider,
because it depends on the Activity & Fragment in the creation of
the preference controllers.
The correct & long-term solution here would be to move those dependencies
out of the getPreferenceControllers method, such that the we could use a
static buildPreferenceControllers method, as seen in DisplaySettings.java.
In the mean time, we know that BatteryPercentagePrefController should not
show up on devices, so we conditionally add the the preference controller's
into getNonIndexableKeys method based on controller Availability, which
BasePreferenceController normally does automatically with a getPreferenceController
method in the host fragment's SEARCH_INDEX_DATA_PROVIDER.
Since this is a short-term solution, it should not be merged into master, and thus
I am not marking the bug as fixed.
Bug:
110894466
Test: Robotests
Change-Id: I06f814571d0b72fbf020dd11a9d23a9eb9907bfd
Merged-In: I5993d332dbd218c981ef5432aebb735d0000f67a
Bill Yi [Tue, 3 Jul 2018 02:27:51 +0000 (19:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
20fa188802 -s ours
Change-Id: If51e678c0621df0150bb22fbcbee9b16964b1215
Bill Yi [Tue, 3 Jul 2018 01:11:20 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
110524699
Change-Id: I80e63cc3fe9148fa5c6986dfc7b470e870d683ca
Lei Yu [Thu, 28 Jun 2018 21:08:42 +0000 (14:08 -0700)]
Unrestrict app if it been set as device admin app
Bug:
110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf
Fan Zhang [Thu, 28 Jun 2018 05:07:14 +0000 (22:07 -0700)]
[automerger skipped] Delete obsolete activity alias for dev settings am:
0e1393ae8c am:
afbdbeb7d5 am:
192cc156b0 -s ours
am:
e9b64753e7 -s ours
Change-Id: Ida92ee646fe101c1c886fecc9351257435571d39
Fan Zhang [Thu, 28 Jun 2018 05:01:57 +0000 (22:01 -0700)]
[automerger skipped] Delete obsolete activity alias for dev settings am:
0e1393ae8c am:
afbdbeb7d5
am:
192cc156b0 -s ours
Change-Id: Ib02c4b16500eaf479106c2e70b02fdaa401141e7
Fan Zhang [Thu, 28 Jun 2018 04:56:41 +0000 (21:56 -0700)]
Delete obsolete activity alias for dev settings am:
0e1393ae8c
am:
afbdbeb7d5
Change-Id: I0bbd3a65b7f1ab11e0f182ca4421c8c5911e6ad2
Fan Zhang [Thu, 28 Jun 2018 04:53:33 +0000 (21:53 -0700)]
Delete obsolete activity alias for dev settings
am:
0e1393ae8c
Change-Id: I879550b9dda19f42aec9d5cecc4f66a5ad0c23e4
Peiyong Lin [Fri, 22 Jun 2018 21:13:22 +0000 (14:13 -0700)]
Merge "Rename Automatic color to Adaptive color" into pi-dev
am:
f32310a7e6
Change-Id: I58c8322796905bc7ed589c3153c9de65598f268f
Peiyong Lin [Fri, 22 Jun 2018 21:08:37 +0000 (21:08 +0000)]
Merge "Rename Automatic color to Adaptive color" into pi-dev
Chia-I Wu [Thu, 21 Jun 2018 16:13:42 +0000 (00:13 +0800)]
Rename Automatic color to Adaptive color
Rename the new mode (only available on 2018 devices) from Automatic to Adaptive.
Bug:
110524699
Test: manual
Change-Id: I56e87ad11a94915155cff56a6a13a9e167383e0c
Salvador Martinez [Thu, 21 Jun 2018 22:25:13 +0000 (15:25 -0700)]
Merge "Add unofficial intent for WifiTetherSettings" into pi-dev
am:
ce58bf2ee9
Change-Id: I4874f7186a45a6d2792e42b708467010e3960db6
Salvador Martinez [Thu, 21 Jun 2018 22:21:20 +0000 (22:21 +0000)]
Merge "Add unofficial intent for WifiTetherSettings" into pi-dev
Evan Laird [Thu, 21 Jun 2018 21:58:14 +0000 (14:58 -0700)]
Merge "Allow config to disable battery percent setting" into pi-dev
am:
1f6c7910fb
Change-Id: Ief7df5312104e44bda140f68dd5e6821c2736bbf
TreeHugger Robot [Thu, 21 Jun 2018 21:18:36 +0000 (21:18 +0000)]
Merge "Allow config to disable battery percent setting" into pi-dev
Bill Yi [Thu, 21 Jun 2018 19:35:46 +0000 (12:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e5c1ff17ac -s ours
Change-Id: If83968942476f9a142aa11b04f3437e52066ec88
TreeHugger Robot [Thu, 21 Jun 2018 19:26:04 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Thu, 21 Jun 2018 18:31:13 +0000 (11:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ieb6af16365681984ceafb048d338d8132df0e3bc
Ivan Chiang [Thu, 21 Jun 2018 04:05:45 +0000 (21:05 -0700)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""" into pi-dev
am:
44505ef8cd
Change-Id: I39adc9974b57830940b983bc7d378359de0505fd
TreeHugger Robot [Thu, 21 Jun 2018 02:30:43 +0000 (02:30 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""" into pi-dev
Salvador Martinez [Tue, 19 Jun 2018 17:27:30 +0000 (10:27 -0700)]
Add unofficial intent for WifiTetherSettings
This CL adds an intent that can be used to start
WifiTether Settings.
Test: SettingsGatewayTest still passes
Bug:
110235497
Bug:
80251951
Change-Id: Iac94e563a91b1f821f69f18234d8176350ae5f29
Daichi Ueura [Tue, 19 Jun 2018 22:42:47 +0000 (15:42 -0700)]
Merge "Show Wifi 'Off' status properly just after boot" am:
23482a54bb
am:
01dfcc4ea9
Change-Id: I45dd9479bd58d15f09c0a72b5e3fe71ee6f64d8a
Daichi Ueura [Tue, 19 Jun 2018 22:36:47 +0000 (15:36 -0700)]
Merge "Show Wifi 'Off' status properly just after boot"
am:
23482a54bb
Change-Id: Icc111b50f52f5ed801d63bedfac851ba5dcc99c1
Treehugger Robot [Tue, 19 Jun 2018 21:55:17 +0000 (21:55 +0000)]
Merge "Show Wifi 'Off' status properly just after boot"
Daichi Ueura [Tue, 19 Jun 2018 06:44:21 +0000 (15:44 +0900)]
Show Wifi 'Off' status properly just after boot
If Wifi is not enabled at boot, WIFI_STATE_CHANGED_ACTION
sticky intent is not present. This results in Wifi 'Off'
status is not shown. This patch handles such case by calling
notifyChangeIfNeeded at register to refresh status.
Bug:
110373099
Test: manual - Check status after device boot with wifi off
Change-Id: I009386b03ef3269b00ce403b86087664b295f397
Beverly [Thu, 14 Jun 2018 19:28:08 +0000 (12:28 -0700)]
Add help uri for prevent ringing gesture
am:
55dfd8a86b
Change-Id: Id9d2738a9225e6b655f027a25024cd25acbd091a
Evan Laird [Thu, 14 Jun 2018 00:13:47 +0000 (20:13 -0400)]
Allow config to disable battery percent setting
Respect config_battery_percentage_setting_available to determine whether
or not to allow showing battery percentage in the status bar.
Test: visual
Bug:
80129194
Change-Id: I23b0065ed99865a8df37c098b2f0f16d57799706
Pengquan Meng [Wed, 13 Jun 2018 23:19:25 +0000 (16:19 -0700)]
[automerger skipped] Merge "Remove internal ApnSetting." am:
4079677883
am:
1fc6859126 -s ours
Change-Id: Ic6772c2b65d98c78863c5e9b60e7c1ac1cc714cb
Pengquan Meng [Wed, 13 Jun 2018 22:33:56 +0000 (15:33 -0700)]
Merge "Remove internal ApnSetting."
am:
4079677883
Change-Id: I130a2038c2c5b289c107d9e640c038965ef60e34
Pengquan Meng [Wed, 13 Jun 2018 20:47:13 +0000 (20:47 +0000)]
Merge "Remove internal ApnSetting."
Beverly [Thu, 7 Jun 2018 14:43:32 +0000 (10:43 -0400)]
Add help uri for prevent ringing gesture
Test: build
Bug:
79270169
Change-Id: Iea5598f26649854521202363cad6ee297cef3057
(cherry picked from commit
486d1facfab222c686e03c344619aaf19280ea2a)
yuemingw [Wed, 13 Jun 2018 12:33:59 +0000 (13:33 +0100)]
Remove internal ApnSetting.
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.
Bug:
77511388
Test: existing test
Change-Id: Idb66b7af22c0531d4ffc324075849abc08667a87
Merged-In: I8ca1fb399026a8ef4ba9afa18678d986daa50606
Salvador Martinez [Wed, 13 Jun 2018 00:15:51 +0000 (17:15 -0700)]
Change UI for wireless AP tether band selection
am:
acff57fa68
Change-Id: I47124f2fa50015eca97cee589b4a1f94f43123fd
Salvador Martinez [Wed, 30 May 2018 00:53:02 +0000 (17:53 -0700)]
Change UI for wireless AP tether band selection
We decided to use the list preference after all due to
some devices not supporting various combinations of AP
configurations. This change makes it so that there are
three different UIs depending on the configurations
which are supported.
- 5.0 GHz unsupported: disable the preference and just
set the value to 2.4 GHz
- all supported, no dual mode: allow the user to choose
EITHER 2.4 GHz or 5.0 GHz
- all supported, dual mode: allow the user to choose
2.4 GHz or BOTH 2.4 GHz & 5.0 GHz with 5.0 being
preferred
Test: atest SettingsRoboTests
Bug:
80315296
Change-Id: I888d35811a98b8cf0155a3cb96c42ff762763378
Merged-In: I888d35811a98b8cf0155a3cb96c42ff762763378
yuemingw [Mon, 9 Apr 2018 16:00:38 +0000 (17:00 +0100)]
Remove internal ApnSetting.
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.
Bug:
77511388
Test: existing test
Change-Id: I8ca1fb399026a8ef4ba9afa18678d986daa50606
Ivan Chiang [Tue, 12 Jun 2018 15:27:25 +0000 (15:27 +0000)]
DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""
This reverts commit
ca85cc9d278d19eef92d9ed37668e906522f56c2.
Reason for revert: This patch should be submitted with whole topic.
Bug:
80227045
Change-Id: I446329aa3370b64b2a943a0f970d0236258455a3
Artem Iglikov [Tue, 12 Jun 2018 13:35:19 +0000 (06:35 -0700)]
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
am:
5cb6b79400
Change-Id: I6c958dc1d0c4d87eeafe1855da6455f4185597da
TreeHugger Robot [Tue, 12 Jun 2018 12:47:36 +0000 (12:47 +0000)]
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
Artem Iglikov [Tue, 12 Jun 2018 11:40:24 +0000 (11:40 +0000)]
DO NOT MERGE Revert "Fix gray out previously connected device preference issue"
This reverts commit
95abf59af43bafe4922b8cc096b10b65440419b8.
Reason for revert: Crashes settings (b/
110075201)
Bug:
110075201
Change-Id: Ie6ea94e0891754f18576bd21447b64410d2fd23a
Ivan Chiang [Tue, 12 Jun 2018 08:20:56 +0000 (01:20 -0700)]
Merge "Fix gray out previously connected device preference issue" into pi-dev
am:
2ffa711cd1
Change-Id: Id889619b77d10826ad0c0eefe494b7aea3a4d779
TreeHugger Robot [Tue, 12 Jun 2018 07:34:15 +0000 (07:34 +0000)]
Merge "Fix gray out previously connected device preference issue" into pi-dev
Fan Zhang [Mon, 11 Jun 2018 18:40:07 +0000 (11:40 -0700)]
Skip device index job if caller is not Settings app.
am:
9ecf3e0c11
Change-Id: I84974379ac3074367623cce60d6633fd4390ed00
Fan Zhang [Wed, 30 May 2018 16:50:52 +0000 (09:50 -0700)]
Skip device index job if caller is not Settings app.
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes:
80437512
Fixes:
109713077
Test: robotests
(cherry picked from commit
74ba1a51d74a4fb7fc2ccd62fd38087974c20020)
Xin Li [Sat, 9 Jun 2018 10:23:12 +0000 (03:23 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am:
44de687b93
Change-Id: I9aca24c1ee7a0ce46d8a7845ba78735fd03410c7
Beverly [Fri, 8 Jun 2018 18:42:11 +0000 (11:42 -0700)]
Merge "Fix typo" into pi-dev
am:
29eec443e0
Change-Id: I3fc887ca87b96b93989e187abf05b66201d29b95
TreeHugger Robot [Fri, 8 Jun 2018 18:32:47 +0000 (18:32 +0000)]
Merge "Fix typo" into pi-dev
ryanywlin [Fri, 8 Jun 2018 18:10:56 +0000 (11:10 -0700)]
2nd attempt handle BT is not supported on emulator
am:
59287d40d1
Change-Id: I843fc58484df106af09cae87dcb886ea49aa53ea
Xin Li [Fri, 8 Jun 2018 18:08:02 +0000 (11:08 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: Ibb6c6e3f775ee19127711fcc10b2e00a2289a026
Beverly [Fri, 8 Jun 2018 14:44:05 +0000 (10:44 -0400)]
Fix typo
Test: manual
Bug:
109925028
Change-Id: I87ec517249567123df1a8eace17109ed7e0bae2b
ryanywlin [Fri, 8 Jun 2018 06:36:34 +0000 (14:36 +0800)]
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
Fan Zhang [Fri, 8 Jun 2018 01:14:01 +0000 (18:14 -0700)]
Fix context leak in AudioSwitchPreferenceController.
am:
ee96c3a259
Change-Id: I3575074241ee60d573563edbffa214f0d705bea3
Fan Zhang [Thu, 7 Jun 2018 18:51:09 +0000 (11:51 -0700)]
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
Joe Onorato [Thu, 7 Jun 2018 17:07:51 +0000 (10:07 -0700)]
Merge "Add comments and additional constants for the known bad anomaly types." into pi-dev
am:
32d9f451f9
Change-Id: Ib66379c8c5a5dbae415aecc701ebb0a66859b7d5
TreeHugger Robot [Thu, 7 Jun 2018 16:48:51 +0000 (16:48 +0000)]
Merge "Add comments and additional constants for the known bad anomaly types." into pi-dev
Fan Zhang [Thu, 7 Jun 2018 16:45:23 +0000 (16:45 +0000)]
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
Nathan Harold [Thu, 7 Jun 2018 02:19:44 +0000 (19:19 -0700)]
[RadioInfo] Save PreferredNetworkMode to Settings
am:
daea8be9ab
Change-Id: I801ae6b29a4cfe1286c4f032662191154dc911fb
Beverly [Thu, 7 Jun 2018 01:34:25 +0000 (18:34 -0700)]
Merge "If zen settings are updated, don't show onboarding" into pi-dev
am:
aaac61eb5e
Change-Id: I96929a31ab8f644f83db74ce12b201bd0852c782
Bill Yi [Thu, 7 Jun 2018 00:30:01 +0000 (17:30 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
a1be4c0829 -s ours
Change-Id: I70453eadb2cf9f4f4130fb68d5ce6f03cc018c3a
Nathan Harold [Tue, 5 Jun 2018 21:02:35 +0000 (14:02 -0700)]
[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
Evan Rosky [Thu, 7 Jun 2018 00:24:22 +0000 (17:24 -0700)]
Request Focus in fingerprint rename dialog
am:
7a1d52eb06
Change-Id: I5add9d81a0e6814e5664fc25a3309acda29361b5