Commit Graph

46062 Commits

Author SHA1 Message Date
Sumit Deshmukh
b4bbe9488a Settings: [BT] Wrong Pairing Popup is shown on new pairing request.
Usecase:
1. Start advertising from DUT (using BLE Smartertooth app).
2. Scan and connect from central device.
3. Now initiate bond from central and accept pairing request.
   (Consent Pairing Dialog will be shown on DUT)
4. Notification will be received for PASSKEY CONFIRMATION Dialog.
   Do not open notification and let it timeout.
5. Repeat steps 2 and 3. At step 3, Passkey Confirmation pairing
   dialog is show instead of Consent pairing dialog.

Issue:
Wrong Pairing Popup is shown. Passkey Confirmation pairing
dialog is show instead of Consent pairing dialog.

Reproducible Rate: 100%

Root Cause:
PendingIntent created for showing pairing notification are getting
reused as only FLAG_ONE_SHOT is used. This flag is not updating new
extra's in the pending intent.

Fix:
Use flag FLAG_UPDATE_CURRENT in pending Intent.

Test: Tested above mentioned testcase and pairing scenarios.

Bug: 129456113

Change-Id: I46813f355cd796cee1b472774b494c8580b39784
2019-03-28 11:11:38 +00:00
Treehugger Robot
bdef91f964 Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset" 2019-03-28 00:27:30 +00:00
Qingxi Li
6f096fd706 [DO NOT MERGE] Fix the typo of the error message of eSIM reset
Bug: 129085179
Test: N/A
Change-Id: Iad8fdc7368a4d91aff9eb3035bfe91592d6bce1b
2019-03-27 23:32:28 +00:00
Lucas Lin
f467ee4a28 Merge "Modify dialog message for partial connectivity" 2019-03-22 01:16:42 +00:00
lucaslin
411435b669 Modify dialog message for partial connectivity
In some networks, network validation may only get success
result for http probe but fail result for https probe.
For this kind of network, it may still work at some websites
or apps, but user didn't know about that. In order to fix this
issue, we will check if network has partial connectivity and
notify user to make a choice if they want to use this partial
connectivity or not.

Bug: 113450764
Bug: 128489091
Test: 1. Build pass.
      2. make -j44 RunSettingsRoboTests
      ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
      3. Change captive_portal_https_url to https://invalid.com
      to simulate partial connectivity.

Change-Id: I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1
Merged-In: I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1
2019-03-21 12:10:02 +08:00
Brad Ebinger
be10b45fe6 Merge "Do not show Provisioning items for IMS if it is not enabled." 2019-03-18 17:35:27 +00:00
Hall Liu
7e2c23aa0d Merge "Base implementation of WFC disclaimer UI" 2019-03-16 00:23:23 +00:00
manabu, shimoda
8498436a96 Base implementation of WFC disclaimer UI
Test: manual - Check that no error occurred when changing the wifi
calling settings to turn on.
Test: auto - Passed WifiCallingSettingsForSubTest,
WifiCallingDisclaimerFragmentTest and DisclaimerItemListAdapterTest.
Bug: 67872298

Change-Id: I789f530d3e16baa6e56feaa4269f6696976f747e
Merged-In: I789f530d3e16baa6e56feaa4269f6696976f747e
2019-03-15 22:57:36 +00:00
Treehugger Robot
479ec92c27 Merge "Move SMS raw db deletion to phone process." 2019-03-15 01:25:28 +00:00
Brad Ebinger
8bff9c3501 Do not show Provisioning items for IMS if it is not enabled.
Do not show IMS related items if FEATURE_TELEPHONY_IMS
is not defined for this device.

Bug: 118823723
Test: manual
Merged-In: I9624535fe766cd79eadb30502c1a0574650a02ef
Change-Id: I9624535fe766cd79eadb30502c1a0574650a02ef
2019-03-14 15:00:42 -07:00
Amit Mahajan
d0ff80dc79 Move SMS raw db deletion to phone process.
Test: manual
Bug: 127929687
Change-Id: Ib23efc647fbd4b3007197932b9493393dc5b4d5b
2019-03-13 17:36:16 -07:00
Treehugger Robot
6c38df5eff Merge "Schematize Crypto state system property" 2019-03-13 01:30:58 +00:00
Hall Liu
13e02af2ad Merge "Add description for Wi-Fi calling mode" 2019-03-12 20:49:21 +00:00
Kazuya Ohshiro
eb57875f64 Add description for Wi-Fi calling mode
Replace the view of dialog with custom view that adds description
as summary.

