PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,476 Commits 1 Branch 0 Tags
a512817aba5c3ccda01bff41159a53d6b29b97ce
Commit Graph

103476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a512817aba Merge "Crash in PreferredSimDialogFragment" 2022-09-06 10:28:38 +00:00
Pingzhi Wang
77ce80d6cb Crash in PreferredSimDialogFragment 
NullPointerException when removing physical SIM card

Bug: 244622300
Test: Manual
Change-Id: Ie32c4d07e4c77a0460265a47501e332ae62e17e4
 2022-09-05 11:29:42 +02:00
Treehugger Robot
36a80cd8e6 Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" 2022-09-02 03:36:40 +00:00
SongFerng Wang
89418428f6 Merge "Add owner for job handover" 2022-09-01 10:58:19 +00:00
SongFerngWang
2d59130485 Add owner for job handover 
Will CP it into AOSP later.

Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
 2022-09-01 16:09:35 +08:00
Shen Lin
b25f123d9f Add null check for mIntent in ZenRulePreference to avoid potential crash risk 
Bug: 244120502

Test: manual test, ZenRuleScheduleHelperTest for unit test.
Change-Id: Ib7338253783bb09b84b629f2dd891292d82f28b2
 2022-08-29 19:19:59 +08:00
Treehugger Robot
d221269892 Merge "Fix always return first package for mock location app in developer options." 2022-08-23 13:15:51 +00:00
张倞诚
d8d0cb3532 Fix always return first package for mock location app in developer options. 
The mock location app should be OP_MOCK_LOCATION allowed app, the packageOps.get(0).getPackageName()
is the first app that used the OP_MOCK_LOCATION in history, but maybe rejected.

Change-Id: I0158436dd7d2790f4e9640075bc9c8bd3422f467
 2022-08-23 07:50:16 +00:00
Treehugger Robot
a93e78f781 Merge "Fix array-related errorprone warnings" 2022-08-17 18:37:46 +00:00
Xin Li
c27f705eb7 Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:11:14 +00:00
Xin Li
48b65ca561 DO NOT MERGE - Merge Android 13 
Bug: 242648940
Merged-In: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Change-Id: I7d823fd36c6d9395a86ec0757f55daf644193a01
 2022-08-15 22:04:37 -07:00
Treehugger Robot
d3a358910b Merge "Remove luyota from OWNERS." am: dcd3081158 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476

Change-Id: Ibc32c7ab34a3006acca4f0edbb38645d2c6ecf9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 02:31:16 +00:00
Treehugger Robot
dcd3081158 Merge "Remove luyota from OWNERS." 2022-08-16 01:53:34 +00:00
Cole Faust
a21ac03acb Fix array-related errorprone warnings 
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ida6513002f8fd845a385924be290b720f06c4748
 2022-08-15 18:52:37 -07:00
Bob Badour
2e005f4cec Remove luyota from OWNERS. 
Test: n/a
Change-Id: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Merged-in: I6a8139e569a31ea3983df0db970a36b841e646d4
 2022-08-12 19:57:37 +00:00
Treehugger Robot
e194aa42eb Merge "Fix permissions for internal links." am: 24f45fbd63 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I633c22a73b0d160c0fbf662768a92e4f0dfac85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 03:03:53 +00:00
Treehugger Robot
24f45fbd63 Merge "Fix permissions for internal links." 2022-08-12 02:44:31 +00:00
Bob Badour
11411e187b Fix permissions for internal links. 
Test: m droid dist

Change-Id: If872d5e91a78d8f407e618a2c655c8cf4ac7d7fc
 2022-08-10 14:21:47 -07:00
Treehugger Robot
4967e754eb Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975

Change-Id: Ie48078a7c33f40939b9d49140875ec7a02582ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 17:41:35 +00:00
Treehugger Robot
3bd3f983bf Merge "Fix SIM name in Network Details to show the selected SIM." 2022-08-10 16:46:49 +00:00
Bruno Kremp
b204960ea4 Fix SIM name in Network Details to show the selected SIM. 
When dual SIM cards with same Carrier Id inserted, authentication of
SIM base network is via default data SIM. However, SIM name shown in
Network Details is always the one inserted first.
Hence, make SIM name of default data SIM shown in Network Details
preferred to keep consistent with the one used for authentication.

Co-authored-by: Yibo Wang <yibo.x.wang@sony.com>

Test: manual test
Bug: 240732444
Change-Id: Ibd64189d6c25b5a64881a0ad9d40854df93481f4
 2022-08-10 15:09:49 +02:00
Jeff Sharkey
04cdd54030 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: Ice243d4b3231199f16d9b59a208867c0986b0d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:48:33 +00:00
Jeff Sharkey
f37834c09f Merge "Migrate stringslint.py to AyeAye." 2022-08-09 17:29:23 +00:00
Jeff Sharkey
5991f46a52 Migrate stringslint.py to AyeAye. 
This script has been deprecated and replaced by AyeAye checks
directly in Gerrit.

Bug: 164530987
Test: none
Change-Id: Ia1baf761e5ca6a1cef7de231d0f320cfaa7e071a
 2022-08-03 13:52:10 -06:00
