OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoMerge "WifiCallingSettingsForSubTest: Solve casting problem in setup"
Fan Zhang [Mon, 1 Apr 2019 21:45:32 +0000 (14:45 -0700)]
Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup"
am: 8877dc8fd0

Change-Id: I34fd41dfc4e12c069f78cb017f8f754a43689b74

5 years agoMerge "WifiCallingSettingsForSubTest: Solve casting problem in setup"
Fan Zhang [Mon, 1 Apr 2019 21:11:38 +0000 (21:11 +0000)]
Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup"

5 years agoMerge "Move SIM select logic from SimSelectNotification to Telephony."
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 21:06:49 +0000 (14:06 -0700)]
Merge "Move SIM select logic from SimSelectNotification to Telephony."
am: 6fca0c9495

Change-Id: I85ec9746b8df4a5eb53d6e0fe7e29434f12ec812

5 years agoMerge "Move SIM select logic from SimSelectNotification to Telephony."
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 20:51:54 +0000 (20:51 +0000)]
Merge "Move SIM select logic from SimSelectNotification to Telephony."

5 years agoWifiCallingSettingsForSubTest: Solve casting problem in setup
Torbjorn Eklund [Thu, 28 Mar 2019 12:18:47 +0000 (13:18 +0100)]
WifiCallingSettingsForSubTest: Solve casting problem in setup

Solves casting problem in WifiCallingSettingsForSubTest that causes all
tests in this file to fail in the setup-function.

The wfc mode buttons has changed from being a ListPreference to be a
ListWithEntrySummaryPreference. The test cases have now been updated
accordingly.

Problem was introduced by the following two patches that conflict with
each other. The test cases in WifiCallingSettingsForSubTest works
correctly when each patch is tested in isolation, but failed when they
were both merged:
73ffcf49990ab3134b139607c0225f6ae1646c18
8498436a9613c806d4e1085074aea22f1a78675a

Bug: 129545431
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Change-Id: Ib6988e514bbad2023ba6cfc2e1d8734b68cabc31

5 years agoMove SIM select logic from SimSelectNotification to Telephony.
Malcolm Chen [Fri, 15 Mar 2019 03:34:50 +0000 (20:34 -0700)]
Move SIM select logic from SimSelectNotification to Telephony.

SimSelectNotification used to listen to SIM_STATE_CHANGED from Telephony
and do checkings to decide whether to pop up notification and
SimDialogActivity. The logic needs updated and only Telephony knows it
well. So this change moves the logic into Telephony. SimSelectNotification
only listens to Telephony's decision, brings up notification and trigger
SimDialogActivity.

Bug: 128645056
Test: sanity and manual
Change-Id: I6153e27dd00dd9cdf8682f135eb39f8af3a75608
Merged-In: I6153e27dd00dd9cdf8682f135eb39f8af3a75608

