OSDN Git Service
Mark Chien [Sat, 20 Apr 2019 02:05:33 +0000 (02:05 +0000)]
Merge "Ignore the outdated entitlement check"
Treehugger Robot [Fri, 19 Apr 2019 00:06:39 +0000 (00:06 +0000)]
Merge changes from topic "GameDriver2"
* changes:
Game Driver: Fix EnableForAllApps switch and test
Game Driver: rename GUP to Game Driver
Game Driver: Add footer to the dashboard
Game Driver: Add SwitchBar to control GUP feature
GUP: Add global switch for all apps
GUP: Fixed some typos and update some values
GUP: Display a list of Apps and dialogs
GUP: Add stub UI
Yiwei Zhang [Fri, 1 Feb 2019 02:25:00 +0000 (18:25 -0800)]
Game Driver: Fix EnableForAllApps switch and test
Bug:
123707483
Bug:
119221883
Test: Build, flash, boot and make RunSettingsRoboTests
Change-Id: Iffbe3355b37763d4fa71b96271c1ba448fb6cdc5
Merged-In: Iffbe3355b37763d4fa71b96271c1ba448fb6cdc5
Yiwei Zhang [Thu, 24 Jan 2019 22:04:58 +0000 (14:04 -0800)]
Game Driver: rename GUP to Game Driver
Bug:
119221883
Test: make RunSettingsRoboTests
Change-Id: Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9
Merged-In: Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9
Yiwei Zhang [Wed, 23 Jan 2019 20:40:42 +0000 (12:40 -0800)]
Game Driver: Add footer to the dashboard
This change adds a footer to the current dashboard to show some
descriptions when the whole module is turned off.
Bug:
119221883
Test: make RunSettingsRoboTests
Change-Id: I9788d4c64b06deb099a43e8db7eecab20a85f494
Merged-In: I9788d4c64b06deb099a43e8db7eecab20a85f494
Yiwei Zhang [Sat, 19 Jan 2019 08:45:20 +0000 (16:45 +0800)]
Game Driver: Add SwitchBar to control GUP feature
Uncheck the global switch will hide the preference controllers and force
all apps to use system graphics driver. This change also add a content
observer to notify all the preference controllers of settings global
changes.
Bug:
119221883
Test: make RunSettingsRoboTests
Change-Id: Ice9ded17c759791a3728c552f79881e2215ac081
Merged-In: Ice9ded17c759791a3728c552f79881e2215ac081
Yiwei Zhang [Fri, 11 Jan 2019 00:50:25 +0000 (08:50 +0800)]
GUP: Add global switch for all apps
Bug:
119221883
Test: make RunSettingsRoboTests
Change-Id: Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493
Merged-In: Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493
Yiwei Zhang [Thu, 10 Jan 2019 20:40:04 +0000 (04:40 +0800)]
GUP: Fixed some typos and update some values
Bug:
119221883
Test: make RunSettingsRoboTests
Change-Id: I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0
Merged-In: I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0
Yiwei Zhang [Sat, 29 Dec 2018 00:52:31 +0000 (08:52 +0800)]
GUP: Display a list of Apps and dialogs
1) Add preference controller for gup dashboard and add list preferences
for each entry of the apps
2) Add gup dashboard page to search index
3) Add comprehensive tests for GupPreferenceController
Bug:
119221883
Test: make RunSettingsRoboTests
Change-Id: Ide4934c0dd3901532723e77e74663e5a7b639026
Merged-In: Ide4934c0dd3901532723e77e74663e5a7b639026
Colin Cross [Wed, 17 Apr 2019 23:16:08 +0000 (23:16 +0000)]
Merge "Update SettingsRoboTests for truth 0.42"
Colin Cross [Sat, 13 Apr 2019 05:31:59 +0000 (22:31 -0700)]
Update SettingsRoboTests for truth 0.42
SubjectFactory has been replaced with Subject.Factory.
Subject.getDisplaySubject has been replaced with
actualCustomStringRepresentation.
Bug:
130435731
Test: m checkbuild
Change-Id: I2799badfb79432ec70cb928b77294d6940cfc019
Merged-In: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
Treehugger Robot [Wed, 17 Apr 2019 19:28:15 +0000 (19:28 +0000)]
Merge changes from topic "GameDriver"
* changes:
Rename updatable graphics driver to Game Update Package.
Add developer option to opt-in updatable graphics driver.
Yiwei Zhang [Fri, 28 Dec 2018 03:38:11 +0000 (11:38 +0800)]
GUP: Add stub UI
Bug:
119221883
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GupDashboardTest
Change-Id: I1f7cc66790e1d1e1de5113e28a055ec5d1679013
Merged-In: I1f7cc66790e1d1e1de5113e28a055ec5d1679013
Peiyong Lin [Wed, 26 Dec 2018 21:21:40 +0000 (13:21 -0800)]
Rename updatable graphics driver to Game Update Package.
We have rebranded this project to Game Update Package, and GUP for short.
BUG:
119221883
Test: Build, flash and boot. Verify by going to developer options.
Change-Id: Ibc0814b6cd1e9bee991624c925456bc330fd93c6
Merged-In: Ibc0814b6cd1e9bee991624c925456bc330fd93c6
Peiyong Lin [Thu, 8 Nov 2018 05:06:57 +0000 (21:06 -0800)]
Add developer option to opt-in updatable graphics driver.
To facilitate developers to develop their applications against the updated
graphics driver, we provide a developer option to select one application to
opt-in. The selected application will always use updated graphics driver by
default.
BUG:
119221883
Test: Build, flash, boot, select a game and verify with prototype.
Change-Id: I8c3905fd5c1cbfb3ce12e589b48f57396c7776e3
Merged-In: I8c3905fd5c1cbfb3ce12e589b48f57396c7776e3
Jordan Liu [Mon, 15 Apr 2019 19:27:06 +0000 (19:27 +0000)]
Merge "Do not reuse phonestatelistener"
markchien [Tue, 9 Apr 2019 11:51:33 +0000 (19:51 +0800)]
Ignore the outdated entitlement check
Don't run entitlement if the request is base on outdated subId.
Bug:
129751453
Test: -build, flash, boot
-atest TetherServiceTest
-manual test with carrier SIM
Change-Id: Id3157df1a5758f8c72acbc45c9fefd2215c87395
Treehugger Robot [Sat, 13 Apr 2019 11:45:22 +0000 (11:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 13 Apr 2019 10:41:31 +0000 (03:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3445f31f0d5fb57f93a26c58cc8686a453bb8c46
Auto-generated-cl: translation import
Jordan Liu [Fri, 5 Apr 2019 21:39:41 +0000 (14:39 -0700)]
Do not reuse phonestatelistener
Due to b/
117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.
Fixes:
129989656
Test: manual
Change-Id: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I7630e74a9361093d8cbe72fa72c14aaaab9fcc17
Brad Ebinger [Wed, 10 Apr 2019 21:57:56 +0000 (21:57 +0000)]
Merge "Fix issue that user can't edit WFC mode for SIM2"
Amit Mahajan [Wed, 10 Apr 2019 00:08:43 +0000 (00:08 +0000)]
Merge "Treat mcx apn type as not wild-cardable."
Amit Mahajan [Mon, 8 Apr 2019 21:22:40 +0000 (14:22 -0700)]
Treat mcx apn type as not wild-cardable.
Test: manual
Bug:
130167974
Merged-in: Ic3e643646491e5a187505fd54ca767ad91e285f5
Change-Id: Ic3e643646491e5a187505fd54ca767ad91e285f5
(cherry picked from commit
2fa0b7ed85a441e7db353d0afe15ae9a52ec68a6)
Treehugger Robot [Tue, 9 Apr 2019 17:46:23 +0000 (17:46 +0000)]
Merge "Fix code for NPE when click add and cancel repeatly VPN profile"
Treehugger Robot [Mon, 8 Apr 2019 21:53:58 +0000 (21:53 +0000)]
Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED."
Malcolm Chen [Thu, 28 Mar 2019 00:45:29 +0000 (17:45 -0700)]
Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED.
Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED in manifest.
Also, make sure SimSelectNotification only listens to that intent.
Bug:
128645056
Test: manual
Change-Id: I008e5346ff1e015d1aa57ca31844426e33bd99b8
Merged-In: I008e5346ff1e015d1aa57ca31844426e33bd99b8
Lei Yu [Fri, 5 Apr 2019 17:36:54 +0000 (17:36 +0000)]
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request."
Treehugger Robot [Thu, 4 Apr 2019 21:56:10 +0000 (21:56 +0000)]
Merge "Make RadioInfo settings menu work for mSIM"
Hall Liu [Thu, 4 Apr 2019 21:40:34 +0000 (21:40 +0000)]
Merge "Show the disclaimer for WFC emergency call limitation"
Jordan Liu [Tue, 2 Apr 2019 19:13:31 +0000 (12:13 -0700)]
Make RadioInfo settings menu work for mSIM
Just add a spinner to the top of the screen which lets you select the
phoneIndex. Upating this value updates the mTelephonyManager
mImsManager, and mPhoneStateListener to use the selected phoneIndex and
the subscription associated with it.
Also adds fields for current subId and default data sim subId.
Test: manual test
Fixes:
128033739
Change-Id: Id075e3bffe20523d8ceeb8f2e4320f995abdab55
Merged-In: Id075e3bffe20523d8ceeb8f2e4320f995abdab55
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:06:47 +0000 (23:06 +0000)]
Merge "Clean up a few names of Telephony intent extra."
Malcolm Chen [Sat, 23 Mar 2019 00:59:00 +0000 (17:59 -0700)]
Clean up a few names of Telephony intent extra.
Bug:
128645056
Test: build
Change-Id: I5d47b132abb722282bd10b9fbb362fb1f1d32f11
Merged-In: I5d47b132abb722282bd10b9fbb362fb1f1d32f11
Hao Zhang [Tue, 28 Aug 2018 10:20:21 +0000 (19:20 +0900)]
Show the disclaimer for WFC emergency call limitation
The emergency calls might not work properly via wifi calling, especially
in areas with no 2G/3G coverage. Display the disclaimer for the this
limitation when a user enabled the wifi calling setting.
Test: manual - Checked that the disclaimer for emergency call limitation
is shown when changing wifi calling setting to turned on.
Test: auto - Passed EmergencyCallLimitationDisclaimerTest.
Bug:
68115846
Change-Id: I881d479c1e02525ac614c66594637a5e0347d70c
Merged-In: I881d479c1e02525ac614c66594637a5e0347d70c
Hall Liu [Mon, 1 Apr 2019 22:55:51 +0000 (22:55 +0000)]
Merge "Show the disclaimer regarding WFC location privacy policy"
Fan Zhang [Mon, 1 Apr 2019 21:11:38 +0000 (21:11 +0000)]
Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup"
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 20:51:54 +0000 (20:51 +0000)]
Merge "Move SIM select logic from SimSelectNotification to Telephony."
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
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
Sumit Deshmukh [Thu, 28 Mar 2019 09:01:45 +0000 (14:31 +0530)]
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
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"
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
sj.cha [Wed, 27 Mar 2019 00:19:28 +0000 (09:19 +0900)]
Fix code for NPE when click add and cancel repeatly VPN profile
Symptom: NPE is happened when click add and cancel repeatly VPN profile
Root Cause: Exception handling for ConfigDialog object
Steps to reproduce :
1. Go to VPN menu in Settings without Secure LockScreen
2. Click add VPN profile button
3. Keyguard dialog show
4. Click cancel button
5. Repeat 2 - 4 step
Test: refer a "Steps to reproduce"
Solution: Add exception handling for ConfigDialog object. This is a very rare case. But exception handling code should be needed.
Signed-off-by: SangJin Cha <sj.cha@lge.com>
Change-Id: I4c680b383f94c86a1c806d986e56f9f00d2be10e
Yong Shi [Tue, 28 Aug 2018 07:59:15 +0000 (16:59 +0900)]
Show the disclaimer regarding WFC location privacy policy
In some countries the rules is very strict about responsibility and
liability around location data during emergency calls. The purpose of
this feature is to notify end user that the location information will
be shared for calls over wifi calling.
Test: manual - Checked that WFC locatopn privacy policy is shown when
changing wifi calling setting to turned on.
Test: auto - Passed LocationPolicyDisclaimerTest.
Bug:
67872298
Change-Id: I03895743fb8da95269069ad7eda9a7b3e282857e
Merged-In: I03895743fb8da95269069ad7eda9a7b3e282857e
Lucas Lin [Fri, 22 Mar 2019 01:16:42 +0000 (01:16 +0000)]
Merge "Modify 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
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."
Hall Liu [Sat, 16 Mar 2019 00:23:23 +0000 (00:23 +0000)]
Merge "Base 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
Treehugger Robot [Fri, 15 Mar 2019 01:25:28 +0000 (01:25 +0000)]
Merge "Move SMS raw db deletion to phone process."
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
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
Treehugger Robot [Wed, 13 Mar 2019 01:30:58 +0000 (01:30 +0000)]
Merge "Schematize Crypto state system property"
Hall Liu [Tue, 12 Mar 2019 20:49:21 +0000 (20:49 +0000)]
Merge "Add 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
Chalard Jean [Fri, 8 Mar 2019 00:34:25 +0000 (00:34 +0000)]
Merge "Support VPN Proxy(2/2)"
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"
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
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
Andrii Kulian [Sat, 2 Mar 2019 01:52:04 +0000 (01:52 +0000)]
Merge "Revert "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
Treehugger Robot [Fri, 1 Mar 2019 21:48:55 +0000 (21:48 +0000)]
Merge "Revert "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
Treehugger Robot [Wed, 27 Feb 2019 18:45:08 +0000 (18:45 +0000)]
Merge "Update 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
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
Treehugger Robot [Mon, 25 Feb 2019 19:53:26 +0000 (19:53 +0000)]
Merge "Add 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
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"
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
Kiyoung Kim [Thu, 21 Feb 2019 00:16:45 +0000 (00:16 +0000)]
Merge "Schematize Crypto system properties"
Xin Li [Wed, 20 Feb 2019 16:25:59 +0000 (16:25 +0000)]
Merge "DO 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
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
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
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
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"
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
markchien [Thu, 14 Feb 2019 06:34:49 +0000 (22:34 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition"
am:
f1e3e9d627
Change-Id: I3cc8c13e2a7ee50be4e3d1080232156ce6f30984
Treehugger Robot [Thu, 14 Feb 2019 06:19:30 +0000 (06:19 +0000)]
Merge "Fix 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
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
Hall Liu [Wed, 13 Feb 2019 23:21:43 +0000 (23:21 +0000)]
Merge "Add ACCESS_FINE_LOCATION to permissions"
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
Fan Zhang [Wed, 13 Feb 2019 18:04:09 +0000 (18:04 +0000)]
Merge "Revert "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
Mark Chien [Wed, 13 Feb 2019 03:25:31 +0000 (19:25 -0800)]
Merge "Support entitlement check in DSDS"
am:
e3b4e0262c
Change-Id: I6adb628af2a084f784fabe66ea2ba896fabc80b8
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
Mark Chien [Wed, 13 Feb 2019 02:29:01 +0000 (02:29 +0000)]
Merge "Support entitlement check in DSDS"
Kiyoung Kim [Wed, 13 Feb 2019 02:06:33 +0000 (18:06 -0800)]
Merge "Schematize ADB system properties"
am:
750b90a22b
Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576
Fan Zhang [Wed, 13 Feb 2019 00:12:08 +0000 (00:12 +0000)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
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
Treehugger Robot [Tue, 12 Feb 2019 18:35:23 +0000 (18:35 +0000)]
Merge "Schematize ADB system properties"
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
Kiyoung Kim [Tue, 12 Feb 2019 03:13:51 +0000 (19:13 -0800)]
Merge "Schematize Display system properties"
am:
b139a4c16b
Change-Id: I82b157865fb288044c251d6d78ca850b22502db0
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
Treehugger Robot [Tue, 12 Feb 2019 02:50:08 +0000 (02:50 +0000)]
Merge "Schematize Display system properties"
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
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
Stanley Tng [Tue, 5 Feb 2019 21:05:41 +0000 (13:05 -0800)]
Merge "Update the Hearing Aids Strings"
am:
3afa2a7acb
Change-Id: I5310642f04558d961aa82df933791b08d883d92e
Treehugger Robot [Tue, 5 Feb 2019 20:20:51 +0000 (20:20 +0000)]
Merge "Update the Hearing Aids Strings"