Test: manual
Bug: 34793636
Change-Id: If9792b0a35c59c1260176b4b2c62107861de73b5
Merged-In: If9792b0a35c59c1260176b4b2c62107861de73b5
2019-03-12 01:42:09 +00:00
Chalard Jean
2a695c4b7b Merge "Support VPN Proxy(2/2)" 2019-03-08 00:34:25 +00:00
Brad Ebinger
7296b6cb1c Merge "WFC roaming mode setting can not be used with a fixed value" 2019-03-07 21:11:51 +00:00
Kitta Koutarou
478e1232a0 WFC roaming mode setting can not be used with a fixed value
WFC roaming mode setting can not be used with a fixed value because it
is changed as WFC home mode changes if
KEY_EDITABLE_WFC_ROAMING_MODE_BOOL is false.

To solve this issue, separate the WFC mode setting of home and roaming.
These can switch behavior by new carrier config
KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL.

Test: manual - Checked that WFC roaming mode is hidden if new config is
true.
Test: manual - Checked that WFC roaming mode is also changed when
change the WFC home mode if new config is true.
Test: auto - Passed WifiCallingSettingsForSubTest.
Bug: 79666081

Merged-In: Ib2363c5d50f5231cc89f287d760ca8728b02b249
Change-Id: Ib2363c5d50f5231cc89f287d760ca8728b02b249
2019-03-06 23:38:11 +00:00
Ryusuke Sawa
9f7875d547 Support VPN Proxy(2/2)
Adding VPN Proxy settings in advanced option.
 - Proxy host name
 - Proxy port

Bug: 118793208
Test: runtest

