Commit Graph

16618 Commits

Author SHA1 Message Date
Amin Shaikh
ad47cd05c7 Merge "Fix write wifi config to nfc." into oc-dev
am: 6889ac21ab

Change-Id: I2e019122d85b00f700f64cb18c0a6d3f35709ac0
2017-03-31 00:03:48 +00:00
TreeHugger Robot
6889ac21ab Merge "Fix write wifi config to nfc." into oc-dev 2017-03-30 23:59:34 +00:00
Wei Huang
d4cfac304a Fix mvno match data is incorrect for APNs
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.

[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.

Bug: 34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
2017-03-30 15:54:14 -07:00
Amit Mahajan
82d5f1b85f Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de am: 33e9e31a3d am: 9df297d566
am: 7e09d39dd9

Change-Id: I2125086775f801ec35c49d8e49e1cf87a11bb5a1
2017-03-30 22:12:41 +00:00
Amit Mahajan
7e09d39dd9 Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de am: 33e9e31a3d
am: 9df297d566

Change-Id: I152d6451b5da34880b476e15fe7d6ce95a3fe0b4
2017-03-30 22:10:42 +00:00
Amit Mahajan
9df297d566 Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de
am: 33e9e31a3d

Change-Id: I5cae77d8f81a07ad6e10901a2f4b51ae700c6189
2017-03-30 22:08:12 +00:00
Amit Mahajan
33e9e31a3d Merge "Fix mvno match data is incorrect for APNs"
am: a604afe5de

Change-Id: Id63da4e2b0c9ce5b2dfca567663fe8b736126bca
2017-03-30 22:05:41 +00:00
Amit Mahajan
a604afe5de Merge "Fix mvno match data is incorrect for APNs" 2017-03-30 21:59:35 +00:00
Amin Shaikh
f6c62a2e66 Fix write wifi config to nfc.
aog/340881 converts the NFC token hex string to lowercase instead of
uppercase. This change updates Settings to encode the password as a
lowercase hex string.

Bug: 35725168
Test: m RunSettingsRoboTests and manually testing writing GIN-2G to nfc
Change-Id: I85e991c4b8a3d7634dea7f945a23a2ef3d3fe448
2017-03-30 14:44:42 -07:00
Daniel Nishi
45c42b2c70 Lower case the first letter of storage type.
In the app details, the first letter of the storage type was
capitalized, causing an odd string of "X used in Internal storage."

Change-Id: Ibcac54259403f6d0f39df8fa2d3af10304a46057
Merged-In: I2b4f23ea1799dc1730fdab596e4a87a0cb673c68
Fixes: 36001265
Test: Settings robotest
2017-03-30 13:31:57 -07:00
Stephen Chen
db45e51514 Merge "Add link speed to Wifi details page." into oc-dev am: 0df5281fe6
am: 659c66a3ca

Change-Id: I89b6bdfabf841f8027ae5c6870ec9ec40b8388bc
2017-03-30 18:25:32 +00:00
Stephen Chen
659c66a3ca Merge "Add link speed to Wifi details page." into oc-dev
am: 0df5281fe6

Change-Id: Ibcd26de73f4b859661ad976066cc7dc40ed45b97
2017-03-30 18:23:46 +00:00
Stephen Chen
e280e2df66 Merge "Do not show progress bar when disabling wifi." into oc-dev am: 555d12b427
am: 69bc8c5632

Change-Id: I1922192819c9e1e0db12507c4580833529d6286b
2017-03-30 18:20:50 +00:00
TreeHugger Robot
0df5281fe6 Merge "Add link speed to Wifi details page." into oc-dev 2017-03-30 18:19:45 +00:00
Matthew Fritze
7d48ae808a Search Icon persists through screen rotation
Change-Id: If88d345f4ce61f6aec1599d0db85cbfa3b8e91c3
Fixes: 36457675
Test: make RunSettingsRoboTests
2017-03-30 18:18:17 +00:00
Stephen Chen
69bc8c5632 Merge "Do not show progress bar when disabling wifi." into oc-dev
am: 555d12b427

Change-Id: I3f35dda59aaec348998dc86c2f7b7874917c6719
2017-03-30 18:15:04 +00:00
TreeHugger Robot
555d12b427 Merge "Do not show progress bar when disabling wifi." into oc-dev 2017-03-30 18:08:46 +00:00
Robin Lee
1be80d2287 Merge "VPN: uncheck lockdown if always-on is off" into oc-dev am: 73455096d7
am: a0e34f020a

Change-Id: Ic95e31908525fb12c83e010352260d42cc2738b0
2017-03-30 18:06:45 +00:00
Robin Lee
a0e34f020a Merge "VPN: uncheck lockdown if always-on is off" into oc-dev
am: 73455096d7

Change-Id: Idb17fffd05797c2c54bd823f2bcd6743b2d640fc
2017-03-30 18:03:56 +00:00
TreeHugger Robot
73455096d7 Merge "VPN: uncheck lockdown if always-on is off" into oc-dev 2017-03-30 17:57:16 +00:00
Matthew Fritze
6f2ca7a510 Merge "Reserve full indexing for SearchFragment" into oc-dev am: 1261a679bf
am: 64142d2f7a

Change-Id: Ice26ec2570c0aede992078dab213d7f1576a87c3
2017-03-30 16:58:10 +00:00
Matthew Fritze
64142d2f7a Merge "Reserve full indexing for SearchFragment" into oc-dev
am: 1261a679bf

Change-Id: Ia08fd77a634efd19a13982f1c4f89501e6a24c4f
2017-03-30 16:51:04 +00:00
TreeHugger Robot
1261a679bf Merge "Reserve full indexing for SearchFragment" into oc-dev 2017-03-30 16:48:53 +00:00
Robin Lee
b8b310df17 VPN: uncheck lockdown if always-on is off
Change-Id: I00933e0c8567997d800f9f31f78c7b19922a52b8
Fix: 36713605
Test: make RunSettingsRoboTests -j30
2017-03-30 16:01:02 +00:00
tiansiming
8453fb3065 RejectedExecutionException in DataUsageLIst
RejectedPolicy throw Exception which will interrupt users

Bug: https://code.google.com/p/android/issues/detail?id=237575
Test: open as many online apps as possible and then open the DataUsageList
Change-Id: I2dabc6ee53cd0f27f59098328fe2a16172f71d0b
2017-03-30 23:22:02 +08:00
Bartosz Fabianowski
b836da263d Device management info: Refer to current user, not primary user
The device management info page should show information about the
current user's policies, not the primary user's.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I5d8afa7fae1c0f3a4da78b085365882827e6721b
2017-03-30 16:18:44 +02:00
Wei Huang
ec5109ab6d Fix mvno match data is incorrect for APNs
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.

[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.

Bug: 34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
2017-03-30 22:48:17 +09:00
Bartosz Fabianowski
578b02f33c Keep EnterprisePrivacySettingsActivity always enabled
The existing code checks during Settings startup whether the device is
managed. If it is not, EnterprisePrivacySettingsActivity is disabled.
If the device then becomes managed, Settings will not notice until
the next restart, causing any attempt to launch this Activity via an
Intent to crash.

This CL changes things so that the Activity is always enabled but
simply does nothing when launched on a non-managed device.

Bug: 34122104
Test: Integration test coming in a separate CL
Change-Id: I0a1dfcb41b405d981309696d97678df6787b4f72
(cherry picked from commit 92d25fb5f3)
2017-03-30 08:28:02 +00:00
Lei Yu
716101dfca Merge "Hide Wifi and Systemui in settings main page" into oc-dev
am: ae179f182f

Change-Id: Ib5df3df7e9c86a23149496cf4672ac696ff8eb74
2017-03-30 01:18:15 +00:00
Lei Yu
743cd6f142 Merge "Add summary for categories in battery advanced page" into oc-dev
am: b2e213d551

Change-Id: Iebc74d977b081d45bd8b9220b941c62851e2acaa
2017-03-30 01:18:01 +00:00
TreeHugger Robot
1c087983d8 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev 2017-03-30 01:17:24 +00:00
Lei Yu
ae179f182f Merge "Hide Wifi and Systemui in settings main page" into oc-dev 2017-03-30 01:14:36 +00:00
Lei Yu
b2e213d551 Merge "Add summary for categories in battery advanced page" into oc-dev 2017-03-30 01:14:25 +00:00
TreeHugger Robot
a61da379cd Merge "Adds the lightning badge for Instant Apps" 2017-03-30 00:06:36 +00:00
Matthew Fritze
8a42b074a7 Reserve full indexing for SearchFragment
Full Index should only be accessible from Search Fragment,
and when only full index should declare a locale to be
indexed.

Test: make RunSettingsRoboTests
Fixes: 36656637
Change-Id: Ie673067118ac6b184570e116ea24a169be027053
2017-03-29 23:55:48 +00:00
Stephen Chen
f5d1327e2a Do not show progress bar when disabling wifi.
Bug: 34286786
Test: make, test on device.
Change-Id: I109ac05ce3565abc3d80ecec2879c2f7c8bc1724
2017-03-29 16:54:22 -07:00
Stephen Chen
c6453a5bca Add link speed to Wifi details page.
Also make detail items unselectable.

Bug: 36444504
Test: make RunSettingsRoboTests
Change-Id: I393a3a25c8c036da1df1dc2788accfecb3563e14
2017-03-29 16:28:08 -07:00
Lei Yu
311593a89b Merge "Create Controller for app buttons" into oc-dev
am: 88b57826f5

Change-Id: I62b837278d68fafe5bbe7faaa968fda18a5c9453
2017-03-29 23:18:45 +00:00
Lei Yu
88b57826f5 Merge "Create Controller for app buttons" into oc-dev 2017-03-29 23:16:29 +00:00
Pavlin Radoslavov
f8dbff926c Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: eeabd6b463 am: bc9c1d0eb8 am: 30547ce3e8
am: d246b714d0

Change-Id: Iaf1923ee54e67530bc8159fab9c05605401aac05
2017-03-29 23:04:12 +00:00
Pavlin Radoslavov
5b1e4a2705 Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).

Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug: 35873828
Change-Id: I6e3144ff93bfc289fb25f4961fc00f39e8222290
(cherry picked from commit b0d8cdf8f8)
2017-03-29 16:01:00 -07:00
Pavlin Radoslavov
d246b714d0 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: eeabd6b463 am: bc9c1d0eb8
am: 30547ce3e8

Change-Id: I94706c37d395011fdc7c7d25d4a8426dc7af6d8f
2017-03-29 22:57:39 +00:00
Maurice Lam
2aa5a7d3d3 Merge "Allow remote views to be used in Tiles" 2017-03-29 22:56:53 +00:00
Pavlin Radoslavov
30547ce3e8 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: eeabd6b463
am: bc9c1d0eb8

Change-Id: I3b89011d02f159d951b39ddc8d43cb17fbd00432
2017-03-29 22:51:53 +00:00
Pavlin Radoslavov
bc9c1d0eb8 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am: eeabd6b463

Change-Id: I1ead14c5b587c9934fcd1fff450221cf83c16a3d
2017-03-29 22:47:40 +00:00
Christine Franks
424476aeda Merge "Disable default indicator for night display" into oc-dev am: 231ed14e46
am: 58cbd30873

Change-Id: Ib6aaaad468213b1226c91f8212b7a206de1964fe
2017-03-29 22:47:13 +00:00
Christine Franks
58cbd30873 Merge "Disable default indicator for night display" into oc-dev
am: 231ed14e46

Change-Id: Ibf1034bf8edff6ad54a10c4d46b8740bbe685dea
2017-03-29 22:45:13 +00:00
Christine Franks
231ed14e46 Merge "Disable default indicator for night display" into oc-dev 2017-03-29 22:41:41 +00:00
TreeHugger Robot
6b16ba60f1 Merge "Removes summary text from Instant Apps details" 2017-03-29 22:36:57 +00:00
Daniel Nishi
70085ec0ae Merge "Lower case the first letter of storage type." 2017-03-29 21:13:19 +00:00