Commit Graph

40116 Commits

Author SHA1 Message Date
android-build-team Robot
2b4b97ae21 release-request-0cb00bcd-1971-4ff1-bef2-5d0328e17cb1-for-git_pi-release-4327172 snap-temp-L25600000101152760
Change-Id: Icf1fc350ff3de3cedbed563828769d07f30235f8
2017-09-11 08:05:27 +00:00
Erik Kline
c8e912e5c4 Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev am: 1b62d99433
am: 775807f422

Change-Id: I55fbd611fee9f17215412a76b480cdee96f62b32
2017-09-11 05:04:28 +00:00
Erik Kline
775807f422 Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev
am: 1b62d99433

Change-Id: If15181d557e9abce75111a6e1fff4e12586d7dbc
2017-09-11 05:00:34 +00:00
TreeHugger Robot
1b62d99433 Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev 2017-09-11 04:56:28 +00:00
Erik Kline
9adc588749 Include IPv6 DNS servers in wifi details
Test: as follows
    - built
    - flashed
    - booted
    - export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
          make -j RunSettingsRoboTests
      RunSettingsRoboTests:
      RunSettingsRoboTests: Time: 19.821
      RunSettingsRoboTests:
      RunSettingsRoboTests: OK (37 tests)
      RunSettingsRoboTests:
    - make -j RunSettingsRoboTests
      RunSettingsRoboTests: ...........................
      RunSettingsRoboTests: Time: 424.847
      RunSettingsRoboTests:
      RunSettingsRoboTests: OK (2250 tests)
      RunSettingsRoboTests:

Bug: 65037256
Bug: 65467586

Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
2017-09-11 11:24:45 +09:00
android-build-team Robot
a536feb918 release-request-cacfaf25-4304-4e6b-ab4e-089367c7ed39-for-git_pi-release-4326570 snap-temp-L59400000101056305
Change-Id: Ifac37339de26f970d5519942dc46ded5a507bcda
2017-09-10 08:15:25 +00:00
TreeHugger Robot
14e4964be0 Merge "Add FakeFeatureFactory.setupForTest" 2017-09-08 22:30:05 +00:00
Fan Zhang
1f92faad27 Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev am: 90f9398f4e
am: ed71e21541

Change-Id: Ic2f5d6c35ac8bb7a14d1949be53beb6b6bf4cd16
2017-09-08 22:23:19 +00:00
Daniel Nishi
56e04db460 Merge "Re-add the block of text explaining the feature." into oc-mr1-dev am: 3315f38c3f
am: df0e716b43

Change-Id: Ibe767b5bd21ed75ea188a1a6561aa974edd2b449
2017-09-08 22:22:32 +00:00
Fan Zhang
ed71e21541 Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev
am: 90f9398f4e

Change-Id: Idb6dabf0d06440f3a2aecc2f4488bb98859f2eae
2017-09-08 22:04:52 +00:00
Daniel Nishi
df0e716b43 Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
am: 3315f38c3f

Change-Id: I7f8bfe688afc95a184fc6499b95a3c733cb9c681
2017-09-08 22:04:12 +00:00
TreeHugger Robot
90f9398f4e Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev 2017-09-08 21:42:32 +00:00
Daniel Nishi
3315f38c3f Merge "Re-add the block of text explaining the feature." into oc-mr1-dev 2017-09-08 21:39:16 +00:00
Maurice Lam
563af1cda9 Add FakeFeatureFactory.setupForTest
In AssisGestureSettingsTest, FakeFeatureFactory was used but was
missing a setupForTest call.

Test: cd tests/robotests && \
      ROBOTEST_FILTER=AssistGestureSettingsTest mma

Change-Id: Ie78232d854aee00c7969a3d2dc148354be7de484
2017-09-08 13:08:03 -07:00
Maurice Lam
4dec4a0730 Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev am: 40e284b196
am: f26fe2763a  -s ours

Change-Id: I1ec02f7ae6a26686a173553d72f1b5b3bbc8167a
2017-09-08 20:04:19 +00:00
Maurice Lam
f26fe2763a Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
am: 40e284b196

