OSDN Git Service
Lucas Lin [Wed, 24 Jul 2019 03:15:01 +0000 (03:15 +0000)]
Merge "Create a string for private DNS "On""
lucaslin [Tue, 23 Jul 2019 11:40:09 +0000 (19:40 +0800)]
Create a string for private DNS "On"
The last private DNS settings screen landed in P after string
freeze, which led us to reuse R.string.switch_on_text for the
"on" text when private DNS is active. That string comes from
notifications. Private DNS should have its own string for this
instead.
Bug:
79122154
Test: 1. Build pass
2. make -j44 RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: Ie013a858c8bc41e00a1b940d02efa2b605991685
Treehugger Robot [Thu, 11 Jul 2019 00:56:33 +0000 (00:56 +0000)]
Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
Xin Li [Tue, 9 Jul 2019 22:31:44 +0000 (15:31 -0700)]
DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master
Bug:
136196576
Change-Id: I660faf68e8a703ac26d79313ead245949f587e59
android-build-team Robot [Mon, 8 Jul 2019 23:29:58 +0000 (23:29 +0000)]
Snap for
5622519 from
fd365ae91ebe924197c5f443c889928eb07bd02c to pi-platform-release
Change-Id: I4b218750d55b6dbb691814f72ed880fc5d1677fb
Neil Fuller [Tue, 2 Jul 2019 14:27:55 +0000 (14:27 +0000)]
Merge "Add tobiast@ to the OWNERS file"
Neil Fuller [Tue, 2 Jul 2019 09:55:24 +0000 (10:55 +0100)]
Add tobiast@ to the OWNERS file
Add tobiast@ to the OWNERS file as libcore TL.
Remove pszczepaniak@ as he hasn't been on libcore
for a while.
Test: None
Change-Id: I714d3448ed60006cb58a0f49e95b7b834a6aac36
Brad Ebinger [Thu, 13 Jun 2019 20:17:19 +0000 (20:17 +0000)]
Merge "Allow SimDialogActivity to be started for result"
Colin Cross [Fri, 31 May 2019 03:11:22 +0000 (03:11 +0000)]
Merge "Make test_options.timeout an int64"
Colin Cross [Thu, 30 May 2019 21:08:37 +0000 (21:08 +0000)]
Merge "Convert Settings to Android.bp"
Colin Cross [Thu, 30 May 2019 18:32:07 +0000 (11:32 -0700)]
Make test_options.timeout an int64
Test: m RunSettingsRoboTests
Change-Id: I979268540fb50a22316223f432d3c6cbb259f61a
Colin Cross [Wed, 15 May 2019 22:26:26 +0000 (15:26 -0700)]
Convert Settings to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Test: m RunSettingsRoboTests
Change-Id: I267534c095c30833f77273dbdb1893b7830ed45d
Merged-In: I267534c095c30833f77273dbdb1893b7830ed45d
Brad Ebinger [Wed, 1 May 2019 00:30:40 +0000 (17:30 -0700)]
Allow SimDialogActivity to be started for result
In Telephony, we sometimes need to be able to launch
the SIM pick dialog activity for SMS without setting
a new default (i.e. user chose "ask every time") for
default SMS subscription.
Adds the ability for the SimDialogActivity to be
called using startActivityForResult and not set the
user's choice as the default.
Bug:
130853716
Bug:
130567323
Test: run Telephony SmsManagerTestApp
Merged-In: Ib448a6901581294050fc988ed9c16f7e93066860
Change-Id: If9f9ebbfe9b7b6718ed759937abbcfa6d22c6295
Xin Li [Fri, 17 May 2019 00:58:08 +0000 (00:58 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into "
Xin Li [Wed, 15 May 2019 23:55:39 +0000 (16:55 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into
Bug:
132622481
Change-Id: I3f8a777574eb05716d4ff18e64c9750184de26b6
Xin Li [Tue, 14 May 2019 17:08:40 +0000 (10:08 -0700)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug:
132622481
Change-Id: I812914052b50070b44ac2e2ba573a7146b6cbb78
Xin Li [Fri, 10 May 2019 02:05:15 +0000 (19:05 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into "
am:
d5ce2c2afc -s ours
am skip reason: subject contains skip directive
Change-Id: Ic4eb5c4bbd9a841279826081f8d714d8c24cbf5b
Xin Li [Thu, 9 May 2019 23:08:44 +0000 (16:08 -0700)]
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into
am:
361819cf69 -s ours
am skip reason: subject contains skip directive
Change-Id: I16b6508bd9ad9c92feee71ebc34cbf65edb866d8
Xin Li [Thu, 9 May 2019 22:05:45 +0000 (22:05 +0000)]
Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into "
Xin Li [Thu, 9 May 2019 16:27:05 +0000 (09:27 -0700)]
DO NOT MERGE - Merge Pie Bonito/Sargo into master.
Bug:
131756210
Change-Id: Ica814624161d8d3cc74a2e5bc9311354767ca255
android-build-team Robot [Tue, 7 May 2019 21:58:21 +0000 (21:58 +0000)]
Snap for
5450365 from
1fb5b5100d642d0a3ab9ca34cdcf2f444ca9e852 to pi-platform-release
Change-Id: I3d469d04b64e6624027ad9e766f0f8c035e6661e
android-build-team Robot [Fri, 3 May 2019 10:27:31 +0000 (10:27 +0000)]
Merge cherrypicks of [
7316389,
7315812,
7315813,
7316457,
7316055,
7315736,
7316390,
7316458,
7316459,
7316460,
7316561,
7316562,
7316563,
7316564,
7316565,
7316566,
7316567,
7316391,
7315814,
7316548] into pi-qpr3-b-release
Change-Id: I6dc39868f631f9bb35be079cbdeb8a5f9f265e30
Ahming Chen [Thu, 2 May 2019 05:54:51 +0000 (05:54 +0000)]
Revert "DO NOT MERGE Refactor passwords/pins/patterns to byte[]"
This reverts commit
34042bbf1d62aa19094bdb00f12ab46b4fcdd848.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I49ac37f6b1702db9248879e21134a028d8cb3892
(cherry picked from commit
ef22665a2c1876b0112af1086cef772e73da896a)
Xiangyu/Malcolm Chen [Wed, 1 May 2019 21:58:44 +0000 (14:58 -0700)]
Merge "Adding new strings needed for Enable MMS toggle."
am:
3c6cb98ec0
Change-Id: I4c011e272fe7610b2751f5f49c0132ee497ff280
Xiangyu/Malcolm Chen [Wed, 1 May 2019 20:49:35 +0000 (20:49 +0000)]
Merge "Adding new strings needed for Enable MMS toggle."
Malcolm Chen [Thu, 18 Apr 2019 20:26:58 +0000 (13:26 -0700)]
Adding new strings needed for Enable MMS toggle.
Bug:
130222866
Test: build
Change-Id: If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c
Merged-In: If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c
Mark Chien [Sat, 20 Apr 2019 03:26:15 +0000 (20:26 -0700)]
Merge "Ignore the outdated entitlement check"
am:
d7885ca73a
Change-Id: If610c3233137562571eeff0b2d73b2bdd946ebd9
Mark Chien [Sat, 20 Apr 2019 02:05:33 +0000 (02:05 +0000)]
Merge "Ignore the outdated entitlement check"
Yiwei Zhang [Fri, 19 Apr 2019 00:40:42 +0000 (17:40 -0700)]
Merge changes from topic "GameDriver2"
am:
44ab00de7f
Change-Id: I4ffdd92469ccd67907a169bead5d1473a5a6777c
Yiwei Zhang [Fri, 19 Apr 2019 00:39:38 +0000 (17:39 -0700)]
Game Driver: rename GUP to Game Driver
am:
046b9a8ca2
Change-Id: I58e48a8893ad5cac202bf9bf2afd3db120ae23cc
Yiwei Zhang [Fri, 19 Apr 2019 00:38:20 +0000 (17:38 -0700)]
Game Driver: Add footer to the dashboard
am:
34986f5ba5
Change-Id: Id046f661896bdd068519fb96524e6ab455229025
Yiwei Zhang [Fri, 19 Apr 2019 00:36:46 +0000 (17:36 -0700)]
Game Driver: Add SwitchBar to control GUP feature
am:
b15cc090d1
Change-Id: Icd1b593294426db2d8ffda3cad926fffb32cd4d5
Yiwei Zhang [Fri, 19 Apr 2019 00:35:09 +0000 (17:35 -0700)]
GUP: Add global switch for all apps
am:
75548c4a33
Change-Id: I12d7ff1e9959eb3e5e88c9f9e9f8bab2d88f7e95
Yiwei Zhang [Fri, 19 Apr 2019 00:33:07 +0000 (17:33 -0700)]
GUP: Fixed some typos and update some values
am:
d0bbbfeeea
Change-Id: I0d23b978d62c2c0eaced50c878e874844d7862db
Yiwei Zhang [Fri, 19 Apr 2019 00:30:54 +0000 (17:30 -0700)]
GUP: Display a list of Apps and dialogs
am:
dc62028e85
Change-Id: I3d13512fda47d401444f665636d83dff2fb23882
Yiwei Zhang [Fri, 19 Apr 2019 00:28:33 +0000 (17:28 -0700)]
GUP: Add stub UI
am:
a2754c515b
Change-Id: Ia9d6d44d106b7dc3b54218921039e9ee03967533
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:23:06 +0000 (16:23 -0700)]
Merge "Update SettingsRoboTests for truth 0.42"
am:
1e342c5be6
Change-Id: I76e84b28fc62f50e16fe712eb2da234912473652
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
Peiyong Lin [Wed, 17 Apr 2019 21:05:24 +0000 (14:05 -0700)]
Merge changes from topic "GameDriver"
am:
1d518f422b
Change-Id: I6e87de41a3ccb3e06dbbca44c797a4a16e123087
Peiyong Lin [Wed, 17 Apr 2019 21:04:05 +0000 (14:04 -0700)]
Add developer option to opt-in updatable graphics driver.
am:
5a92a74f23
Change-Id: Ib73af7ac9e9e4e33d8a5eca24a5b76f60af77132
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:37:48 +0000 (12:37 -0700)]
Merge "Do not reuse phonestatelistener"
am:
c99fddfe75
Change-Id: I52e311da7ae9a9477b74fc25f6bb122935e14582
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
Bill Yi [Sat, 13 Apr 2019 11:57:24 +0000 (04:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
bea1ed8666 -s ours
am skip reason: subject contains skip directive
Change-Id: Iec39c3c20fdb63b908c40ca9273a17e1baef8612
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 23:17:17 +0000 (16:17 -0700)]
Merge "Fix issue that user can't edit WFC mode for SIM2"
am:
d2727d5d9f
Change-Id: I1bbbe7efe7f057dfcf55f9685f2b10ebd94e3f38
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:32:34 +0000 (17:32 -0700)]
Merge "Treat mcx apn type as not wild-cardable."
am:
61841ba690
Change-Id: I422e025bcacbae3f0c52b71f3e21d3881a42d553
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)
sj.cha [Tue, 9 Apr 2019 18:20:55 +0000 (11:20 -0700)]
Merge "Fix code for NPE when click add and cancel repeatly VPN profile"
am:
70cae1ce8d
Change-Id: Ie18c7977bb0c48ba5f9524130cbe6649f8840153
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"
Malcolm Chen [Mon, 8 Apr 2019 23:06:13 +0000 (16:06 -0700)]
Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED."
am:
bf857c7374
Change-Id: I2422f31d45e1b7242f8f73decd7eab5d4f33da3d
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
android-build-team Robot [Sun, 7 Apr 2019 21:08:16 +0000 (21:08 +0000)]
Snap for
5443865 from
83d678bdc471f1e8eb14ac9bbfe5fe0718cc6ec3 to pi-qpr3-b-release
Change-Id: I2a91bc8fc571563e2d90a88da091b3916d07c44f
Bill Yi [Fri, 5 Apr 2019 19:44:47 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I27c0efa466b676aafccb399704805959704fe165
Lei Yu [Fri, 5 Apr 2019 18:09:52 +0000 (11:09 -0700)]
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request."
am:
11ce64450c
Change-Id: I1bf0ed7400e556f8f8f6ad3e7a4b58b383a67034
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."
Jordan Liu [Thu, 4 Apr 2019 22:03:03 +0000 (15:03 -0700)]
Merge "Make RadioInfo settings menu work for mSIM"
am:
a85fa6c51d
Change-Id: I0c83baafa8d30638b26c5dce3f23c722d3628991
Hall Liu [Thu, 4 Apr 2019 21:59:19 +0000 (14:59 -0700)]
Merge "Show the disclaimer for WFC emergency call limitation"
am:
2188a0040a
Change-Id: I51288ccdd1cee609ed5e6f159a7c4d6fc144d092
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:25:05 +0000 (16:25 -0700)]
Merge "Clean up a few names of Telephony intent extra."
am:
6bb737c5b9
Change-Id: I1a2232458ab8fd4a89c1ada1e5195bf346e31074
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 23:25:49 +0000 (16:25 -0700)]
Merge "Show the disclaimer regarding WFC location privacy policy"
am:
5697a7e85d
Change-Id: Iddb15758aefffade3138d0d8c42a953d50640b14
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:45:32 +0000 (14:45 -0700)]
Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup"
am:
8877dc8fd0
Change-Id: I34fd41dfc4e12c069f78cb017f8f754a43689b74
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 21:06:49 +0000 (14:06 -0700)]
Merge "Move SIM select logic from SimSelectNotification to Telephony."
am:
6fca0c9495
Change-Id: I85ec9746b8df4a5eb53d6e0fe7e29434f12ec812
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
android-build-team Robot [Sun, 31 Mar 2019 21:10:41 +0000 (21:10 +0000)]
Snap for
5422807 from
5d9189fab232610b2a543f617faf4cb29b0968fc to pi-qpr3-b-release
Change-Id: Iffef7cc1a559bae689f7d1a6e91cfcd7d835dc3b
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
Rich Cannings [Thu, 28 Mar 2019 21:15:33 +0000 (21:15 +0000)]
Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
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
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
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
android-build-team Robot [Tue, 26 Mar 2019 21:05:34 +0000 (21:05 +0000)]
Snap for
5408106 from
e6d11ed962c90500527393e242e85fc77741b2ad to pi-qpr3-b-release
Change-Id: I0edf56b1eb9e991b541850f291ef6504f6790a2f
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