PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,233 Commits 1 Branch 0 Tags
f257197d967bc2f4d7b2567e4fce6ab76dbff7cc
Commit Graph

56233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
fc3f804761 Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 
Change-Id: I86055f0ac9597ec43111575f5fea6b62819b0674
 2020-03-23 06:19:00 +00:00
Treehugger Robot
cbe5bbdcd5 Merge "Fixed NullPointerException" am: 5fb16be925 
Change-Id: Ie99fc2139875e0f8dfbfbe0bd31f55f135607996
 2020-03-23 06:00:05 +00:00
Treehugger Robot
5fb16be925 Merge "Fixed NullPointerException" 2020-03-23 05:45:38 +00:00
Jack Yu
922e1d23d8 Added slot index in area info broadcast 
Added slot index information in the broadcast
so the receiver knows which slot to get information.

Test: Manual
Merged-In: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Change-Id: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Fix: 150126754
(cherry picked from commit 5a4dabcba2)
 2020-03-20 13:18:09 -07:00
TreeHugger Robot
d3a98734eb Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c6e000ff18 
Change-Id: I23fd001ff90912c69eb455b412b315e4fba6801d
 2020-03-20 18:33:01 +00:00
Xin Li
3ac005ce4d DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 0cad441364 
Change-Id: I18ab89e549a024582bd2ac4b53c18f98a16e9d73
 2020-03-20 18:32:28 +00:00
TreeHugger Robot
c6e000ff18 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master 2020-03-20 18:15:00 +00:00
Sanghee Kim
24565c1b83 Fixed NullPointerException 
1. only one sim insertion.
2. sim removal in sim card lock setting menu.

Additionally, removed unnecessary code.

Test: manual

Change-Id: I5710b9c313d6e0b7c011a12e0179a4d5a4f7e580
Signed-off-by: Sanghee Kim <haya93@samsung.com>
 2020-03-20 14:39:44 +09:00
TreeHugger Robot
e9098ad882 Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d 
Change-Id: I9d93999096561ae6f3241738262110325c5f64fb
 2020-03-20 03:19:38 +00:00
