Commit Graph

54699 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
8dcef5f789 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
am: f6ae3fa64a

Change-Id: I5a5e42a31c62f8c3b2150cd44d16aa6228f77d24
2019-06-05 15:59:29 -07:00
Julia Reynolds
923263f5f7 Merge "Read the subtext of notif importance field on selection" into qt-dev am: 3f95fda1cf am: 9994b66974
am: 918fbfb364

Change-Id: Ibf4b20764cd8aa1d34600fc215836db15a78bd7a
2019-06-05 14:59:20 -07:00
Julia Reynolds
918fbfb364 Merge "Read the subtext of notif importance field on selection" into qt-dev am: 3f95fda1cf
am: 9994b66974

Change-Id: Ibbc9edc50bd13fc8c4e8a8f3cd819c3beea99881
2019-06-05 14:55:20 -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
Julia Reynolds
9994b66974 Merge "Read the subtext of notif importance field on selection" into qt-dev
am: 3f95fda1cf

Change-Id: I5829b1539c480e5c2f3598c57eb5bde7cdcd4d5f
2019-06-05 14:49:41 -07:00
Suprabh Shukla
f8cbeef9a9 Kill uid when REQUEST_INSTALL_PACKAGES is denied am: 732edc3e39 am: 4929001e70
am: e5d958cb0a

Change-Id: I8260ef8790cc455a1025b35a07681cfb80b96ba9
2019-06-05 14:47:47 -07:00
Suprabh Shukla
e5d958cb0a Kill uid when REQUEST_INSTALL_PACKAGES is denied am: 732edc3e39
am: 4929001e70

Change-Id: Id759c1c02118401c6213f43cd21134267fc10740
2019-06-05 14:40:44 -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
4929001e70 Kill uid when REQUEST_INSTALL_PACKAGES is denied
am: 732edc3e39

Change-Id: Id88443ad3face92fa3d28622207c49f94c7eb002
2019-06-05 14:34:46 -07: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
Xiangyu/Malcolm Chen
d9d9a79d31 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2 am: 226715e54e
am: b55caa7afc

Change-Id: I7d5c7d1715a558d281851e54b44ee915d6f41bd5
2019-06-05 11:49:35 -07:00
Xiangyu/Malcolm Chen
b55caa7afc Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
am: 226715e54e

Change-Id: I64ef08b8d8b5215a20017e70f36678d4f2d8c510
2019-06-05 11:35:09 -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
226715e54e Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am: 13cbb2eea2

Change-Id: I8ba31e7278d911bf6cef19e46d06ed964ae9e36f
2019-06-05 11:21:33 -07: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
19747eba0e Hide color mode in search during A11y
Bug: 133527869
Test: make ROBOTEST_FILTER="(ColorMode*)" RunSettingsRoboTests
Change-Id: Iac1146e6bfb391553b05f44fded2db17414b4605
2019-06-05 10:44:05 -07: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
Edgar Wang
e3ee5e32c3 Merge "New strings for "Automatically lock"" into qt-r1-dev am: 19eaefb17e
am: 1d9a0ec5f4

Change-Id: I3acd5eb888cfe50c087db6757eee4affa76cb581
2019-06-05 08:46:33 -07:00
Edgar Wang
1d9a0ec5f4 Merge "New strings for "Automatically lock"" into qt-r1-dev
am: 19eaefb17e

Change-Id: I83d75e232242340a20d006ccfa2697ef4d6301a1
2019-06-05 08:40:30 -07:00
TreeHugger Robot
19eaefb17e Merge "New strings for "Automatically lock"" into qt-r1-dev 2019-06-05 15:30:52 +00:00
TreeHugger Robot
205520bea1 Merge "Fix BatteryTipDialogFragmentTest" 2019-06-05 12:29:31 +00:00
Pasty Chang
2624615676 Merge "Fix overlapped text in lockscreen pattern setup" 2019-06-05 12:10:49 +00:00
tmfang
1392e6c979 Fix BatteryTipDialogFragmentTest
Test case can't get application info. We add test app information
in packagemanager in setup().

