PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,884 Commits 1 Branch 0 Tags
875e3d7e9f13b5e927b2fa1eb0794ebdde67bb4e
Commit Graph

28044 Commits

Author SHA1 Message Date
Automerger Merge Worker
5161dccb79 Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019 
Change-Id: I1fd1f571bc19a2c4aa1a1eb2346fa97d2932f2d9
 2020-03-13 23:42:42 +00:00
Treehugger Robot
9dec7506d3 Merge "Address cleanup comments from aosp/1234607" 2020-03-13 23:04:12 +00:00
Automerger Merge Worker
eb4f8d7cca Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144 
Change-Id: I3b4e01db0e0290290e6e962ae609f98521de23ee
 2020-03-13 12:25:03 +00:00
Automerger Merge Worker
7bb65a19dc Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6 
Change-Id: I380cb41a50e1dfc1edf9aca30c6dac14e33740d5
 2020-03-13 12:24:48 +00:00
Automerger Merge Worker
fa889d4fec Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06 
Change-Id: I7a64297cc60f20d560e811636c4d2678366282c1
 2020-03-13 12:24:42 +00:00
Bonian Chen
aa08222778 Merge "[Settings] Refactor DataUsageSummaryPreferenceController" 2020-03-13 12:08:30 +00:00
Bonian Chen
52dd9f5abf Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" 2020-03-13 12:05:36 +00:00
Bonian Chen
0972a6dd94 Merge "[Settings] Refactor DisabledSubscriptionController" 2020-03-13 11:52:53 +00:00
Automerger Merge Worker
e628466fc2 Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98 
Change-Id: I449647f069d2e356fd6fa7ed06e655e2c0ad9eb9
 2020-03-13 10:48:10 +00:00
Automerger Merge Worker
0587fe1ced Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c 
Change-Id: I9f0f6f0f404b35f05ac1b101b7a3e71bae6517c0
 2020-03-13 10:48:05 +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
793fa69cf8 Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a 
Change-Id: Ibd1693cfa19efadf1cba11180464cb199248780f
 2020-03-13 09:39:00 +00:00
Bonian Chen
1f1843f11c Merge "[Settings] Refactor MmsMessagePreferenceController" 2020-03-13 09:08:18 +00:00
Bonian Chen
0971feaeda [Settings] Code Refactor of MobileNetworkPreferenceController 
Code Refactor of MobileNetworkPreferenceController

Bug: 150567855
Test: make
Change-Id: If5de2d0841e2f8705d2e202b6e6a7e53dc1a4897
 2020-03-13 15:58:09 +08:00
Automerger Merge Worker
4ce01a847c Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 am: 311510b298 
Change-Id: Ie775c149cc731bb606f6dcb86a75512855f4e150
 2020-03-12 16:57:39 +00:00
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