Arc Wang
6945e70c02 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I70b0ae924d8a4410cc29e7f494e85a9b8a7d3abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 03:26:39 +00:00
Arc Wang
671fa153e8 Merge "Crash happens if back button is pressed during "Format as Portable"" 2022-08-02 03:11:13 +00:00
Bonian Chen
4ec8323bad resolve merge conflicts of 81d1cd0871 to stage-aosp-master 
Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
 2022-07-29 07:34:35 +00:00
Treehugger Robot
81d1cd0871 Merge "Settings: Make NetworkScanHelper max search time customizable" 2022-07-29 05:37:46 +00:00
Himanshu Rawat
7c6a004452 Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I7680942ca7ac5da3799b10306b1a3849800a1f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 02:17:18 +00:00
Himanshu Rawat
059ab284e7 Merge "Don't cancel passkey entry pairing autonomously" 2022-07-26 02:00:52 +00:00
LuK1337
988a76f5bb Settings: Make NetworkScanHelper max search time customizable 
Default max search time (300) fails on some devices.

Test: Network scan works on OnePlus 9 after overlaying
      max network scan search time to 254.
Change-Id: Ia0038fac6d2000748e0aa08fd6a53f11876728d7
 2022-07-25 17:44:40 -07:00
Sorin Basca
5781b7ab3a [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: I9f616094bf9b1e54edd58918e6504885207f04e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 05:55:36 +00:00
Sorin Basca
ea4c4757bb [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Id9c27926a1f4cf518aa4c9b0ba69ed51f7dda310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 05:55:23 +00:00
Sorin Basca
6a043ec5dc Merge "Use Mockito 4.6.1 API" 2022-07-20 05:32:35 +00:00
Himanshu Rawat
aa1950fd80 Don't cancel passkey entry pairing autonomously 
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.

Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"

Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
 2022-07-20 03:33:55 +00:00
Sorin Basca
e2b0873f9c Use Mockito 4.6.1 API 
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit c1c3a84fdc)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit 61e0bcd194)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2022-07-19 09:07:28 +00:00
Sorin Basca
b9503775c0 Use Mockito 4.6.1 API 
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit 61e0bcd194)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2022-07-16 07:57:52 +01:00
Treehugger Robot
2a0a88af4d Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780

Change-Id: I6ba5b7c40e87df6c231e0c774913b1320c9c3996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 02:51:11 +00:00
Treehugger Robot
e705fcd7c3 Merge "Fix incorrect storage calculation when SD card is inserted" 2022-07-16 02:35:19 +00:00
Treehugger Robot
91420db7c7 Merge "Fix ExtraText lint errors" am: 000bc450b0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: Ia0f5c48b9581ab8722c06e226acd59e9ac18cde3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 11:32:07 +00:00
Treehugger Robot
000bc450b0 Merge "Fix ExtraText lint errors" 2022-07-14 11:14:59 +00:00
ot_hemant.yadav
9a72877c7c Crash happens if back button is pressed during "Format as Portable" 
SD card format as internal, during migrate process press back key or  During "Format as Portable", 
press back key crash happened.

Fix:
Hide the bottom navigation from that particular activity so that user can not accidentally 
press back key.
/packages/apps/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
/packages/apps/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java

Bug: 238596768
Test:
1. Insert sdcard or generate virtual disk using command : adb shell "sm set-virtual-disk true"
2. Go to Settings -> Storage -> SD Card -> Format as Internal -> move later
3. After step 1, back to storage
4. Again enter in Storage -> SD Card -> to do migrate data
5. during migrate process press back key
6. Storage -> SD Card -> Format as Portable
7. During "Format as Portable", press back key

Change-Id: I1f393ffb872bb90d7dfeb4e1c86648b3413645a1
 2022-07-11 17:21:04 +00:00
Bill Yi
43bed90ebd [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147156

Change-Id: Ie4594325b6809e67239f58366a67f4487e963b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:21 +00:00
Bill Yi
588a5a1577 [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc76 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147156

Change-Id: I2d2d69938247a8c9e5b6eaf778631f172d0ecc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:05 +00:00
Bill Yi
2fcb15c9c1 Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" 2022-07-08 20:14:12 +00:00
Bill Yi
c73b07dc76 Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE 
Merged-In: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
Merged-In: I7a2a0e8da3ae59219e9984e8437ce0b1e007bce2
Change-Id: I677947b60b051c89293ca58359cb56b8cbc63ec8
 2022-07-07 15:33:30 -07:00
Xingbin Feng
3cbff800a3 Fix incorrect storage calculation when SD card is inserted 
The displayed internal storage is incorrect when an SD card
is inserted into the device.

Bug: 209962845
Test: Insert an SD card with some content. The System
storage calculation should remain unchanged.

Change-Id: I0a338bc306c0ade68747356714cd291e209a5069
 2022-07-07 14:42:57 +02:00
TreeHugger Robot
6f09916f9d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-07-05 00:45:36 +00:00
Bill Yi
72d5864095 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
 2022-07-03 14:12:52 -07:00
Bill Yi
1f4237da27 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic08c9ecc8d5fe64b43b00c9f87860ee2a5f5b46b
 2022-07-03 14:08:30 -07:00