Commit Graph

52203 Commits

Author SHA1 Message Date
George Chang
dc29b325a1 Fix NFC state switched off every time user entered connection preferences page
am: e4c2e427a1

Change-Id: I52186dbe7b550fd6ab2ae0bccdba80ac1e779b1f
2019-06-06 23:29:07 -07:00
George Chang
e4c2e427a1 Fix NFC state switched off every time user entered connection preferences page
NfcAirplaneModeObserver added a scenario that
switched NFC off every time  a user entered connection
preferences page if airplane mode was on.
Even when a user manually switched on NFC, the observer would still
turn NFC off when re-entering connection preferences page.

GSAM TS.27 certification requires NFC state to be consistent
under AirplaneMode before and after reboot the device.
NfcAirplaneModeObserver breaks the requirement
because it would always switch NFC off under airplane mode
when a user checked the NFC state in settings page.

Fix it by removing NfcAirplaneModeObserver.
Keep the NFC state consistent.


Bug:128384879
Test: make RunSettingsRoboTests / Check Nfc on/off Status
Merged-In: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
Change-Id: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
2019-06-07 00:11:32 +00:00
Yi Jiang
03c47e7687 Merge "Fix screen attention contextual card" into qt-r1-dev 2019-06-06 20:06:21 +00:00
Julia Reynolds
df0fdaef74 Merge "Silent notifs appear on lockscreen by default" into qt-dev
am: f58cd0fb51

Change-Id: I39f53bcf9665291fb3961e7358aec09e60a310e7
2019-06-06 12:00:54 -07:00
TreeHugger Robot
f58cd0fb51 Merge "Silent notifs appear on lockscreen by default" into qt-dev 2019-06-06 18:36:57 +00:00
Mehdi Alizadeh
cde53dc119 Updates System Navigation strings
am: 14a1b19735

Change-Id: Ifd443b394ce19ceb0c0fe94abbaaa31d9158c475
2019-06-06 11:28:39 -07:00
Mehdi Alizadeh
14a1b19735 Updates System Navigation strings
Bug: 134517326
Test: Verified manually
Change-Id: I777cfdc3a760040fdea745c5247152c5ff0d6218
2019-06-06 18:06:57 +00:00
Julia Reynolds
a1a598d44e Silent notifs appear on lockscreen by default
Test: atest
Bug: 134613164
Change-Id: I1ee39a1302010a2a29ba6d0060f19565e41859a2
2019-06-06 17:03:20 +00:00
Andy Chou
768691520b Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am: a9e8c50764

Change-Id: I7e32848cd240b43e93533f5575202b1122620dee
2019-06-05 19:51:46 -07:00
Antony Sargent
2082b0e969 Merge "Strings for pSIM on/off toggle removal" into qt-dev
am: 68a26e5535

Change-Id: I1ab73ba3e6e666a42590030d9dd6903f257b070a
2019-06-05 19:51:13 -07:00
Andy Chou
a9e8c50764 Merge "UE showed wrong title and message when enabling data roaming." into qt-dev 2019-06-06 00:35:16 +00:00
Antony Sargent
68a26e5535 Merge "Strings for pSIM on/off toggle removal" into qt-dev 2019-06-06 00:19:16 +00:00
Yi Jiang
d81e2c36f6 Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev 2019-06-05 23:35:51 +00:00
Yi Jiang
068062d423 Fix screen attention contextual card
Bug: 134537004
Bug: 134537730
Test: Manually verified.
Test: make RunSettingsRoboTests
Change-Id: Ib5dd6444b70a5575863be985f58b48f00f505e53
2019-06-05 16:20:30 -07:00
Julia Reynolds
559a72e27f Merge "Read the subtext of notif importance field on selection" into qt-dev
am: 3f95fda1cf

Change-Id: Icc507ca10f4c657593ed1c6b6cb9d93c0b01f8fe
2019-06-05 14:49:45 -07:00
TreeHugger Robot
3f95fda1cf Merge "Read the subtext of notif importance field on selection" into qt-dev 2019-06-05 21:37:17 +00:00
Suprabh Shukla
d879318434 Kill uid when REQUEST_INSTALL_PACKAGES is denied
am: 732edc3e39