Change-Id: I40f3cf049f5822eefc3f9e6ba5dd0bb80c9b3945
2019-03-06 10:38:48 +09:00
Andrii Kulian
50a39ba9a9 Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""" 2019-03-02 01:52:04 +00:00
Andrii Kulian
c70f3ebc29 Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
This reverts commit e7fe45f4ca.

Reason for revert: broke git_pi-dev-plus-aosp build

Change-Id: I390b0006bb780ce81520ea851f474e0188f0495e
2019-03-02 01:44:55 +00:00
Treehugger Robot
b67697cf38 Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" 2019-03-01 21:48:55 +00:00
Takamasa Kuramitsu
e7fe45f4ca Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
This reverts commit 1ea003e834.
Fixes: 116821732

Reason for revert: blocking issue in b/124370422 is resolved

Change-Id: Ie3d5489e5addf12ed7feeada0ceac196eb272f6b
2019-03-01 00:22:38 +00:00
Treehugger Robot
51376aefc1 Merge "Update the timestamp used for time zone filtering" 2019-02-27 18:45:08 +00:00
Neil Fuller
d0e076192e Update the timestamp used for time zone filtering
Update the timestamp used for time zone filtering and improve the
comment explaining what it is for.

Bug: 124756276
Test: build only
Change-Id: I2e53b1f3bd36602f8d08967e1335066d93ae05ea
2019-02-27 15:02:03 +00:00
Kiyoung Kim
7491e86e2b Schematize Crypto state system property
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: I5df6145a436c38dd9fed4325b02ac37a801c2f5e
Merged-In: I957a8e37a88f7bb6d5007a36c02952d3539580fe
2019-02-26 14:28:34 +09:00
Treehugger Robot
64bf0a791e Merge "Add additional anomaly types." 2019-02-25 19:53:26 +00:00
Joe Onorato
f51826853b Add additional anomaly types.
Test: Treehugger
Bug: 115540658
Change-Id: I369f5bfadfe10810aa33d4127fb9ce69c9c57e7e
2019-02-25 14:51:10 +00:00
Youming Ye
5b3ee7afaa Merge "Fix issue that the wifi calling text cannot be customized based on sim" 2019-02-22 21:53:12 +00:00
Wenting Xiong
82aa55bcda Fix issue that the wifi calling text cannot be customized based on sim
Some carriers have requirements that the wifi calling text should be
customizable. However, the resources for the wifi calling text are
not obtained based on sim. So it cannot be customized per sim for multi
sim device. To solve this issue, obtain the resources with specified
sim.

Test: manual - Checked that the wifi calling text could be customized
based on sim.
Bug: 117257109

Change-Id: I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2
Merged-In: I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2
2019-02-22 01:57:44 +00:00
Kiyoung Kim
b837a44716 Merge "Schematize Crypto system properties" 2019-02-21 00:16:45 +00:00
Xin Li
d4716c1a62 Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" 2019-02-20 16:25:59 +00:00
Xin Li
9d8c2cc2c6 DO NOT MERGE - Merge PPRL.190205.001 into master
Bug: 124234733
Change-Id: I3db6a7deadc7a88e071105be9ddb911da7e9bacd
2019-02-18 15:58:44 -08:00
Kiyoung Kim
9c9b9394de Schematize Crypto system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: I65a6ce1a682687702f4c8b5c2e054eaaf91c389b
Merged-In: I65a6ce1a682687702f4c8b5c2e054eaaf91c389b
2019-02-15 02:30:30 +00:00
Xin Li
f6aad2aee8 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master 2019-02-14 22:11:39 +00:00
Brad Ebinger
ee4a5291a1 Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
am: db7da4cba8

Change-Id: I0e3a787020b6631e25496d5c75b39cbda27f9b92
2019-02-14 13:15:44 -08:00
Brad Ebinger
db7da4cba8 Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" 2019-02-14 21:01:05 +00:00
Xin Li
d61c2adf09 DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug: 124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd
2019-02-14 00:03:58 -08:00
markchien
2ee5beaa32 Merge "Fix wrong TetherProvisioningActivity definition"
am: f1e3e9d627

Change-Id: I3cc8c13e2a7ee50be4e3d1080232156ce6f30984
2019-02-13 22:34:49 -08:00
Treehugger Robot
f1e3e9d627 Merge "Fix wrong TetherProvisioningActivity definition" 2019-02-14 06:19:30 +00:00
markchien
8c713fc756 Fix wrong TetherProvisioningActivity definition
Bug: 122108346
Bug: 120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645
2019-02-14 03:24:52 +00:00
Hall Liu
5232a30b03 Merge "Add ACCESS_FINE_LOCATION to permissions"
am: a23ceba5c3

Change-Id: I873ee7b2898ab52b1a2a80d7da852d662bf10e6b
2019-02-13 16:14:10 -08:00
Hall Liu
a23ceba5c3 Merge "Add ACCESS_FINE_LOCATION to permissions" 2019-02-13 23:21:43 +00:00
Fan Zhang
32fbf4740d Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
am: dabfd96c82

Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9
2019-02-13 10:16:15 -08:00
Fan Zhang
dabfd96c82 Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" 2019-02-13 18:04:09 +00:00
Fan Zhang
1ea003e834 Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"
This reverts commit 910457e37a.
Fixes: 124370422


Reason for revert: b/124370422


Error: 

The following topic from AOSP:

https://android-review.googlesource.com/q/topic:%22116821732%22+(status:open%20OR%20status:merged)

Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:

FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2

Change-Id: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
2019-02-13 17:59:40 +00:00
Mark Chien
0ac1c323b2 Merge "Support entitlement check in DSDS"
am: e3b4e0262c

Change-Id: I6adb628af2a084f784fabe66ea2ba896fabc80b8
2019-02-12 19:25:31 -08:00
Fan Zhang
dd3e2c4f27 Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
am: 3905ad125d

Change-Id: I04b1f12f0319c71b8bcf8703e6804c779a118782
2019-02-12 18:41:40 -08:00
Mark Chien
e3b4e0262c Merge "Support entitlement check in DSDS" 2019-02-13 02:29:01 +00:00
Kiyoung Kim
974ace22f9 Merge "Schematize ADB system properties"
am: 750b90a22b

Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576
2019-02-12 18:06:33 -08:00
Fan Zhang
3905ad125d Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" 2019-02-13 00:12:08 +00:00