PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,939 Commits 1 Branch 0 Tags
7540cdf81fb48e751f9ea024a35d494b9fa82ad0
Commit Graph

55939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Thierer
7540cdf81f Merge "OWNERS: Remove tobiast." am: dffcd7a949 am: 21b01bc4f2 
Change-Id: I2d43fde1e8a07381a163589b04327f54b37e499f
 2020-03-27 11:51:27 +00:00
Tobias Thierer
21b01bc4f2 Merge "OWNERS: Remove tobiast." am: dffcd7a949 
Change-Id: Iad09bc83fa7f258f83ee505a4cd9edf9004f542d
 2020-03-27 11:30:14 +00:00
Tobias Thierer
dffcd7a949 Merge "OWNERS: Remove tobiast." 2020-03-27 11:04:12 +00:00
Stanley Wang
05a95032a5 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 
Change-Id: I95009001d7d007d8a509e6a6f6f9f213b48623a9
 2020-03-27 03:20:48 +00:00
Stanley Wang
0b76ef19b5 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev 2020-03-27 03:09:09 +00:00
Tobias Thierer
a854ddae3d OWNERS: Remove tobiast. 
Test: Manual CL review only.
Bug: 152399425
Change-Id: Ifca2d6e8ecd59a924c6e5d8ca60749be5d5c8728
 2020-03-26 12:17:00 +00:00
Treehugger Robot
4524c5ba3b Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 am: 533c10f747 
Change-Id: Ic4502bfeafe849c5eed5b09c9a156bf47331c7d2
 2020-03-26 10:41:01 +00:00
Treehugger Robot
533c10f747 Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 
Change-Id: I3ab6b4458babf1bfd43c89fb74ae451cf05f9022
 2020-03-26 10:25:32 +00:00
Treehugger Robot
1ed4e81385 Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" 2020-03-26 10:07:30 +00:00
Rahul Sabnis
86cfb387ef Verify BluetoothDevice is not null before calling BluetoothHearingAid 
System APIs

Bug: 149238489
Test: Manual
Merged-In: Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b
Change-Id: Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b
 2020-03-25 13:57:29 -07:00
Jack Yu
9703dd3db0 Merge "Added slot index in area info broadcast" am: 07f1ec2cca am: d1cd033f6f 
Change-Id: I1cd4186f01f29a1c0800812dd90bbb3f34895fe9
 2020-03-25 05:00:26 +00:00
Jack Yu
d1cd033f6f Merge "Added slot index in area info broadcast" am: 07f1ec2cca 
Change-Id: Iaab7b201cd25d3854031d65ce828829108b427c4
 2020-03-25 04:42:15 +00:00
Jack Yu
07f1ec2cca Merge "Added slot index in area info broadcast" 2020-03-25 04:30:21 +00:00
Raff Tsai
9d59802141 Merge "Modify close app function." am: ce1f51128b am: 579878afcf 
Change-Id: I20818d1033455533f14e6c9b5c2ebfb1d8f4526a
 2020-03-23 11:09:29 +00:00
Raff Tsai
579878afcf Merge "Modify close app function." am: ce1f51128b 
Change-Id: I80e83ae16c2a2f931604e864fb79ee1d02db6a0e
 2020-03-23 10:53:44 +00:00
Raff Tsai
ce1f51128b Merge "Modify close app function." 2020-03-23 10:32:29 +00:00
youtengliang
aa4f582931 Modify close app function. 
Test: atest com.android.settings.tests.perf
Change-Id: Ia504dd1185de1d33a21fec344871d4b0fabae953
 2020-03-23 09:29:28 +00:00
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
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