Change-Id: Ica634ce9776b0b0c30bfb49223a4d1d5fc5398ad
2017-09-08 19:56:09 +00:00
Andrew Scull
67d24dce72 Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev am: 0bac26b6cd
am: e1f4703dbe

Change-Id: I965bfe2e5a3be1c078c4769d2aaaa07fd92d1b1e
2017-09-08 19:51:09 +00:00
Maurice Lam
40e284b196 Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev 2017-09-08 19:50:52 +00:00
Andrew Scull
e1f4703dbe Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev
am: 0bac26b6cd

Change-Id: I30996559ac5166d4ed2cf59688239effe335a305
2017-09-08 19:33:34 +00:00
TreeHugger Robot
0bac26b6cd Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev 2017-09-08 19:08:48 +00:00
Stephen Chen
fbc7a00a5c Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev am: 194638ac78
am: d2f9de37c7

Change-Id: Id8725588b14f6a74efbdb2065864f2fce1561873
2017-09-08 19:04:48 +00:00
Maurice Lam
f2063cff30 Don't default to PIN on non FBE devices. DO NOT MERGE
So that EncryptionInterstitial is shown as part of the flow

Test: cd tests/robotests && mma
Bug: 65192141
Change-Id: I13e8b9059aae39cef2a8509f9f0eee1cd0808220
2017-09-08 18:58:27 +00:00
Stephen Chen
d2f9de37c7 Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev
am: 194638ac78

Change-Id: I6dc3ce13040a0b20b5197c5cfac6bc55b09ab679
2017-09-08 18:55:58 +00:00
TreeHugger Robot
194638ac78 Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev 2017-09-08 18:47:08 +00:00
debesay guadad
2260e8ac26 Merge "Add ims registration status" into oc-mr1-dev-plus-aosp
am: 6f48d5e767  -s ours

Change-Id: I625d9a95d02865a6a97685421a00cee145b99de7
2017-09-08 17:44:36 +00:00
debesay guadad
0a59b9f651 Add ims registration status
am: 5b1651b3bb  -s ours

Change-Id: Ib49e236b3701eea3269565d515bb6c9e9c265e23
2017-09-08 17:24:22 +00:00
TreeHugger Robot
6f48d5e767 Merge "Add ims registration status" into oc-mr1-dev-plus-aosp 2017-09-08 17:14:18 +00:00
Brad Ebinger
8c321bc6da Merge "Add ims registration status" 2017-09-08 17:04:24 +00:00
Daniel Nishi
59c8d77c8c Re-add the block of text explaining the feature.
When the automatic storage manager  is off (or has never been run), we
display a block of text that explains what it does. In order to make
this testable, I've implemented the feature in a PreferenceController
and upgraded the existing AutomaticStorageManagerSettings class to be
closer to the newer Settings IA.

Change-Id: I3f7d20347a6d5a7bae8bffcd2014c3fdcd315b90
Fixes: 63082545
Test: Settings Robotest
2017-09-08 09:58:05 -07:00
Andrew Scull
2ca3017f8e Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.
If an admin has set the DISALLOW_FACTORY_RESET user restriction, OEM
unlock is also restricted. If this is the case, it should be explained
to the user that the admin is preventing the OEM unlock.

DISALLOW_OEM_UNLOCK is deprecated and now managed by OemLockManager.
This restriction is also one set by the carrier, not an admin.

Test: RunSettingsRoboTests
Test: CTS verifier test from the bug
Bug: 65124732
Change-Id: I8bde87a522742a7cbda006eee17c2a19797b1835
(cherry picked from commit 0aa45bed65)
2017-09-08 16:11:36 +00:00
Andrew Scull
f9ab23ef03 Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." 2017-09-08 16:01:41 +00:00
Andrew Scull
0aa45bed65 Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.
If an admin has set the DISALLOW_FACTORY_RESET user restriction, OEM
unlock is also restricted. If this is the case, it should be explained
to the user that the admin is preventing the OEM unlock.

DISALLOW_OEM_UNLOCK is deprecated and now managed by OemLockManager.
This restriction is also one set by the carrier, not an admin.