Test: atest BatteryTipDialogFragmentTest
Fixes: 134451831
Change-Id: I687f5f3a52ba8af346dbd0d798e4eee34a583870
2019-06-05 10:10:49 +00:00
Raff Tsai
df160a501d Merge "[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: b1e65ea2af -s ours
am: 7879a05148 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I8ef28c25fbdd3879a7d56f4f1e1486758446f223
2019-06-05 02:48:08 -07:00
Raff Tsai
82e42390cc [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: c212052f69 -s ours
am: 4994dfff37 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I2362b0023cb47997d68361bbd95059a2fec0a8ac
2019-06-05 02:47:30 -07:00
Raff Tsai
5df942b0e9 Merge "[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: 723fb8dc91 -s ours
am: f376fc4ecc -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I2c9d46d7f1a73e825283797ecd8aeccfee8834f1
2019-06-05 02:47:05 -07:00
Raff Tsai
243eaaf17b [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: 592e5c1491 -s ours
am: 433adc9043 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I5697c7185cca74e551b21783af668344ba3e4e72
2019-06-05 02:46:34 -07:00
Raff Tsai
cd43d22537 [automerger skipped] Merge changes from topic "am-7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus-aosp
am: e1e01667a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I3328670fc4b4f89dcbaf0c2639713dde041e807b
2019-06-05 02:46:03 -07:00
Raff Tsai
fa6b52cf62 [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: a9125587a4 -s ours
am: f12bc63c3c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ife2bf0bf4c0175303fe86b38b5c968f865637bac
2019-06-05 02:45:12 -07:00
Raff Tsai
69a48ed41a [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: 7a7a4f3019 -s ours
am: e944a78e21 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I957f4e60b93eb0d23c7aead82978f164a2264923
2019-06-05 02:44:58 -07:00
Raff Tsai
279be6c878 [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: a33cd2c168 -s ours
am: 012a9daccb -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ibe0fba561ca4a86334dce41691993b9b3cadaab8
2019-06-05 02:44:42 -07:00
Android Build Merger (Role)
7879a05148 Merge "[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: b1e65ea2af -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history" into qt-r1-dev-plus-aosp 2019-06-05 09:41:28 +00:00
Raff Tsai
adbec0222c [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: b1e65ea2af -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I52161c8578ef4d869b460450291d6bc3ee083431
2019-06-05 02:41:18 -07:00
Raff Tsai
4994dfff37 [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: c212052f69 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I2e5316c8cb6737a74798cc9e6cfe0710d87e45e1
2019-06-05 02:41:11 -07:00
Android Build Merger (Role)
f376fc4ecc Merge "[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: 723fb8dc91 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history" into qt-r1-dev-plus-aosp 2019-06-05 09:41:00 +00:00
Raff Tsai
db61c64436 [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: 723fb8dc91 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I94ab6df5819dd01b44ff349a44a34c4f16df02cc
2019-06-05 02:40:50 -07:00
Raff Tsai
433adc9043 [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: 592e5c1491 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I7884c8f36514759eddf36eb14e862970c7cd4c9f
2019-06-05 02:40:44 -07:00
Android Build Merger (Role)
e1e01667a7 Merge changes from topic "am-7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus-aosp
* changes:
  [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: 7d3edc88a9 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
  [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: 152f4c8345 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
  [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: 05b744c5eb -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
2019-06-05 09:40:35 +00:00
Raff Tsai
5e22a7d4dd [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: 7d3edc88a9 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I6234197399f5ce1dec7f8636eaafb7488440b197
2019-06-05 02:40:04 -07:00
Raff Tsai
f12bc63c3c [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: a9125587a4 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ia9ac845dcc6673d0a366a5088ad9bb3a10695717
2019-06-05 02:39:59 -07:00
Raff Tsai
f9f19a8608 [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: 152f4c8345 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Icf7175a078557c6b88e16310816a28e8ade8afa5
2019-06-05 02:39:52 -07:00
Raff Tsai
e944a78e21 [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: 7a7a4f3019 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I5b843ca857a4e6856b56edd34ad0b1c46290e6e9
2019-06-05 02:39:49 -07:00
Raff Tsai
de3cc29552 [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: 05b744c5eb -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I25038a31fadc86c57c34ec809c2716f4caca1bbb
2019-06-05 02:39:40 -07:00
Raff Tsai
012a9daccb [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: a33cd2c168 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Icec8d5826b0132d058bcbc114e2bda13cb9a98c7
2019-06-05 02:39:39 -07:00
Raff Tsai
c212052f69 [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: I2df0ab2ef87024ca20b4a05941505b581c27d8d7
2019-06-05 02:36:10 -07:00