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

56260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
586b2786ac Merge "Fix PlatformCompatDashboardTest." am: 805f137935 am: 976f7bfe78 
Change-Id: I800672519f7dd70b20645d3c9348f32e8d5ce648
 2020-03-09 11:17:46 +00: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
0fae3591e4 Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b 
Change-Id: Ibb8fba2dfeca99e2c5db00039e5af926fef7ff56
 2020-03-08 05:26:17 +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
android-build-team Robot
f6090fab5e Snap for 6271995 from 12ed043fdb to qt-qpr3-release 
Change-Id: I963711441da25323f570f6f94fcbb3cfa3f73413
 2020-03-07 00:09:01 +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
Automerger Merge Worker
900b87d0c5 Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb 
Change-Id: I7c09136d531f7a09c945c50c99200448f6757a82
 2020-03-06 04:26:23 +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
cd8fc3550b Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f 
Change-Id: Iff7a718249f46373b0ff46b2731bf6b9ac405029
 2020-03-06 00:27:25 +00:00
Automerger Merge Worker
4b0b20986c Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe 
Change-Id: Id3d1ed3b88c3d74f02d75bfa04a8dcb18892ced1
 2020-03-06 00:26:49 +00: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
Bill Yi
09be9fbb17 Merge stage-aosp-master to aosp-master - DO NOT MERGE 
Change-Id: Ic40bc7d2b6b306b5cfb0b061e5a3a6f8fe3737c9
 2020-03-05 09:51:19 -08:00
android-build-team Robot
1e36c5247c Snap for 6263357 from 3779025590 to qt-qpr3-release 
Change-Id: I7c787d5f362b84d7962c759b3d404f39f4b92d40
 2020-03-05 00:08:25 +00:00
Automerger Merge Worker
b9cbd0368e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9107eb36235d9f4204d61869019e626149d2bf9e
 2020-03-04 19:40:22 +00:00
TreeHugger Robot
3779025590 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-03-04 19:24:28 +00:00
Bill Yi
8e8a5a1a2c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I3e95725552e5510a27025a8315fe4ec69dd2bfd8
 2020-03-03 19:10:03 -08: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
atrost
62c470475f Fix PlatformCompatDashboardTest. 
CompatibilityChangeInfo constructor has a new parameter.
The logging only is not currently reflected in the dashboard - it will be grayed out as it's not overridable.
In a followup we can group those changes together in the UI.

Test: atest com.android.settings.development.compat.PlatformCompatDashboardTest
bug: 148009004
Change-Id: I833669f7f2a5128bdeda7451b8ff6e0bb753c500
Merged-In: I833669f7f2a5128bdeda7451b8ff6e0bb753c500
 2020-03-03 11:16:01 +00: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
Treehugger Robot
1ea70d24d5 Merge changes I193805ef,I2e1b9ac5 
* changes:
  [Settings] Replace isImsRegistered
  Remove reference to PhoneConstant.
 2020-03-03 10:15:27 +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
Stanley Wang
0d9ad30b05 Fix security issue for using mock location without permission. 
Remove mock location apps if developer option is disabled.

Bugs: 145136060
Test: manual
Change-Id: I7ecf0bdbfc49674b350cdfe81fe1a626da5ef3ca
 2020-03-03 14:12:05 +08:00
Arc Wang
9e46a0bc93 [Wi-Fi] Ignore incorrect user certificates 
These incorrect user certificates displayed when users
editing a Wi-Fi network of WPA3-Enterprise in 192bit.

Bug: 149763958
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idcbc80aa3e945f83ba6b77ebf9ef443398ef8e3c
Merged-In: Iab35ac975933abc54fda83b99a2109d53d6722d4
 2020-03-02 22:28:46 +08:00
Automerger Merge Worker
711b69b788 Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d 
Change-Id: I61005104a53c8e79a045be4186ec9f46df4d15f5
 2020-03-02 11:52:51 +00:00
Automerger Merge Worker
98e3ed4e5d Merge "Fix NPE in PanelFragment" am: 06cafcd733 
Change-Id: Ia08ab086c610de141b4cadd2ae097b596351e46e
 2020-03-02 11:37:36 +00:00
Treehugger Robot
06cafcd733 Merge "Fix NPE in PanelFragment" 2020-03-02 11:21:05 +00:00
Automerger Merge Worker
7444c5f649 Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a 
Change-Id: I2a515c65bfb4d57b832422f60507050c7a64c2aa
 2020-03-02 10:27:49 +00:00
Automerger Merge Worker
7cda6b423a Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 
Change-Id: I4f5a29975aed084e1080387d6eb4500121c23ee0
 2020-03-02 10:11:44 +00:00
Treehugger Robot
c6603dfda8 Merge "Fix for User edit info dialog during rotation" 2020-03-02 07:45:36 +00:00
Automerger Merge Worker
9b3024ab89 DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b 
Change-Id: I5fd10dd781a874c4094ce61434e2ea2675f16bd1
 2020-02-29 04:21:19 +00:00
android-build-team Robot
12d6d60829 Snap for 6248514 from 594a5c71f5 to qt-qpr3-release 
Change-Id: Id4c8ac6dad2016bc413e4bf580f41ebf56e2021d
 2020-02-29 00:17:38 +00:00
android-build-team Robot
360a04f337 Merge cherrypicks of [10460465, 10460521, 10460352, 10458819] into qt-qpr2-release 
Change-Id: I9a02cca7de11383edc3910c29bc414ce1152971c
 2020-02-28 21:26:33 +00:00
changbetty
7880c988ea [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null 
Bug: 149307162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Merged-In: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
(cherry picked from commit 288fa30c2d)
 2020-02-28 21:09:40 +00:00
Automerger Merge Worker
9e2de70584 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 
Change-Id: Ifeeb244d4dddebb4b05b4a7489d0fb28a195c4ad
 2020-02-28 06:16:40 +00:00
Automerger Merge Worker
46e57b10cc Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a 
Change-Id: I9728ea85ac963bc6da1d5bf3a965c6a93c3b3dfd
 2020-02-28 06:10:38 +00:00
TreeHugger Robot
594a5c71f5 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev 2020-02-28 06:04:46 +00:00