TreeHugger Robot
3c137d807d Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev 2020-03-20 02:51:54 +00:00
Sarah Chin
adcd1f18ef [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours 
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: I77bf2fae9b80f05d58414ac9bc5cd0a9282ea9f8
 2020-03-19 19:24:55 +00:00
Sarah Chin
bd8bbca27c Merge "5G meteredness for telephony framework" into qt-qpr1-dev 2020-03-19 19:11:00 +00:00
Anna Trostanetski
cf2d2ef9f0 Merge "Show only listUIChanges instead of all" am: c305df9450 am: 983158e9ab 
Change-Id: I11a7375ff99db50f3b2be01e9cc40bc9697b78e0
 2020-03-19 17:51:55 +00:00
Anna Trostanetski
983158e9ab Merge "Show only listUIChanges instead of all" am: c305df9450 
Change-Id: Ic3c11a30e28d91aebd5b15d6b601f12294a13a8b
 2020-03-19 17:51:32 +00:00
Anna Trostanetski
c305df9450 Merge "Show only listUIChanges instead of all" 2020-03-19 17:34:45 +00:00
Bonian Chen
7889b36dae Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6 am: 43d3caa835 
Change-Id: I710b5459b4ea31840e10f6d23622cae742928df5
 2020-03-19 17:24:11 +00:00
Xin Li
0cad441364 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master 
Bug: 151763422
Change-Id: I2f38724f862817185ae93dd79736791540251a60
 2020-03-19 10:10:41 -07:00
Bonian Chen
43d3caa835 Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6 
Change-Id: I17c240896ef2d462e938fea88e981e73a4a05db4
 2020-03-19 17:06:58 +00:00
Bonian Chen
afbbde35b6 Merge "[Settings] Refactor of ApnSettings" 2020-03-19 16:54:42 +00:00
atrost
77e4f7b3bb Show only listUIChanges instead of all 
Use the new method that filters out changes that shouldn't be in the
developer UI.

Exempt-From-Owner-Approval: Roll forward of unchanged reverted change previously approved.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I5b461b33484a38d0c6a5b7bf7e928231dd662668
Merged-In: I5b461b33484a38d0c6a5b7bf7e928231dd662668
 2020-03-19 16:06:28 +00:00
Treehugger Robot
7b4c559f32 Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7 am: 51c080aaf9 
Change-Id: I33877d685c9da74b19570c00d1082d1190ef524d
 2020-03-19 05:43:13 +00:00
Treehugger Robot
51c080aaf9 Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7 
Change-Id: I11c1999d2ad4502366acf8b29946d4412ed393c2
 2020-03-19 05:12:32 +00:00
Treehugger Robot
2dd19966b7 Merge "Fix sim pin lock preference disappear in dual sim." 2020-03-19 04:57:26 +00:00
android-build-team Robot
7e28298e59 Merge cherrypicks of [10745155, 10743283, 10746098, 10735615, 10743284, 10745369, 10745156, 10745157, 10746136, 10746137, 10745215, 10746138, 10745216, 10745217, 10746139, 10745218, 10743285, 10746118, 10746119, 10745827, 10745158, 10745159, 10743224, 10743225, 10745492] into qt-qpr2-release 
Change-Id: I1da09579d5ce7b2c67b4a7db381c779a5c5ccb6b
 2020-03-19 04:53:30 +00:00
Mill Chen
abe9cee25e RESTRICT AUTOMERGE 
Allow LockScreenPattern to be launched in the pinning screen

If work profile lock is enabled and work app is pinned, users will get a
black/white screen on the phone. That's because Settings is prevented
from other apps launch any pages of Settings in the pinning mode.

In order to launch some pages of Settings from other apps, we add a
condition to the preventive mechanism and allow the activity inherited
from SettingsBaseActivity to override the condition to have the activity
to be launched from other apps in the pinning mode.

Bug: 137015265
Bug: 135604684
Test: manual test
Change-Id: I8070de79a83350d1658efcb19e983669dad0e673
(cherry picked from commit 077dd9b07f)
 2020-03-19 04:52:35 +00:00
Christopher Tate
0f2d02be9c DO NOT MERGE - Track framework changes to crashApplication 
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
(cherry picked from commit 36f182159f)
 2020-03-19 04:52:30 +00:00
Betty Chang
e22ef3bd14 Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd am: f695abfc29 
Change-Id: I7ecbe73fceb320d9fe1b13a627c46507a0964231
 2020-03-19 04:42:54 +00:00
Betty Chang
f695abfc29 Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd 
Change-Id: I3a4b569e11a2c8235ce9adfa051cd6f795a02678
 2020-03-19 04:29:29 +00:00
SongFerngWang
6c9ce4d892 Fix sim pin lock preference disappear in dual sim. 
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.

Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
Merged-In: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
 2020-03-19 12:13:37 +08:00
Betty Chang
e5f9bde2fd Merge "[Mainline] Use public method in SubscriptionManager for mainline" 2020-03-19 04:09:34 +00:00
Treehugger Robot
ca6f5447b9 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 am: e18b79d22d 
Change-Id: Icd6ae4821ce911293f26deb31a83ae627b651530
 2020-03-19 01:46:36 +00:00
Treehugger Robot
e18b79d22d Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 
Change-Id: I95089501349894acad9e09b4417c74657a906722
 2020-03-19 01:37:20 +00:00
Treehugger Robot
84fab912b0 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" 2020-03-19 01:36:09 +00:00
changbetty
e9f857621f [Mainline] Use public method in SubscriptionManager for mainline 
- getActiveSubscriptionIdList
   To use getActiveSubscriptionInfoList to get subscription Id list
 - getActiveSubscriptionInfoList(Z)
   To use getActiveSubscriptionInfoList() instead

Bug: 144478274
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
       make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkUtilsTest

Change-Id: I4d6113561906af5c9e4ac7737aefac17c926059a
Merged-In: I4d6113561906af5c9e4ac7737aefac17c926059a
 2020-03-18 10:33:39 +00:00
Sarah Chin
20974b6814 5G meteredness for telephony framework 
Add listener for SubscriptionPlans changed

Bug: 151630253
Test: atest FrameworksTelephonyTests
Change-Id: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
Merged-In: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
 2020-03-17 18:47:07 +00:00
Automerger Merge Worker
94f905bd9d [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours 
am skip reason: subject contains skip directive

Change-Id: Icd688c1135ffd48dd178eaf2a7e3665e85deca52
 2020-03-17 15:11:36 +00:00
Bill Yi
8f23d00553 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I88eb61ab20394d1cf91380f2823a536faaa8619c
 2020-03-17 04:18:33 -07:00
Automerger Merge Worker
875e3d7e9f Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017 am: 0fbe648878 
Change-Id: I0a54df099ff98d68a165ce41b5de18ab27bcc8bf
 2020-03-16 22:40:58 +00:00
Automerger Merge Worker
0fbe648878 Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017 
Change-Id: I1a5185fb2c7eae81cd98ccbe713a333e09431d64
 2020-03-16 22:21:51 +00:00
Treehugger Robot
177ce8f017 Merge "Fix mismatching intent filter string in AndroidManifest.xml" 2020-03-16 22:07:18 +00:00
Grace Jia
16092ab56f Fix mismatching intent filter string in AndroidManifest.xml 
Test: Manual
Bug: 149524255
Change-Id: Ic5bfbfa41cba18ccc8166624da33c70b69db73f5
 2020-03-16 13:27:25 -07:00
Automerger Merge Worker
c3936e3961 [automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours 
am skip reason: subject contains skip directive

Change-Id: I5fe7e5bb4890cda70efd8ed4bee9b36a39d8453d
 2020-03-16 18:09:29 +00:00
Bill Yi
d49c677499 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ic27dcb9095c3058386601a78f844419467f147a1
 2020-03-16 08:20:15 -07:00
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
Automerger Merge Worker
008480e019 Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 
Change-Id: I3aaa084901d593f3330469a499f548b6e40b42db
 2020-03-13 23:23:30 +00:00
Treehugger Robot
9dec7506d3 Merge "Address cleanup comments from aosp/1234607" 2020-03-13 23:04:12 +00:00
Revathy Sivalingam
4e00cbcb2b Make URLs in Wi-Fi Calling help description clickable 
Make URLs in Wi-Fi Calling help description clickable. This enables
carriers to add a link in the description that takes the user to a web
page with further information about Wi-Fi Calling.

Bug: 151326849
Test: manual
Change-Id: Icc66faa07105607a36b0d964ffc8ac5aafacb734
 2020-03-13 15:51:03 +01:00
Automerger Merge Worker
327db8c033 Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 
Change-Id: I0099a4bda75f8acc86e09d142a1bdcc29bbc9684
 2020-03-13 13:57:05 +00:00
Automerger Merge Worker
0c0a52cc12 Merge "Settings performance testing" am: 4186be0f29 
Change-Id: Iaf5b3e75f376bc7dc2e875f1e10adecedc34231a
 2020-03-13 13:35:25 +00:00
Raff Tsai
4186be0f29 Merge "Settings performance testing" 2020-03-13 13:22:57 +00:00