Commit Graph

28282 Commits

Author SHA1 Message Date
Automerger Merge Worker
654b19e1d5 Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 am: b9b0dd9bc5
Change-Id: I151894dc8de726b437ba6715ea783483ac9602fb
2020-03-12 16:57:33 +00:00
Bonian Chen
ac2c706809 Merge "[Settings] Fix behavior of mobile data plan" 2020-03-12 16:19:57 +00:00
Bonian Chen
0f15f98999 Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" 2020-03-12 16:19:18 +00:00
Bonian Chen
0a00f0c44c [Settings] Update TelephonyAPI in CallsDefaultSubscriptionController
use TelephonyManager's setDefaultVoiceSubscriptionId instead of setDefaultVoiceSubId

Bug: 150352656
Test: make
Change-Id: I61078c72c9a5374d4840869ecf9b65d4ce8ef85c
2020-03-12 20:57:09 +08:00
Bonian Chen
332de69f8e [Settings] Refactor CarrierPreferenceController
Refactor CarrierPreferenceController

Bug: 150352656
Test: make
Change-Id: I8b125eb501cdbf63cbfa84d72d78e44a655bf9a5
2020-03-12 20:53:10 +08:00
Bonian Chen
99c0f3fe14 [Settings] Refactor MmsMessagePreferenceController
Refactor MmsMessagePreferenceController

Bug: 150352656
Test: make
Change-Id: Id72f8f95eb12bb5c8f060df6c247312c56f2e69a
2020-03-12 20:50:25 +08:00
Bonian Chen
b7891e879f [Settings] Refactor Telephony PreferenceController
Refactor TelephonyBasePreferenceController and TelephonyTogglePreferenceController

Bug: 150352656
Test: make
Change-Id: I3d52054fd9fbc5597db6266686d155a12d5a88d6
2020-03-12 20:43:54 +08:00
Bonian Chen
29c1be284b [Settings] Refactor DisabledSubscriptionController
Refactor DisabledSubscriptionController

Bug: 150352656
Test: make
Change-Id: I6d31247d77c8fb515b9ba1b1ead33102f0e9e12f
2020-03-12 20:17:17 +08:00
Bonian Chen
25abe19e10 [Settings] Refactor DataUsageSummaryPreferenceController
Refactoring DataUsageSummaryPreferenceController to use public API

Bug: 150352656
Test: make
Change-Id: I95612a1e4ca5e178776dd1042a6ccfef011ba50b
2020-03-12 20:11:31 +08:00
Automerger Merge Worker
31f9002e3b Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9
Change-Id: I16b8f6d6e48c7f1f8f6ef6e76b6eaf73269b2da0
2020-03-12 11:31:43 +00:00
Automerger Merge Worker
97bb8e9d34 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883
Change-Id: If93befb35d7f8a6828568c977a75532332a71c93
2020-03-12 11:31:37 +00:00
Bonian Chen
a7a9863a52 Merge "[Settings] Code refactor" 2020-03-12 11:08:01 +00:00
Bonian Chen
bfc8714e1f [Settings] Code refactor
Code refactor.

Bug: 150352656
Test: make
Change-Id: I9efd75849ff6972ebddbba767868ad0d0ea0ffda
2020-03-12 16:31:06 +08:00
Bonian Chen
35904059d0 [Settings] Fix behavior of mobile data plan
Fix UI issue.