Change-Id: I891d88a7fa0769ce22eb7b79cb5f6dcf5d1457ac
2019-06-05 14:34:45 -07:00
Antony Sargent
3631ed9dee Strings for pSIM on/off toggle removal
We need to remove the on/off toggle for pSIMs because of unexpected
problems in the telephony stack with being able to disable a pSIM. These
new strings are used in the updated UX we're adding to deal with this.

Bug: 132921553
Test: n/a
Change-Id: I60816289e0ef65bbf882a8dca6f08c46742bb1c9
2019-06-05 14:20:09 -07:00
Suprabh Shukla
732edc3e39 Kill uid when REQUEST_INSTALL_PACKAGES is denied
Process privileges like open fds need to be revoked, when this
permission is denied by the user.

Test: Manually verified by checking logs.
Robotest:
atest SettingsRoboTests:ExternalSourcesDetailsTest

Bug: 133504844
Change-Id: I81da0b3a5d6c54e392828829d1a2c43488439504
2019-06-05 21:15:17 +00:00
TreeHugger Robot
3472188437 Merge "Hide color mode when unavailable" into qt-r1-dev 2019-06-05 20:25:31 +00:00
Yi Jiang
9df180a008 use different description strings for screen attention settings and contextual card
1. Revert the screen attention description string to the old approved
string.
2. Create a new summary string for 'Screen Attention' contextual slice.
3. Fix some character issues.
Bug: 134457354
Bug: 134585794
Test: make RunSettingsRoboTests -j 32
Change-Id: I401fc6707203790e51aed8738b4658c6a30f512e
2019-06-05 13:22:19 -07:00
Julia Reynolds
569732474e Read the subtext of notif importance field on selection
When using a11y services

Test: manual with Talkback
Bug: 133649570
Change-Id: Ic68a948ab5d55e68994e6b14456d25d438637886
2019-06-05 18:31:19 +00:00
Xiangyu/Malcolm Chen
f6ae3fa64a Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am: 13cbb2eea2

Change-Id: I9b9799889ce5e3474ccfcdd4b33dfafcd0092e0e
2019-06-05 11:21:32 -07:00
Xiangyu/Malcolm Chen
13cbb2eea2 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev 2019-06-05 18:03:17 +00:00
Anthony Han
000d8336de Hide color mode when unavailable
When no color modes are available, make the setting unsearchable.