Test: RunSettingsRoboTests
Test: CTS verifier test from the bug
Bug: 65124732
Change-Id: I8bde87a522742a7cbda006eee17c2a19797b1835
2017-09-08 12:40:25 +01:00
daqi
35cfba1fa0 Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508 am: 93860b298b am: 21e55623f2
am: b4204836cf

Change-Id: I7e9a1cb5c57fb58610cb20ba3d1469b752193e9d
2017-09-08 10:23:05 +00:00
daqi
b4204836cf Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508 am: 93860b298b
am: 21e55623f2

Change-Id: I38f6f53ffd70f8b1ac67ea3695d2b9d5d4b76509
2017-09-08 10:16:34 +00:00
daqi
21e55623f2 Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508
am: 93860b298b

Change-Id: Ic6fd44c164821fc7c5594b1b5082c2ee6e36aa0f
2017-09-08 10:10:16 +00:00
daqi
93860b298b Merge "Fix TrustedCredentialsSettings NPE"
am: c9e532f508

Change-Id: I2ce8ea95abbbd1d522be4897069d4515354d3b14
2017-09-08 10:04:17 +00:00
Treehugger Robot
c9e532f508 Merge "Fix TrustedCredentialsSettings NPE" 2017-09-08 09:56:31 +00:00
Ajay Nadathur
a1c14eaf66 Merge "Set title in remote views if present in bundle" into oc-mr1-dev am: 4ce113d6f8
am: 1fe7838e70

Change-Id: I16c83ce3dbceb5353a197963ea49916515b9819d
2017-09-08 06:59:22 +00:00
Ajay Nadathur
1fe7838e70 Merge "Set title in remote views if present in bundle" into oc-mr1-dev
am: 4ce113d6f8

Change-Id: Iaa650a18bd4efb74e6b903efad0ad1a02865429c
2017-09-08 06:43:46 +00:00
TreeHugger Robot
4ce113d6f8 Merge "Set title in remote views if present in bundle" into oc-mr1-dev 2017-09-08 06:36:46 +00:00
Ajay Nadathur
2e6e4c12a9 Merge "Set title in remote views if present in bundle" 2017-09-08 05:09:21 +00:00
Fan Zhang
1ca6b25321 Don't attempt to tint icon if icon is not available
Change-Id: I0aa2a17d51d966dce182381c7bba8913ad997738
Fixes: 65460834
Test: robotests
2017-09-08 00:10:55 +00:00
Jack He
9a45bab608 Bluetooth: add metrics for pairing with devices without names am: 5b017f7b05
am: d9de1ecc03

Change-Id: I34a61269d955ffd9aa073aa1c514c3f3e148adbc
2017-09-07 23:54:21 +00:00
Jack He
d9de1ecc03 Bluetooth: add metrics for pairing with devices without names
am: 5b017f7b05

Change-Id: If74bd132ee1352888a7f9513444e998537f11145
2017-09-07 23:25:43 +00:00
debesay guadad
5b1651b3bb Add ims registration status
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.

Test: manual Checked "IMS registration state" in Status menu
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 23:24:53 +00:00
TreeHugger Robot
89f57048a0 Merge "Some code cleanup" 2017-09-07 19:55:46 +00:00
Jack He
5b017f7b05 Bluetooth: add metrics for pairing with devices without names
* Also caches context in onClick() method

Bug: 34685932
Test: make, unit test
Change-Id: I99beab2c85b8e48c4bc41f69146759d4b7c62428
2017-09-07 12:09:00 -07:00
Daniel Nishi
44da06703e Merge "Turn in the work profile's badge." into oc-mr1-dev am: 6361c9d851
am: 7ee2b191d6

Change-Id: I9a80b2b7e8d6ab83fef2a1886b65c8ddfb2760be
2017-09-07 17:51:54 +00:00
TreeHugger Robot
6f7f25e3fe Merge "Separate collection of indexable data from indexing" 2017-09-07 17:51:22 +00:00
Fan Zhang
3ed509cb35 Some code cleanup
- Formatting
- Remove unused code

Test: robotests
Change-Id: If259c7c3893df96744f3c0ad62a378ef6ce01de7
2017-09-07 10:48:45 -07:00