Bug: 150352656
Test: make
Change-Id: If5c6fc3c07259c45eba4d0f1f76b7b6de20cc6f4
2020-03-12 16:26:51 +08:00
Bonian Chen
a9d89cfd60 [Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION
Add flag for startActivity() with URI.

Bug: 150352656
Test: make
Change-Id: I7292f3802e22a73dc61cbbb5551c12ca05261629
2020-03-12 16:14:00 +08:00
Automerger Merge Worker
8585436d80 Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e
Change-Id: I4c7365c93c6e5bf14517765a20b8d82021bf279f
2020-03-11 20:18:00 +00:00
Automerger Merge Worker
d404e471b2 RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee
Change-Id: Ie3573e3cd7ecc9ca5ab227cd1fc530c173194a85
2020-03-11 20:06:20 +00:00
Automerger Merge Worker
19ff9101ee RESTRICT AUTOMERGE am: 077dd9b07f
Change-Id: I73f9a68326f6e6c477fc43eeb84b3349f519b658
2020-03-11 20:05:35 +00:00
Chen Chen
291ff22d7b Merge "MetricId: Avoid byte[] and string ambiguity" 2020-03-11 17:26:37 +00:00
Automerger Merge Worker
84da18bf54 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496
Change-Id: I6dd10164057b625f1378e2937c1f1319c8d18ced
2020-03-11 13:29:27 +00:00
zoey chen
3bfbb818c7 Fix Card 2's pin shows ON when only turn on card 1's pin
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
2020-03-11 11:10:39 +00:00
Automerger Merge Worker
2259d20def Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e
Change-Id: I740e7ac7d0cd6a7484c71941496e394f808ab027
2020-03-11 06:04:42 +00:00
Benedict Wong
1e2a91ba1a Address cleanup comments from aosp/1234607
This change addresses minor cleanup comments from aosp/1234607, renaming
a method.

Bug: 148991741
Test: Compiles
Change-Id: I2f31f8045040e6065a89e842b034aea605a99bd4
2020-03-11 05:46:27 +00:00
Treehugger Robot
7ef5614ee2 Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" 2020-03-11 05:40:34 +00:00
Daniel Bright
fa5ffc97e6 Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED
Bug: 148160428
Test: make, flash
Merged-In: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
Change-Id: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
2020-03-10 21:12:25 -07:00
Automerger Merge Worker
4f02905051 Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e am: d0d3fd6457
Change-Id: I11597c7d826e767269016d6c3bf1d8c84462b315
2020-03-11 02:20:10 +00:00
Bonian Chen
bb8841c22e Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" 2020-03-11 01:45:14 +00:00
Christopher Tate
36f182159f DO NOT MERGE - Track framework changes to crashApplication
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
2020-03-10 15:52:05 -07:00
Automerger Merge Worker
1dd17f9d7a Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 am: c702fbbccc
Change-Id: I652971bb416cf41fae485582b105f16e55ee5979
2020-03-10 21:01:50 +00:00
Chen Chen
847b534fdf MetricId: Avoid byte[] and string ambiguity
Passing null to the function will result in conflict with Bluetooth proto
(int int int byte[] int)
Bug: 122571213
Test: Build

Change-Id: Iad90e67a2cdde86aabb95585975be56fc33361fe
2020-03-10 12:49:56 -07:00
Treehugger Robot
f4e97c4e28 Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" 2020-03-10 17:26:27 +00:00
Automerger Merge Worker
c0fefd15a8 Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 am: 66d4405d1d
Change-Id: Iccca0aee080dff80a7fead4b09e9ab5c93a22181
2020-03-10 17:20:17 +00:00
Daniel Bright
d3b1fa8081 Secret code fix - uses public symbol for secret
There were two CLs that conflicted causing
the functionality to break again.  This CL switches
back to TestingSettingsBroadcastReceiver back to using
the secret code on TelephonyManager.

This is Ok because ag/10331474 moves AndroidManifest
to same flag.

Test: Brought up "Testing" activity using secret code
Test: Hit breakpoint in TestingSettingsBroadcastReceiver
      within if block.
Bug: 149524255
Merged-In: I681d88d7f2f0f923850d33219a1ee56eedf87cad
Change-Id: I681d88d7f2f0f923850d33219a1ee56eedf87cad
2020-03-09 22:29:22 -07:00
Daniel Bright
b9fd856273 [Mainline] Remove NETWORK_TYPE_LTE_CA
NETWORK_TYPE_LTE_CA is not bubbled up outside of the Telephony Packages

Test: make,flash
Bug: 147111233
Merged-In: I1eed95ee1060aff953306a696e91e0205acdad7c
Change-Id: I1eed95ee1060aff953306a696e91e0205acdad7c
2020-03-09 17:27:06 -07:00
Automerger Merge Worker
0fae3591e4 Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b
Change-Id: Ibb8fba2dfeca99e2c5db00039e5af926fef7ff56
2020-03-08 05:26:17 +00:00
Tsung-Mao Fang
91399607fe Fix pendingIntent in SettingsSliceProvider could be Hijacked
A malicious app is able to obtain this pending intent.
It can then mutate all fields except for the action and
launch the intent. This can be used to launch any activity
with the ACTION_SETTINGS action.

So, we enfore assign the package name for this intent,
it only can launch the settings app.

Fix: 147355897
Test: a) Install the new settings apk, and it won't launch other screen.
(See details in bug)
b) Start the settings search, slice search results work as normal.

