PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,728 Commits 1 Branch 0 Tags
7ecae6dd06b0d72a398f3beefce40e84eea5bde9
Commit Graph

55728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
7ecae6dd06 Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 
Change-Id: I07ac521d3822a644cad29667a59fd1ae0bf848a3
 2020-03-13 12:06:59 +00:00
Bonian Chen
0972a6dd94 Merge "[Settings] Refactor DisabledSubscriptionController" 2020-03-13 11:52:53 +00:00
Automerger Merge Worker
a0d1887a98 Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 
Change-Id: Ief12d167f83e6898a16963fbd8718993a3e6d48d
 2020-03-13 10:28:12 +00:00
Automerger Merge Worker
6865bece3c Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 
Change-Id: I6360f84936f696431af97c0cafe796c93e21f58a
 2020-03-13 10:27:57 +00:00
Bonian Chen
985352d172 Merge "[Settings] Refactor CarrierPreferenceController" 2020-03-13 10:12:29 +00:00
Bonian Chen
1b00c00f79 Merge "[Settings] Refactor Telephony PreferenceController" 2020-03-13 10:11:54 +00:00
Automerger Merge Worker
57e2e2424a Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c 
Change-Id: I02a5ee42cd8e1f429b4f3031ac10c620eb5e3a16
 2020-03-13 09:29:09 +00:00
Bonian Chen
1f1843f11c Merge "[Settings] Refactor MmsMessagePreferenceController" 2020-03-13 09:08:18 +00:00
Automerger Merge Worker
311510b298 Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 
Change-Id: Icc7b441acfa3001d91a91175c6bf05eee5007984
 2020-03-12 16:30:31 +00:00
Automerger Merge Worker
b9b0dd9bc5 Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 
Change-Id: I36ea27d31eb7ce355e88bc2c4bbd1ed132359bc3
 2020-03-12 16:30:25 +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
Automerger Merge Worker
a99bfeadf9 Merge "[Settings] Code refactor" am: a7a9863a52 
Change-Id: Ice712f8ba7ef3cf07d70a408a9127a530514b2e7
 2020-03-12 11:19:13 +00:00
Automerger Merge Worker
6089a14883 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 
Change-Id: I66b1015bc59b4a123364bf013627facfce8c5905
 2020-03-12 11:19:06 +00:00
Bonian Chen
a7a9863a52 Merge "[Settings] Code refactor" 2020-03-12 11:08:01 +00:00
Bonian Chen
39d12019e4 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" 2020-03-12 11:06:51 +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
61167e098e Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b 
Change-Id: I749ba8ae504f37a7a3e9f2c7aa09ebcca8245964
 2020-03-11 20:07:54 +00:00
Chen Chen
291ff22d7b Merge "MetricId: Avoid byte[] and string ambiguity" 2020-03-11 17:26:37 +00:00
Automerger Merge Worker
ec71e52496 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 
Change-Id: I3f9d4e48bce108de162bb11daa91338951a71b46
 2020-03-11 13:09:00 +00:00
Zoey Chen
23c382aa45 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" 2020-03-11 12:54:05 +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
382ac6e42e Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 
Change-Id: I2881def2e37235b8d9ef4d9d82ad0abc6e7ecab4
 2020-03-11 05:51:49 +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
d0d3fd6457 Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e 
Change-Id: I3a0714c6e42bf6dde1371f2c188b4fa3bc4aceba
 2020-03-11 02:01:13 +00:00
Bonian Chen
bb8841c22e Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" 2020-03-11 01:45:14 +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
Automerger Merge Worker
c702fbbccc Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 
Change-Id: Ib2887b224883d82cdc4abdde4a9af34838ed39b9
 2020-03-10 17:47:07 +00:00
Treehugger Robot
f4e97c4e28 Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" 2020-03-10 17:26:27 +00:00
Automerger Merge Worker
66d4405d1d Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 
Change-Id: Ic2025dbfe0dcaf21b5a3a50c8caa778242440b6d
 2020-03-10 16:59:32 +00:00
Daniel Bright
716c06f700 Merge "Secret code fix - uses public symbol for secret" 2020-03-10 16:31:01 +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
976f7bfe78 Merge "Fix PlatformCompatDashboardTest." am: 805f137935 
Change-Id: Idc37972c9db03c70ce537951e983009e22f15476
 2020-03-09 11:05:26 +00:00
Anna Trostanetski
805f137935 Merge "Fix PlatformCompatDashboardTest." 2020-03-09 10:53:02 +00:00
Automerger Merge Worker
1ec7c14b3b Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e 
Change-Id: Ia3bdc608b679922f93398ba3c11a9f393374548a
 2020-03-08 05:10:45 +00:00
Treehugger Robot
a49021a71e Merge "PreferredNetworkModePreferenceController's summary no 5G item" 2020-03-08 04:52:56 +00: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
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
Automerger Merge Worker
3dfc9bc59f Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb 
Change-Id: I841a54be0ccf815e08eed0b4d769ef01e7151317
 2020-03-06 00:12:48 +00:00
Automerger Merge Worker
567f83adbe Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 
Change-Id: I02042e7d32a1daa74e624c18633ef69dace67838
 2020-03-06 00:12:13 +00:00
Bill Yi
7d35be74cb Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:29 +00:00