Bug: 131035509
Test: make ROBOTEST_FILTER="(ColorMode*)" RunSettingsRoboTests
Change-Id: I2dca681b981b646858c3ae1af4fafbee74fd06ee
2019-06-05 10:36:18 -07:00
TreeHugger Robot
19eaefb17e Merge "New strings for "Automatically lock"" into qt-r1-dev 2019-06-05 15:30:52 +00:00
Raff Tsai
b1e65ea2af [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours am: 64d4433a90 -s ours
am: acac31e75a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ib8f332a5ac80342106e25b07e5f40fb740fca033
2019-06-05 02:36:08 -07:00
Raff Tsai
723fb8dc91 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours
am: 290b4e507c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I591d8c07e4e21109315a9b7b600b52ba7000c3cc
2019-06-05 02:35:44 -07:00
Raff Tsai
7d3edc88a9 [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours am: c808f15cbe -s ours am: 0b36c5e9ba -s ours am: e7c298885b -s ours
am: ca593c204a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I4ef72ed7f78528edf72d003de251542d22515025
2019-06-05 02:35:02 -07:00
Raff Tsai
152f4c8345 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours am: 530fa8b25b -s ours am: 20b5a01f6c -s ours am: 2d387349db -s ours
am: f7cd796ea8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I3cf51b30f82e33d55b49863d58fa27544a8ff0eb
2019-06-05 02:34:53 -07:00
Raff Tsai
05b744c5eb [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours am: 59348982d3 -s ours am: d20d75c39b -s ours am: 971190b08a -s ours
am: ab2ad075b3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I04a28cd6ae30944bbf1c9208843fd5d8abf86beb
2019-06-05 02:34:37 -07:00
Raff Tsai
acac31e75a [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours
am: 64d4433a90 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I0588eac0a4abcb1003b09e5fab92894a8ddfc8f9
2019-06-05 02:30:17 -07:00
Raff Tsai
290b4e507c [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours
am: ba0122401d -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ib7ded3d2c08e14e39922ad0f1dd1fb2dd3e27ab9
2019-06-05 02:29:51 -07:00
Raff Tsai
ca593c204a [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours am: c808f15cbe -s ours am: 0b36c5e9ba -s ours
am: e7c298885b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I4a6b3d7b7aaf30bf3abddf9b276e666462a9d831
2019-06-05 02:29:05 -07:00
Raff Tsai
f7cd796ea8 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours am: 530fa8b25b -s ours am: 20b5a01f6c -s ours
am: 2d387349db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I27f9a530b3814c723726e43e8902651da3bfa937
2019-06-05 02:28:55 -07:00
Raff Tsai
ab2ad075b3 [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours am: 59348982d3 -s ours am: d20d75c39b -s ours
am: 971190b08a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ic3814c5b17fe748c35e11034d75549104e7de429
2019-06-05 02:28:42 -07:00
Raff Tsai
64d4433a90 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours
am: 3e1ae79428 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ia0dc8b4e6b5795fb03c30867d77460389bb49155
2019-06-05 02:25:23 -07:00
Raff Tsai
ba0122401d [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours
am: 5a326027db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I923b0a55fd8458fa30295fa1f9ca7a31f13d2734
2019-06-05 02:24:54 -07:00
Raff Tsai
e7c298885b [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours am: c808f15cbe -s ours
am: 0b36c5e9ba -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Id32040250480a5ad2e957eaeb4eea5b4dcc6633b
2019-06-05 02:22:55 -07:00
Raff Tsai
2d387349db [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours am: 530fa8b25b -s ours
am: 20b5a01f6c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I656e7e0fac7c63c55f82bfc01183e69adfe2164b
2019-06-05 02:22:46 -07:00
Raff Tsai
971190b08a [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours am: 59348982d3 -s ours
am: d20d75c39b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: If4596f7e943656ccb7bc06121fe77c5d6d76d627
2019-06-05 02:22:36 -07:00
Edgar Wang
e1a000f94f New strings for "Automatically lock"
Bug: 132106803
Test: manual
Change-Id: If6fe328ef6570cd96906435eb635576b324269c0
2019-06-05 17:19:48 +08:00
Raff Tsai
3e1ae79428 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours
am: 14302b3ac6 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ic1ddb22a97d9058d5e40b8fddfb3f6f4ef40e150
2019-06-05 02:19:30 -07:00
Raff Tsai
5a326027db [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours
am: 80fea5de92 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ic06c39295c0b1e82701cf1747606afff1e27fd68
2019-06-05 02:19:03 -07:00
Raff Tsai
0b36c5e9ba [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours
am: c808f15cbe -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ia806284e60b86d6d942de73a98d8ef3b48cd6847
2019-06-05 02:17:52 -07:00
Raff Tsai
20b5a01f6c [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours
am: 530fa8b25b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Iaa5411ff17dddbda7b6584afff8f0a7527609c23
2019-06-05 02:17:44 -07:00
Raff Tsai
d20d75c39b [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours
am: 59348982d3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I50749ba4c4a8478acbd70a729fb6e4f1e722254d
2019-06-05 02:17:35 -07:00
Raff Tsai
14302b3ac6 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am: 09e255676b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I9ffa1beaa1f10e45dfb29edd2ea1bfd7b4422407
2019-06-05 02:13:22 -07:00
Raff Tsai
80fea5de92 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am: 8c612b1334 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I252ffcb3e7c5f1be519c9e809d6b43a296bcbe9d
2019-06-05 02:12:49 -07:00
Raff Tsai
c808f15cbe [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
am: 65294e6ee5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I02047207e9ed30afb0afb003f0c93f2cfb59addd
2019-06-05 02:12:01 -07:00