Change-Id: Ie954d8a4b7153d6a4cac40621f363b45185990f2
(cherry picked from commit b3c0a2a6c1)
Merged-In: Ie954d8a4b7153d6a4cac40621f363b45185990f2
2020-03-06 18:14:03 +08:00
Bonian Chen
3fef55d53b Remove reference of Phoneconstants for SUBSCRIPTION_KEY
- use SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX instead of it

Test: make
Test: m RunSettingsRoboTests
Merged-In: Ic635b11c995077ebf1e143d9562b100d7730fe52
Change-Id: I42cbf1074af3b325ebb37281efd505954a2ca25c
2020-03-06 09:07:24 +00:00
Chris Tate
12ed043fdb Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
Revert submission 10556828-am-2e2e7004e4cb4ef8b776d65e9ffe33f3

Reason for revert: Should never have automerged downstream from qt-dev; the entire topic should have been skipped.
Reverted Changes:
I241d8d8da:DO NOT MERGE - Track framework changes to crashApp...
Ib1a5695f9:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I3e6eb3f5c:[automerger skipped] Merge "DO NOT MERGE - Kill ap...
Ibe4652916:DO NOT MERGE - Track framework changes to crashApp...

Change-Id: Ic68e376aa93c5c22a499d87f001bd22314c3f46e
2020-03-06 03:54:52 +00:00
SongFerngWang
000ddb3194 PreferredNetworkModePreferenceController's summary no 5G item
Bug: 150839189
Test: Summary show 5G items
Change-Id: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
Merged-In: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
2020-03-06 11:37:58 +08:00
Chris Tate
ab78a5cd9c Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
Revert "[automerger skipped] Merge "DO NOT MERGE - Add test of f..."

Revert submission 10557201-am-f98a6c51a74d42d6bc57f980bd694e3e

Reason for revert: Should not have been automerged from qt-dev; the whole topic should have been skipped.

Reverted Changes:
I01c0b570b:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I7451c89d1:DO NOT MERGE - Track framework changes to crashApp...
Iec866858c:DO NOT MERGE - Track framework changes to crashApp...
I200606752:[automerger skipped] Merge "DO NOT MERGE - Kill ap...

Change-Id: I4099413042f3f275f75695d661c401baad85ebc1
2020-03-06 03:35:09 +00:00
Automerger Merge Worker
20110a9a95 DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f
Change-Id: Iec866858c5b18ff5bfc1d8a2151a4c2780d82386
2020-03-06 01:43:35 +00:00
Automerger Merge Worker
86ce68877f DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279
Change-Id: Ibe465291626661a7bcd4ad38e11ff1525fbab512
2020-03-06 01:35:03 +00:00
Automerger Merge Worker
3af57b3c28 [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93
Change-Id: If45cb2b3e0c37b16047ff0c393da1cbfb379b091
2020-03-04 02:32:45 +00:00
Sarah Chin
83893a3ffd Rename calls to isGlobalModeEnabled
Test: atest FrameworksTelephonyTests
Bug: 148603998
Change-Id: If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6
Merged-In: If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6
2020-03-03 14:59:27 -08:00
Automerger Merge Worker
db71edac5c Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5
Change-Id: Ia4e41acdae5a840cf18a4d24493fb8a8a1e30c60
2020-03-03 10:49:48 +00:00
Automerger Merge Worker
86774c7151 Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7
Change-Id: Ie10acbfdf8512666458dba1fad4cf34c13e1b798
2020-03-03 10:49:45 +00:00
Automerger Merge Worker
42b698cdc5 Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5
Change-Id: I237ff4ef41d3dfb3fd74f74e0c252898d19962e5
2020-03-03 10:27:48 +00:00
Automerger Merge Worker
c405329ce7 Remove reference to PhoneConstant. am: 28c11a8c01
Change-Id: I635f49570f67f88cca0f937bb3aac3361f9a926a
2020-03-03 10:27:47 +00:00
Bonian Chen
a0b4ca3684 [Settings] Replace isImsRegistered
Replace isImsReigstered() by callback from ImsMmTelManager.

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: I904da749df7074918d205ebd004a173ed109c561
Change-Id: I193805ef947636e50bb21d273be15361378d8f8a
2020-03-03 15:11:27 +08:00
tom hsu
28c11a8c01 Remove reference to PhoneConstant.
Create static constant in SimStatusDialogController.

Test: make
Test: m RunSettingsRoboTests
Change-Id: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
Merged-In: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
2020-03-03 15:08:36 +08:00