OSDN Git Service
Youming Ye [Mon, 28 Oct 2019 12:31:19 +0000 (05:31 -0700)]
[automerger skipped] Check the missing useHomeWfMode case
am:
001a2e774d -s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1
b7923f5a3f is in history
Change-Id: Ife1a5829ae16ce63f6cd2df85bd94196af11600e
Youming Ye [Tue, 11 Jun 2019 22:25:52 +0000 (15:25 -0700)]
Check the missing useHomeWfMode case
Bug:
133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
Jack Yu [Sun, 27 Oct 2019 07:37:24 +0000 (00:37 -0700)]
Merge "Change Wi-Fi Calling text for SFR France"
am:
49358c53b2
Change-Id: Iaa58ec348cd836adfb20eedc38787934bc76d0df
Jack Yu [Sun, 27 Oct 2019 07:20:47 +0000 (07:20 +0000)]
Merge "Change Wi-Fi Calling text for SFR France"
Xin Li [Sun, 27 Oct 2019 06:18:01 +0000 (23:18 -0700)]
[automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am:
e2c2504c94 -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1
5eda5a3e7f is in history
Change-Id: Ifc67e1652cb46474a16c6383cec2d81ca6e424d3
Xin Li [Sun, 27 Oct 2019 05:34:20 +0000 (22:34 -0700)]
[automerger skipped] Merge Coral/Flame into AOSP master
am:
52bb254eea -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1
5eda5a3e7f is in history
Change-Id: Ida1ac569c9fce2eebfbec2797378ac297389f53c
Xin Li [Sun, 27 Oct 2019 04:44:30 +0000 (04:44 +0000)]
Merge "Merge Coral/Flame into AOSP master"
Chen Xu [Fri, 25 Oct 2019 17:44:44 +0000 (10:44 -0700)]
Merge "move CellBroadcastMessage from telephony-common to app"
am:
12a7368ad2
Change-Id: Idf2a9f4fd6c184a9aebef3e2e9298fcaeeecc9da
Chen Xu [Fri, 25 Oct 2019 17:28:22 +0000 (17:28 +0000)]
Merge "move CellBroadcastMessage from telephony-common to app"
Xin Li [Fri, 25 Oct 2019 17:28:05 +0000 (10:28 -0700)]
Merge Coral/Flame into AOSP master
Bug:
141248619
Change-Id: I3850f512dadd5e2c6d51af3c8abab1fa5dbc86ad
Merged-In: I46ad5cff3809191483b48fe292dba220a0d699c6
Aaron Huang [Fri, 25 Oct 2019 05:36:15 +0000 (22:36 -0700)]
Merge "Replace getNetworkPrefixLength() with public API"
am:
f67076dad5
Change-Id: Id37dd5521b1f95f7431d63e18dea3f8cc2b80eee
Aaron Huang [Fri, 25 Oct 2019 05:15:16 +0000 (05:15 +0000)]
Merge "Replace getNetworkPrefixLength() with public API"
Raff Tsai [Fri, 25 Oct 2019 01:51:50 +0000 (18:51 -0700)]
Merge "Skip loading contextual cards if legacy cards are used"
am:
c53771e80a
Change-Id: Idae5d4948edc9767afae23f2fcbbd522410654b5
Raff Tsai [Fri, 25 Oct 2019 01:35:20 +0000 (01:35 +0000)]
Merge "Skip loading contextual cards if legacy cards are used"
Aaron Huang [Thu, 17 Oct 2019 05:52:36 +0000 (13:52 +0800)]
Replace getNetworkPrefixLength() with public API
Use public API getPrefixLength() instead
Test: build pass
Change-Id: Ib85aa12dc22ac5b03c9bb7101beaf340014eb4fd
Lucas Lin [Wed, 23 Oct 2019 09:52:01 +0000 (02:52 -0700)]
Merge "Improve the wifi description for the case of private DNS broken"
am:
37b17ae752
Change-Id: I46ad5cff3809191483b48fe292dba220a0d699c6
Lucas Lin [Wed, 23 Oct 2019 09:20:09 +0000 (09:20 +0000)]
Merge "Improve the wifi description for the case of private DNS broken"
Niclas Rokicki [Tue, 22 Oct 2019 16:41:58 +0000 (09:41 -0700)]
Merge "translate="false" -> translatable="false""
am:
b333e79df9
Change-Id: I3955c9f03c741efa86fcf03baafea81d7073d5ef
Treehugger Robot [Tue, 22 Oct 2019 16:29:50 +0000 (16:29 +0000)]
Merge "translate="false" -> translatable="false""
Niclas Rokicki [Fri, 18 Oct 2019 07:56:43 +0000 (09:56 +0200)]
translate="false" -> translatable="false"
Fixed a typo related to String translation
Bug:
142888682
Test: Manual
Change-Id: I86fd2d9a4c5b085679ed627c7ecb7578da168ced
Daniel Hunt [Wed, 9 Oct 2019 09:51:01 +0000 (11:51 +0200)]
Skip loading contextual cards if legacy cards are used
This stops a jarring animation that occurs when returning to the
settings top level when legacy contextual cards are enabled and
shown at the top of the top level list,
Bug:
142936956
Test: Manual
Change-Id: I43605adf6f1bf63cc40157ac97c8e3295dd3cd99
Chen Xu [Thu, 3 Oct 2019 23:20:32 +0000 (16:20 -0700)]
move CellBroadcastMessage from telephony-common to app
1. add slotIndex in SmsCbMesage(cellbroadcast can be received
when sim is absent)
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage
Bug:
135956699
Bug:
141962867
Test: build & unit test
Change-Id: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
(cherry picked from commit
86a8e9b627081ce21b73f6ac3f7010fba800b734)
Merged-in: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
Anamika Singh [Fri, 18 Oct 2019 08:49:54 +0000 (01:49 -0700)]
Merge "Move Emergency call button"
am:
2501f6e268
Change-Id: Ie687f4b03f7ebf572057dca6678ac4d70666f76f
Treehugger Robot [Fri, 18 Oct 2019 08:37:39 +0000 (08:37 +0000)]
Merge "Move Emergency call button"
Raff Tsai [Tue, 15 Oct 2019 10:32:29 +0000 (03:32 -0700)]
Merge "Make sure close button has proper color"
am:
0f9ad6d7f9
Change-Id: I3f785f159c9b0e46a293acb8656eb47c9b6e4550
Raff Tsai [Tue, 15 Oct 2019 10:11:56 +0000 (10:11 +0000)]
Merge "Make sure close button has proper color"
Xin Li [Mon, 14 Oct 2019 20:25:43 +0000 (13:25 -0700)]
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug:
141248619
Change-Id: I8d4b7b73176b7323ea231bd98c5f74f6b6e96471
SongFerng Wang [Mon, 14 Oct 2019 07:34:20 +0000 (00:34 -0700)]
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
am:
bc6a65ca32
Change-Id: I3ec33adf894393b43296e83b450f3a894785fc92
SongFerngWang [Mon, 14 Oct 2019 07:34:10 +0000 (00:34 -0700)]
Preferred network list add 5G item
am:
76422cab68
Change-Id: I05771619c27d7ce0dd40fd83a9b3560758d29621
SongFerngWang [Mon, 14 Oct 2019 07:33:54 +0000 (00:33 -0700)]
RadioInfo network mode list and network mode string add 5G
am:
dc5149efef
Change-Id: Id55735d6933965735249e6c25981c137877b00ed
Bonian Chen [Mon, 14 Oct 2019 07:33:34 +0000 (00:33 -0700)]
[Settings] hide preferred network mode UI
am:
92eb42c69e
Change-Id: Id16ca111b0fe79b83bc0eff0ebdaca03875718dc
Antony Sargent [Mon, 14 Oct 2019 07:33:09 +0000 (00:33 -0700)]
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes
am:
aa88b8cee6 -s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1
6d910e8608 is in history
Change-Id: Ieb25eb9b4d1c9d85bcaa6e0532f8814339070f4c
Anamika Singh [Wed, 9 Oct 2019 12:36:41 +0000 (20:36 +0800)]
Move Emergency call button
This is google issue because in Q DecorView (base of CryptKeeper view)
has added Navigation bar forcefully due to which Emergency call button
was hidden on CryptKeeper view.
Made changes to shift ECC button above navigation bar.
Hence it will show just below CryptKeeper password entry view pattern/pin/password).
Bug:
142626673
Test: Manual
Change-Id: If60fad3936bc67adcf26019bdf16975b5706be83
SongFerng Wang [Mon, 14 Oct 2019 07:14:54 +0000 (07:14 +0000)]
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
* changes:
String "CDME" is wrong
Preferred network list add 5G item
RadioInfo network mode list and network mode string add 5G
[Settings] hide preferred network mode UI
Make EnabledNetworkModePreferenceController listen to setting changes
SongFerngWang [Thu, 10 Oct 2019 12:18:30 +0000 (20:18 +0800)]
String "CDME" is wrong
Bug:
142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Merged-In: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
SongFerngWang [Fri, 30 Aug 2019 08:06:41 +0000 (16:06 +0800)]
Preferred network list add 5G item
Preferred network list add 5G item, and change "recommended" from 4G to
5G, and add summary for 5G.
Bug:
138544359
Test: 1.fake the device network type bitmask to 5G, UI show 5G list
2.atest EnabledNetworkModePreferenceControllerTest.java :pass
Change-Id: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
Merged-In: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
SongFerngWang [Fri, 23 Aug 2019 10:03:27 +0000 (18:03 +0800)]
RadioInfo network mode list and network mode string add 5G
Bug:
131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
Merged-In: I945d3c2fd175f45151bbeee475e388ccc2d67642
Bonian Chen [Thu, 22 Aug 2019 09:13:06 +0000 (17:13 +0800)]
[Settings] hide preferred network mode UI
Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.
Bug:
137681413
Test: atest PreferredNetworkModePreferenceControllerTest
atest EnabledNetworkModePreferenceControllerTest
Manual with AT&T SIM card in out of servce and in service
Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
Merged-In: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
Antony Sargent [Tue, 30 Jul 2019 17:10:57 +0000 (10:10 -0700)]
Make EnabledNetworkModePreferenceController listen to setting changes
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.
Bug:
135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Merged-In: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Luca Stefani [Thu, 10 Oct 2019 08:36:44 +0000 (10:36 +0200)]
Make sure close button has proper color
Test: manual, change theme to dark
Change-Id: I9b1c159834c1afcc03a1df33e2ea3b28ce6fc6c0
Fang Li [Tue, 17 Jul 2018 03:31:38 +0000 (11:31 +0800)]
Change Wi-Fi Calling text for SFR France
Change Wi-Fi Calling text according to SFR requirement.
Test: Checked that changing name correctly.
Bug:
141255919
Change-Id: I598f9d4a3cbca166fe3449ec425702360a104213
Paul Hu [Tue, 1 Oct 2019 10:03:36 +0000 (03:03 -0700)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
am:
a67ca4cfd7
Change-Id: I7a2a4d76d1e0092188121d390c75c12eac20cdab
Paul Hu [Tue, 1 Oct 2019 09:50:28 +0000 (09:50 +0000)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
lucaslin [Thu, 26 Sep 2019 07:55:01 +0000 (15:55 +0800)]
Improve the wifi description for the case of private DNS broken
Currently, users don't know if the wifi description shows
"No internet" means it really doesn't have internet access or no
internet is because of private DNS resolution failed. So, Add a
new description for wifi when private DNS is broken.
Bug:
113242081
Test: make -j44 RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
Change-Id: I44a7e51cf76dc3f2a6b9583f226af6649f9b1f5f
Taesu Lee [Thu, 26 Sep 2019 06:14:10 +0000 (23:14 -0700)]
Merge "Fix to show eUICC preference in eng build"
am:
e825c30137
Change-Id: Ie6ca5a575e5c5caa4c841286421d037649765397
Treehugger Robot [Thu, 26 Sep 2019 05:53:10 +0000 (05:53 +0000)]
Merge "Fix to show eUICC preference in eng build"
Bill Yi [Wed, 25 Sep 2019 01:54:26 +0000 (18:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f9786915ebc5c168487e7a5386d4f2060d27a12
Auto-generated-cl: translation import
Daniel Huang [Tue, 24 Sep 2019 09:32:29 +0000 (02:32 -0700)]
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
am:
51cb777530
Change-Id: I7d6675734eed90cbfb0ccda46c047883e460962f
Daniel Huang [Tue, 24 Sep 2019 09:21:51 +0000 (09:21 +0000)]
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
Yi-Ling Chuang [Mon, 23 Sep 2019 03:03:21 +0000 (20:03 -0700)]
Merge "Enable dismissal feature on legacy suggestions."
am:
ee39335edc
Change-Id: Ibce2403de032bd3d7fce750f6cd80191a8b14441
Treehugger Robot [Mon, 23 Sep 2019 02:45:25 +0000 (02:45 +0000)]
Merge "Enable dismissal feature on legacy suggestions."
Yi-Ling Chuang [Thu, 19 Sep 2019 20:39:53 +0000 (13:39 -0700)]
Enable dismissal feature on legacy suggestions.
Add back the close button for legacy suggestions.
Fixes:
140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
è‹—è‹— (Miao Miao) [Tue, 17 Sep 2019 01:14:08 +0000 (09:14 +0800)]
In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's
STEPS TO REPRODUCE:
1. Insert two sim into device, sim1 is CUCC, sim2 is CMCC
2. Goto Settings-Network & Internet-sim1-MobileNetworkSettings-Access Point Names. It shows CUCC APN information
3. Hot plug out sim2
4. Hot plug in sim2, APN information changes to CMCC APN information
EXPECTED RESULTS:
When hot plug out/in sim2, sim1 APN settings interface should still keep its APN information instead of changing to sim2 APN information
Change-Id: I04c769f60ba1686b2c9bebcd07e3a04685979442
Bug:
141087659
Test:In sim1 APN settings interface, hot plug out/in sim2, it shows sim1 APN information all the time, test pass.
Neil Fuller [Tue, 17 Sep 2019 16:56:45 +0000 (09:56 -0700)]
Merge "Remove use of deprecated Time class"
am:
b3f8696c4d
Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
Treehugger Robot [Tue, 17 Sep 2019 16:32:47 +0000 (16:32 +0000)]
Merge "Remove use of deprecated Time class"
Neil Fuller [Tue, 17 Sep 2019 12:53:17 +0000 (13:53 +0100)]
Remove use of deprecated Time class
Remove a use of the deprecated Time class.
Bug:
16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
paulhu [Fri, 23 Aug 2019 09:18:58 +0000 (17:18 +0800)]
[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED
Settings is using CONNECTIVITY_INTERNAL to restrict launching
tether provisoning activity by provioning apps only. However,
CONNECTIVITY_INTERNAL will be deprecated from Android R, replace
the permission to TETHER_PRIVILEGED.
Bug:
32963470
Test: atest TetherServiceTest
Change-Id: I4c8312b92de8d5d9c9090c572e54622dc4fcf9d4
Xin Li [Sun, 8 Sep 2019 20:06:57 +0000 (13:06 -0700)]
Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master
Bug:
135460123
Change-Id: Ifbb4b45d2d592e4a4ede265d2c882dc1cb4a0410
Merged-In: Idcc078c0e541c04633db6d94c613ac4c861ba963
Taesu Lee [Mon, 22 Jul 2019 10:20:05 +0000 (19:20 +0900)]
Fix to show eUICC preference in eng build
DEVELOPMENT_SETTINGS_ENABLED is not set before entering Developer
options in settings app even if it is in eng build. To show eUICC
preference in eng build, uses isDevelopmentSettingsEnabled() instead.
Test: Manual and make RunSettingsRoboTests
Change-Id: Ia1f46fad94bc62ca48dcfef7cd5d6188766aa380
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Xin Li [Thu, 5 Sep 2019 16:53:18 +0000 (16:53 +0000)]
Merge "DO NOT MERGE - Merge Android 10 into master"
Xin Li [Wed, 4 Sep 2019 20:34:43 +0000 (13:34 -0700)]
DO NOT MERGE - Merge Android 10 into master
Bug:
139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963
android-build-team Robot [Tue, 27 Aug 2019 01:42:59 +0000 (01:42 +0000)]
Merge cherrypicks of [
9276111,
9276209,
9275845,
9276210,
9276238,
9276239,
9276211,
9276212,
9276240] into qt-c2f2-release
Change-Id: I45413bfa9c192aacfcf992a9767d7e6cecf66181
Bonian Chen [Thu, 22 Aug 2019 09:13:06 +0000 (17:13 +0800)]
[Settings] hide preferred network mode UI
Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.
Bug:
137681413
Test: atest PreferredNetworkModePreferenceControllerTest
atest EnabledNetworkModePreferenceControllerTest
Manual with AT&T SIM card in out of servce and in service
Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
(cherry picked from commit
128de7bdb61b02202b72c8cb6fefceecdb2bdad0)
Xin Li [Fri, 23 Aug 2019 06:45:17 +0000 (06:45 +0000)]
DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug:
139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
Xin Li [Fri, 23 Aug 2019 06:42:10 +0000 (06:42 +0000)]
DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
Bug:
139893257
Change-Id: Iff267db7ff7312a786dc5004a7421b395da178a9
android-build-team Robot [Thu, 22 Aug 2019 03:26:47 +0000 (03:26 +0000)]
Snap for
5821701 from
91ca872a44a1c648b76949928a9e0f44b8d84930 to qt-c2f2-release
Change-Id: If14ef067b6b999603c017ab2cf810aeb4e284a86
Bill Yi [Wed, 21 Aug 2019 19:57:11 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia404cdb510ff6c09446362da5ca1738f20bcc9fe
android-build-team Robot [Wed, 21 Aug 2019 02:19:37 +0000 (02:19 +0000)]
Snap for
5817401 from
ba8880dd871c9d63a83b4e339f882f324918051b to qt-c2f2-release
Change-Id: I9400648d5201ea6660831752332011338a392a66
Bill Yi [Tue, 20 Aug 2019 20:36:38 +0000 (13:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
ba8880dd87 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic0805579cd91f4ec10fb11c34dfe3ca652a43f50
Bill Yi [Tue, 20 Aug 2019 17:52:47 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
139484065
Change-Id: I6c50b4480bec5326951eb809eabc7194d1d06b65
Kevin Chyn [Tue, 20 Aug 2019 02:57:37 +0000 (19:57 -0700)]
Merge "Remove attention controller" into qt-r1-dev
am:
41aafab963
Change-Id: I31966ea8f672f664a4d1feae8be30eb47d0a2d32
android-build-team Robot [Tue, 20 Aug 2019 02:44:02 +0000 (02:44 +0000)]
Merge cherrypicks of [
9231374,
9231389,
9231390,
9231391,
9231375,
9231286,
9231355,
9231376,
9231420,
9231462,
9231356,
9231421,
9231422,
9231402,
9231537,
9231557,
9231440,
9231441,
9231287,
9231288,
9231463,
9231464,
9231465,
9231423,
9231289,
9231392,
9230416,
9231466] into qt-c2f2-release
Change-Id: I06a53fb0bfdb3588367768bd06aaaa8a6f94b83d
Kevin Chyn [Fri, 16 Aug 2019 23:40:39 +0000 (16:40 -0700)]
Remove delay from enroll start button
Fixes:
139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
(cherry picked from commit
058af41a42bffeff258f7c6c27f1cde78eb9e9f6)
TreeHugger Robot [Tue, 20 Aug 2019 02:37:20 +0000 (02:37 +0000)]
Merge "Remove attention controller" into qt-r1-dev
Kevin Chyn [Mon, 19 Aug 2019 22:09:00 +0000 (15:09 -0700)]
Merge "Remove delay from enroll start button" into qt-r1-dev
am:
ca2bbdfeca
Change-Id: Ide066e65d76c70175ade9ebeaf94e471cb11c806
Kevin Chyn [Mon, 19 Aug 2019 21:50:22 +0000 (21:50 +0000)]
Merge "Remove delay from enroll start button" into qt-r1-dev
android-build-team Robot [Mon, 19 Aug 2019 00:45:02 +0000 (00:45 +0000)]
Snap for
5811895 from
7892f729a554bb3212a5a27b4344ed4f1c4e1a4b to qt-c2f2-release
Change-Id: I0540ce5f28f36beeca6c68c07277dac43a4fc8af
Bill Yi [Sat, 17 Aug 2019 16:45:16 +0000 (09:45 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
7892f729a5 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia2280686d74a66951529c333f5c7e6a05d989208
TreeHugger Robot [Sat, 17 Aug 2019 16:30:21 +0000 (16:30 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Arc Wang [Sat, 17 Aug 2019 14:18:03 +0000 (07:18 -0700)]
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am:
54dbed859d
Change-Id: I0d5071d429dbd82d420e1199bd5baed0b687e2ae
TreeHugger Robot [Sat, 17 Aug 2019 13:58:53 +0000 (13:58 +0000)]
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
Bill Yi [Sat, 17 Aug 2019 08:35:46 +0000 (01:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
Kevin Chyn [Fri, 16 Aug 2019 23:40:39 +0000 (16:40 -0700)]
Remove delay from enroll start button
Fixes:
139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Kevin Chyn [Sat, 17 Aug 2019 02:43:00 +0000 (19:43 -0700)]
Merge "Update attention string" into qt-r1-dev
am:
e218dc0517
Change-Id: Id6f6bb10ef8a9bcb96e03da291df3f054bda5f32
Kevin Chyn [Sat, 17 Aug 2019 02:01:31 +0000 (02:01 +0000)]
Merge "Update attention string" into qt-r1-dev
Arc Wang [Mon, 12 Aug 2019 12:11:13 +0000 (20:11 +0800)]
[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.
This fix check the setting of active subscription and shows the preference.
Bug:
138956509
Test: CellularFallbackPreferenceControllerTest
manual test:
1. Insert feature supported SIM and check UI.
2. Remove feature supported SIM and check UI.
3. Turn airplane mode on and check 1. and 2..
Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
Kevin Chyn [Thu, 15 Aug 2019 23:48:39 +0000 (16:48 -0700)]
Remove attention controller
Bug:
139484065
Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
Kevin Chyn [Fri, 16 Aug 2019 23:34:01 +0000 (16:34 -0700)]
Update attention string
Bug:
139484065
Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
Xin Li [Thu, 15 Aug 2019 07:50:19 +0000 (00:50 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am:
1e53efc4c4 -s ours am:
b03fdd4dcf -s ours
am:
e66eb255ee
Change-Id: I34d560cf4bdd6b47e0a45c070185ba3f4eaa1f52
Xin Li [Thu, 15 Aug 2019 07:40:41 +0000 (00:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am:
1e53efc4c4 -s ours
am:
b03fdd4dcf -s ours
am skip reason: subject contains skip directive
Change-Id: I8b48996bdb25fda1adb55fcb63a3956dddbb8710
Xin Li [Thu, 15 Aug 2019 07:25:54 +0000 (00:25 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
am:
1e53efc4c4 -s ours
am skip reason: subject contains skip directive
Change-Id: I1898ca933b111068bd8b7eafbe5421096c313d9e
Xin Li [Thu, 15 Aug 2019 07:16:41 +0000 (00:16 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am:
c3ef16882d -s ours am:
f8c25b6ac4 -s ours
am:
f62f61cbfb
Change-Id: I6b798a4044f146cad1f6824e17aa82f80521251f
Xin Li [Thu, 15 Aug 2019 06:52:30 +0000 (23:52 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am:
c3ef16882d -s ours
am:
f8c25b6ac4 -s ours
am skip reason: subject contains skip directive
Change-Id: Ieeffd5db1009f7dda5b595f3a6790ec1f2ce6db8
Xin Li [Thu, 15 Aug 2019 06:32:21 +0000 (23:32 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
am:
c3ef16882d -s ours
am skip reason: subject contains skip directive
Change-Id: I1d1b46e30a9ec5b4e01f351342fe45ac64994d47
Treehugger Robot [Thu, 15 Aug 2019 06:13:48 +0000 (06:13 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
Xin Li [Wed, 14 Aug 2019 20:56:58 +0000 (13:56 -0700)]
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (
5713463) in stage-aosp-master am:
9821df1b1f -s ours
am:
8cabf84832
Change-Id: I8501d7bdfb3c8bb5e6ddf5e19aeb8335f81d18bf
Xin Li [Wed, 14 Aug 2019 20:32:06 +0000 (13:32 -0700)]
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (
5713463) in stage-aosp-master
am:
9821df1b1f -s ours
am skip reason: subject contains skip directive
Change-Id: If1da8066529d53cf10298533987f7d7f7c57d405
Xin Li [Wed, 14 Aug 2019 18:35:21 +0000 (11:35 -0700)]
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (
5713463) in stage-aosp-master
Bug:
134405016
Change-Id: I80e9ac9e5e6a21ebd94543865b8f75c20020360d
Jordan Liu [Wed, 14 Aug 2019 02:01:30 +0000 (19:01 -0700)]
Merge "Allow radio info on phones with no subscription" am:
19d1f890a0 am:
b377a593b7
am:
1fc63fc444
Change-Id: I114db364c10315dca50b75270fc14da7eaf1d354
Jordan Liu [Wed, 14 Aug 2019 01:48:49 +0000 (18:48 -0700)]
Merge "Allow radio info on phones with no subscription" am:
19d1f890a0
am:
b377a593b7
Change-Id: Ibe68e60583fdf2bd08d6d8f62b5c942878dd160e
OSDN Git Service