5 years ago[automerger skipped] Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM...
Qingxi Li [Thu, 28 Mar 2019 00:46:52 +0000 (17:46 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset"
am: bdef91f964 -s ours
am skip reason: subject contains skip directive

Change-Id: I362517c36ff77b36336fcc52a684dd29b50bab94

5 years agoMerge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset"
Treehugger Robot [Thu, 28 Mar 2019 00:27:30 +0000 (00:27 +0000)]
Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset"

5 years ago[DO NOT MERGE] Fix the typo of the error message of eSIM reset
Qingxi Li [Wed, 27 Mar 2019 21:40:30 +0000 (14:40 -0700)]
[DO NOT MERGE] Fix the typo of the error message of eSIM reset

Bug: 129085179
Test: N/A
Change-Id: Iad8fdc7368a4d91aff9eb3035bfe91592d6bce1b

5 years agoMerge "Modify dialog message for partial connectivity"
Lucas Lin [Fri, 22 Mar 2019 01:31:47 +0000 (18:31 -0700)]
Merge "Modify dialog message for partial connectivity"
am: f467ee4a28

Change-Id: I9a022578e14327bfe98a3efa74a99d9f623a031e

5 years agoMerge "Modify dialog message for partial connectivity"
Lucas Lin [Fri, 22 Mar 2019 01:16:42 +0000 (01:16 +0000)]
Merge "Modify dialog message for partial connectivity"

5 years agoModify dialog message for partial connectivity
lucaslin [Wed, 20 Mar 2019 03:41:21 +0000 (11:41 +0800)]
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

5 years agoMerge "Do not show Provisioning items for IMS if it is not enabled."
Brad Ebinger [Mon, 18 Mar 2019 20:29:25 +0000 (13:29 -0700)]
Merge "Do not show Provisioning items for IMS if it is not enabled."
am: be10b45fe6

Change-Id: Ie8c404d980d7437550019fccdcac0868fa5d845d

5 years agoMerge "Do not show Provisioning items for IMS if it is not enabled."
Brad Ebinger [Mon, 18 Mar 2019 17:35:27 +0000 (17:35 +0000)]
Merge "Do not show Provisioning items for IMS if it is not enabled."

5 years agoMerge "Base implementation of WFC disclaimer UI"
Hall Liu [Sat, 16 Mar 2019 00:33:26 +0000 (17:33 -0700)]
Merge "Base implementation of WFC disclaimer UI"
am: 7e2c23aa0d

Change-Id: Ib89de5bf801b6669795e7c49010136a0e966324a

5 years agoMerge "Base implementation of WFC disclaimer UI"
Hall Liu [Sat, 16 Mar 2019 00:23:23 +0000 (00:23 +0000)]
Merge "Base implementation of WFC disclaimer UI"

5 years agoBase implementation of WFC disclaimer UI
manabu, shimoda [Wed, 8 Nov 2017 02:32:31 +0000 (11:32 +0900)]
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

5 years agoMerge "Move SMS raw db deletion to phone process."
Amit Mahajan [Fri, 15 Mar 2019 01:45:50 +0000 (18:45 -0700)]
Merge "Move SMS raw db deletion to phone process."
am: 479ec92c27

Change-Id: I38689f5f833825eae230706b536c4ad1ded847bd

5 years agoMerge "Move SMS raw db deletion to phone process."
Treehugger Robot [Fri, 15 Mar 2019 01:25:28 +0000 (01:25 +0000)]
Merge "Move SMS raw db deletion to phone process."

5 years agoDo not show Provisioning items for IMS if it is not enabled.
Brad Ebinger [Tue, 12 Mar 2019 00:33:53 +0000 (17:33 -0700)]
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

5 years agoMove SMS raw db deletion to phone process.
Amit Mahajan [Thu, 14 Mar 2019 00:32:39 +0000 (17:32 -0700)]
Move SMS raw db deletion to phone process.

Test: manual
Bug: 127929687
Change-Id: Ib23efc647fbd4b3007197932b9493393dc5b4d5b

5 years agoMerge "Schematize Crypto state system property"
Kiyoung Kim [Wed, 13 Mar 2019 04:34:09 +0000 (21:34 -0700)]
Merge "Schematize Crypto state system property"
am: 6c38df5eff

Change-Id: I3ef29bc153839fd18b1144c8128ddf4dbc1e4f60

5 years agoMerge "Schematize Crypto state system property"
Treehugger Robot [Wed, 13 Mar 2019 01:30:58 +0000 (01:30 +0000)]
Merge "Schematize Crypto state system property"

5 years agoMerge "Add description for Wi-Fi calling mode"
Hall Liu [Tue, 12 Mar 2019 21:06:12 +0000 (14:06 -0700)]
Merge "Add description for Wi-Fi calling mode"
am: 13e02af2ad

Change-Id: Iff0a3e6f814a8fbd7b3910589c5e712cd9dc9b26

5 years agoMerge "Add description for Wi-Fi calling mode"
Hall Liu [Tue, 12 Mar 2019 20:49:21 +0000 (20:49 +0000)]
Merge "Add description for Wi-Fi calling mode"

5 years agoAdd description for Wi-Fi calling mode
Kazuya Ohshiro [Mon, 29 Aug 2016 09:29:35 +0000 (18:29 +0900)]
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

5 years agoMerge "Support VPN Proxy(2/2)"
Chalard Jean [Fri, 8 Mar 2019 14:42:57 +0000 (06:42 -0800)]
Merge "Support VPN Proxy(2/2)"
am: 2a695c4b7b

Change-Id: I58553c28c8f4e87a52169f925da70c2edb89ca71

5 years agoMerge "WFC roaming mode setting can not be used with a fixed value"
Brad Ebinger [Fri, 8 Mar 2019 14:08:40 +0000 (06:08 -0800)]
Merge "WFC roaming mode setting can not be used with a fixed value"
am: 7296b6cb1c

Change-Id: I0b4bd383fe9ac1e057e652664fc3fb0a250f1eeb

5 years agoMerge "Support VPN Proxy(2/2)"
Chalard Jean [Fri, 8 Mar 2019 00:34:25 +0000 (00:34 +0000)]
Merge "Support VPN Proxy(2/2)"

5 years agoMerge "WFC roaming mode setting can not be used with a fixed value"
Brad Ebinger [Thu, 7 Mar 2019 21:11:51 +0000 (21:11 +0000)]
Merge "WFC roaming mode setting can not be used with a fixed value"

5 years agoWFC roaming mode setting can not be used with a fixed value
Kitta Koutarou [Thu, 14 Feb 2019 10:16:40 +0000 (19:16 +0900)]
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

5 years agoSupport VPN Proxy(2/2)
Ryusuke Sawa [Thu, 27 Sep 2018 05:06:28 +0000 (14:06 +0900)]
Support VPN Proxy(2/2)

Adding VPN Proxy settings in advanced option.
 - Proxy host name
 - Proxy port

Bug: 118793208
Test: runtest

Change-Id: I40f3cf049f5822eefc3f9e6ba5dd0bb80c9b3945

5 years agoMerge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""
Andrii Kulian [Sat, 2 Mar 2019 02:03:12 +0000 (18:03 -0800)]
Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""
am: 50a39ba9a9

Change-Id: I92454274470675dbe533c0713d44c304f0cfaaf0

5 years agoMerge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""
Andrii Kulian [Sat, 2 Mar 2019 01:52:04 +0000 (01:52 +0000)]
Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""

5 years agoRevert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
Andrii Kulian [Sat, 2 Mar 2019 01:44:55 +0000 (01:44 +0000)]
Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""

This reverts commit e7fe45f4cad79a9f51d3f4b8c1b7917dd485bbf2.

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

Change-Id: I390b0006bb780ce81520ea851f474e0188f0495e

5 years agoMerge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
Takamasa Kuramitsu [Sat, 2 Mar 2019 00:29:52 +0000 (16:29 -0800)]
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
am: b67697cf38

Change-Id: Ic1a3e5d5bd2660b8ed71b0650672321480d60adb

5 years agoMerge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
Treehugger Robot [Fri, 1 Mar 2019 21:48:55 +0000 (21:48 +0000)]
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""

5 years agoRevert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
Takamasa Kuramitsu [Fri, 1 Mar 2019 00:22:38 +0000 (00:22 +0000)]
Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""

This reverts commit 1ea003e8347237e5f6a4a696aa741a32d169e620.
Fixes: 116821732

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

Change-Id: Ie3d5489e5addf12ed7feeada0ceac196eb272f6b

5 years agoMerge "Update the timestamp used for time zone filtering"
Neil Fuller [Wed, 27 Feb 2019 19:01:42 +0000 (11:01 -0800)]
Merge "Update the timestamp used for time zone filtering"
am: 51376aefc1

Change-Id: I73413541d36f6caac85dd18c2f6d63adee67b95e

5 years agoMerge "Update the timestamp used for time zone filtering"
Treehugger Robot [Wed, 27 Feb 2019 18:45:08 +0000 (18:45 +0000)]
Merge "Update the timestamp used for time zone filtering"

5 years agoUpdate the timestamp used for time zone filtering
Neil Fuller [Wed, 27 Feb 2019 14:58:45 +0000 (14:58 +0000)]
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

5 years agoMerge "Add additional anomaly types."
Joe Onorato [Tue, 26 Feb 2019 06:48:39 +0000 (22:48 -0800)]
Merge "Add additional anomaly types."
am: 64bf0a791e

Change-Id: Iebe3695669e87b3109b43becaf869c4b2f9a4b48

5 years agoSchematize Crypto state system property
Kiyoung Kim [Fri, 22 Feb 2019 04:35:46 +0000 (13:35 +0900)]
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

5 years agoMerge "Add additional anomaly types."
Treehugger Robot [Mon, 25 Feb 2019 19:53:26 +0000 (19:53 +0000)]
Merge "Add additional anomaly types."

5 years agoAdd additional anomaly types.
Joe Onorato [Tue, 5 Feb 2019 01:36:23 +0000 (17:36 -0800)]
Add additional anomaly types.

Test: Treehugger
Bug: 115540658
Change-Id: I369f5bfadfe10810aa33d4127fb9ce69c9c57e7e

5 years agoMerge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp...
Xin Li [Sat, 23 Feb 2019 00:39:23 +0000 (00:39 +0000)]
Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master

5 years agoMerge "Fix issue that the wifi calling text cannot be customized based on sim"
Youming Ye [Fri, 22 Feb 2019 22:14:11 +0000 (14:14 -0800)]
Merge "Fix issue that the wifi calling text cannot be customized based on sim"
am: 5b3ee7afaa

Change-Id: Iffac84438bf43372a1ddeb4df1ef9d85c9af2a2d

5 years agoMerge "Fix issue that the wifi calling text cannot be customized based on sim"
Youming Ye [Fri, 22 Feb 2019 21:53:12 +0000 (21:53 +0000)]
Merge "Fix issue that the wifi calling text cannot be customized based on sim"

5 years agoFix issue that the wifi calling text cannot be customized based on sim
Wenting Xiong [Wed, 28 Nov 2018 09:22:21 +0000 (18:22 +0900)]
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

5 years agoDO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Xin Li [Thu, 21 Feb 2019 19:03:43 +0000 (11:03 -0800)]
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I6eeee632ff6ee7f2d7395344a7887c44c7acd440

5 years agoMerge "Schematize Crypto system properties"
Kiyoung Kim [Thu, 21 Feb 2019 00:34:01 +0000 (16:34 -0800)]
Merge "Schematize Crypto system properties"
am: b837a44716

Change-Id: I55c43d3d1273e2c79ab29c60a714a97d2ca0f264

5 years agoMerge "Schematize Crypto system properties"
Kiyoung Kim [Thu, 21 Feb 2019 00:16:45 +0000 (00:16 +0000)]
Merge "Schematize Crypto system properties"

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
Xin Li [Wed, 20 Feb 2019 19:06:41 +0000 (11:06 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
am: d4716c1a62 -s ours
am skip reason: subject contains skip directive

Change-Id: If29e30a1516d869c647bb9634eb8c1d3b4b9b3f9

5 years ago[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
Xin Li [Wed, 20 Feb 2019 16:52:26 +0000 (08:52 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am: 9d8c2cc2c6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic2e84fd1810cf9eb661c2c4b4b32755821cf17e3

5 years agoMerge "DO NOT MERGE - Merge PPRL.190205.001 into master"
Xin Li [Wed, 20 Feb 2019 16:25:59 +0000 (16:25 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"

5 years agoDO NOT MERGE - Merge PPRL.190205.001 into master
Xin Li [Mon, 18 Feb 2019 23:58:44 +0000 (15:58 -0800)]
DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I3db6a7deadc7a88e071105be9ddb911da7e9bacd

5 years agoSchematize Crypto system properties
Kiyoung Kim [Tue, 22 Jan 2019 01:19:29 +0000 (10:19 +0900)]
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

5 years agoMerge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp...
Xin Li [Thu, 14 Feb 2019 22:11:39 +0000 (22:11 +0000)]
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master

5 years agoMerge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
Brad Ebinger [Thu, 14 Feb 2019 21:15:44 +0000 (13:15 -0800)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
am: db7da4cba8

Change-Id: I0e3a787020b6631e25496d5c75b39cbda27f9b92

5 years agoMerge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
Brad Ebinger [Thu, 14 Feb 2019 21:01:05 +0000 (21:01 +0000)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"

5 years agoDO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Xin Li [Tue, 12 Feb 2019 22:54:28 +0000 (14:54 -0800)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master

Bug: 124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd

5 years agoMerge "Fix wrong TetherProvisioningActivity definition"
markchien [Thu, 14 Feb 2019 06:34:49 +0000 (22:34 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition"
am: f1e3e9d627

Change-Id: I3cc8c13e2a7ee50be4e3d1080232156ce6f30984

5 years agoMerge "Fix wrong TetherProvisioningActivity definition"
Treehugger Robot [Thu, 14 Feb 2019 06:19:30 +0000 (06:19 +0000)]
Merge "Fix wrong TetherProvisioningActivity definition"

5 years agoFix wrong TetherProvisioningActivity definition
markchien [Thu, 14 Feb 2019 03:11:31 +0000 (11:11 +0800)]
Fix wrong TetherProvisioningActivity definition

Bug: 122108346
Bug: 120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645

5 years agoMerge "Add ACCESS_FINE_LOCATION to permissions"
Hall Liu [Thu, 14 Feb 2019 00:14:10 +0000 (16:14 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions"
am: a23ceba5c3

Change-Id: I873ee7b2898ab52b1a2a80d7da852d662bf10e6b

5 years agoMerge "Add ACCESS_FINE_LOCATION to permissions"
Hall Liu [Wed, 13 Feb 2019 23:21:43 +0000 (23:21 +0000)]
Merge "Add ACCESS_FINE_LOCATION to permissions"

5 years agoMerge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
Fan Zhang [Wed, 13 Feb 2019 18:16:15 +0000 (10:16 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
am: dabfd96c82

Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9

5 years agoMerge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
Fan Zhang [Wed, 13 Feb 2019 18:04:09 +0000 (18:04 +0000)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""

5 years agoRevert "Add LOCAL_RESOURCE_DIR in Settings makefile"
Fan Zhang [Wed, 13 Feb 2019 17:59:40 +0000 (17:59 +0000)]
Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"

This reverts commit 910457e37a45c4c717466aadfdf9d3fcd62135d4.
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

5 years agoMerge "Support entitlement check in DSDS"
Mark Chien [Wed, 13 Feb 2019 03:25:31 +0000 (19:25 -0800)]
Merge "Support entitlement check in DSDS"
am: e3b4e0262c

Change-Id: I6adb628af2a084f784fabe66ea2ba896fabc80b8

5 years agoMerge "Add LOCAL_RESOURCE_DIR in Settings makefile"
Fan Zhang [Wed, 13 Feb 2019 02:41:40 +0000 (18:41 -0800)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
am: 3905ad125d

Change-Id: I04b1f12f0319c71b8bcf8703e6804c779a118782

5 years agoMerge "Support entitlement check in DSDS"
Mark Chien [Wed, 13 Feb 2019 02:29:01 +0000 (02:29 +0000)]
Merge "Support entitlement check in DSDS"

5 years agoMerge "Schematize ADB system properties"
Kiyoung Kim [Wed, 13 Feb 2019 02:06:33 +0000 (18:06 -0800)]
Merge "Schematize ADB system properties"
am: 750b90a22b

Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576

5 years agoMerge "Add LOCAL_RESOURCE_DIR in Settings makefile"
Fan Zhang [Wed, 13 Feb 2019 00:12:08 +0000 (00:12 +0000)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"

5 years agoClose Wi-Fi Calling screen if provisioning status changes to disallow
Torbjorn Eklund [Wed, 9 Jan 2019 10:09:18 +0000 (11:09 +0100)]
Close Wi-Fi Calling screen if provisioning status changes to disallow

Starts to listen for provisioning changes in Wi-Fi Calling screen and
closes the screen if the Wi-Fi Calling provisioning status changes to
disallow.

This prevents the Wi-Fi Calling screen from being kept open if the Wi-Fi
Calling provisioning status is changed to disallow while the Wi-Fi
Calling screen is open.

Bug: 119389855
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Merged-In: I2af91c3734274f0aea942a8bb894d6f4ce295354
Change-Id: I2af91c3734274f0aea942a8bb894d6f4ce295354

5 years agoMerge "Schematize ADB system properties"
Treehugger Robot [Tue, 12 Feb 2019 18:35:23 +0000 (18:35 +0000)]
Merge "Schematize ADB system properties"

5 years agoSupport entitlement check in DSDS
markchien [Fri, 11 Jan 2019 08:18:20 +0000 (16:18 +0800)]
Support entitlement check in DSDS

Get resource from preferred SIM's subId.

Bug: 122108346
Bug: 120069528
Test: atest TetherServiceTest
Change-Id: Ia4279a418dfa6cd14942b7f4d2a313156066381b
Merged-in: Ia4279a418dfa6cd14942b7f4d2a313156066381b

5 years agoMerge "Schematize Display system properties"
Kiyoung Kim [Tue, 12 Feb 2019 03:13:51 +0000 (19:13 -0800)]
Merge "Schematize Display system properties"
am: b139a4c16b

Change-Id: I82b157865fb288044c251d6d78ca850b22502db0

5 years agoSchematize ADB system properties
Kiyoung Kim [Thu, 27 Dec 2018 05:31:48 +0000 (14:31 +0900)]
Schematize ADB 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: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
Merged-In: Iec37f5f35b1452afdf7b15e9f31c4b4726127065

5 years agoMerge "Schematize Display system properties"
Treehugger Robot [Tue, 12 Feb 2019 02:50:08 +0000 (02:50 +0000)]
Merge "Schematize Display system properties"

5 years agoSnap for 5180536 from c103b546d2e33aacd8187a6bf54b28efa325ffbe to pi-platform-release
android-build-team Robot [Sat, 9 Feb 2019 02:23:26 +0000 (02:23 +0000)]
Snap for 5180536 from c103b546d2e33aacd8187a6bf54b28efa325ffbe to pi-platform-release

Change-Id: Ice12b1967a41a792bb4e1816d0fe07bc61328788

5 years agoAdd ACCESS_FINE_LOCATION to permissions
Hall Liu [Wed, 28 Nov 2018 01:00:50 +0000 (17:00 -0800)]
Add ACCESS_FINE_LOCATION to permissions

Add ACCESS_FINE_LOCATION to permissions in order to satisfy new
restrictions.

Bug: 116258458
Test: manual
Change-Id: Icdc45c3a02cd5bf784d0475243b7d53ba9861777

5 years agoMerge "Update the Hearing Aids Strings"
Stanley Tng [Tue, 5 Feb 2019 21:05:41 +0000 (13:05 -0800)]
Merge "Update the Hearing Aids Strings"
am: 3afa2a7acb

Change-Id: I5310642f04558d961aa82df933791b08d883d92e

5 years agoMerge "Update the Hearing Aids Strings"
Treehugger Robot [Tue, 5 Feb 2019 20:20:51 +0000 (20:20 +0000)]
Merge "Update the Hearing Aids Strings"

5 years agoUpdate the Hearing Aids Strings
Stanley Tng [Sat, 2 Feb 2019 02:16:30 +0000 (18:16 -0800)]
Update the Hearing Aids Strings

Minor update to the Hearing Aids string by making it plural and also
remove a redundant word "currently".

Bug: 121036176
Test: Compile
Change-Id: I829b8028408f5d07d950580bd4d90ca41bd334f3

5 years agoMerge "Update to use new ConnectivityManager API."
Pavel Grafov [Tue, 29 Jan 2019 04:28:09 +0000 (20:28 -0800)]
Merge "Update to use new ConnectivityManager API."
am: 70b1830e7e

Change-Id: Ide228930858fc8eccfac060858b0da86725f229a

5 years agoMerge "Update to use new ConnectivityManager API."
Pavel Grafov [Mon, 28 Jan 2019 20:15:49 +0000 (20:15 +0000)]
Merge "Update to use new ConnectivityManager API."

5 years agoUpdate to use new ConnectivityManager API.
Pavel Grafov [Fri, 25 Jan 2019 18:58:17 +0000 (18:58 +0000)]
Update to use new ConnectivityManager API.

Bug: 77468593
Test: builds
Change-Id: I1fa542e015add2dd8b0e8620f2021c1a5c1c9f1a

5 years agoMerge "Add Enterprise owners for Enterprise settings"
Eran Messeri [Thu, 24 Jan 2019 23:03:28 +0000 (15:03 -0800)]
Merge "Add Enterprise owners for Enterprise settings"
am: 35416e7529

Change-Id: I2823cff17e5b77b3cd449d739c908b0b8c0c9c58

5 years agoMerge "Add Enterprise owners for Enterprise settings"
Treehugger Robot [Thu, 24 Jan 2019 22:56:27 +0000 (22:56 +0000)]
Merge "Add Enterprise owners for Enterprise settings"

5 years agoMerge "Revert "Update to use new ConnectivityManager API.""
Dan Albert [Thu, 24 Jan 2019 21:39:06 +0000 (13:39 -0800)]
Merge "Revert "Update to use new ConnectivityManager API.""
am: 9c7ddce334

Change-Id: Icd2bf95c10716d324b47151fddc34a31f5736355

5 years agoMerge "Revert "Update to use new ConnectivityManager API.""
Dan Albert [Thu, 24 Jan 2019 21:08:46 +0000 (21:08 +0000)]
Merge "Revert "Update to use new ConnectivityManager API.""

5 years agoRevert "Update to use new ConnectivityManager API."
Dan Albert [Thu, 24 Jan 2019 21:06:02 +0000 (21:06 +0000)]
Revert "Update to use new ConnectivityManager API."

This reverts commit 9a9f6f313b1f9bc7a5193eda092ea3ee3ae67667.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Ia0ff7cdf77b4edf3bdf5e4c54376b730df48373e

5 years agoMerge "Update to use new ConnectivityManager API."
Pavel Grafov [Thu, 24 Jan 2019 17:50:37 +0000 (09:50 -0800)]
Merge "Update to use new ConnectivityManager API."
am: 161f5ec3e9

Change-Id: I14a198bf8c95501473ac963ee6e00331e09daa76

5 years agoMerge "Update to use new ConnectivityManager API."
Pavel Grafov [Thu, 24 Jan 2019 17:34:55 +0000 (17:34 +0000)]
Merge "Update to use new ConnectivityManager API."

5 years agoAdd Enterprise owners for Enterprise settings
Eran Messeri [Tue, 22 Jan 2019 18:36:56 +0000 (18:36 +0000)]
Add Enterprise owners for Enterprise settings

Add owners from the Android Enterprise team to source files that are
either owned or are mostly modified by the Android Enterprise team.

Test: gerrit uploader
Bug: 33166666
Change-Id: I8b4ec7c8895b02c45a6a14d52a3742334234904a

5 years agoUpdate to use new ConnectivityManager API.
Pavel Grafov [Wed, 5 Dec 2018 11:25:51 +0000 (11:25 +0000)]
Update to use new ConnectivityManager API.

Bug: 77468593
Test: builds
Change-Id: I614c20b9a1c6748614163766866bb59b15d794f1
Merged-In: I614c20b9a1c6748614163766866bb59b15d794f1

5 years agoSchematize Display system properties
Kiyoung Kim [Thu, 20 Dec 2018 09:36:27 +0000 (18:36 +0900)]
Schematize Display 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: If0b7658e4f04848a6a068c18e93026591b7b5518
Merged-In: I83b40ddfcde32d8d03fae73f5c252013933c466c

5 years agoMerge "Add Dynamic tiles"
Fan Zhang [Fri, 18 Jan 2019 01:08:14 +0000 (17:08 -0800)]
Merge "Add Dynamic tiles"
am: 15bf05f6fd

Change-Id: I0998725bc59e1d4f9b8afff388c2a9a3c680423c

5 years agoMerge "Add Dynamic tiles"
Fan Zhang [Fri, 18 Jan 2019 00:47:52 +0000 (00:47 +0000)]
Merge "Add Dynamic tiles"