Commit Graph

27596 Commits

Author SHA1 Message Date
Andy Chou
d8ff88aa81 Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am: a9e8c50764 am: 8c0d669d6e
am: 3d43db4e50

Change-Id: Icd7d4f913c47a25278d85098a84a9e789191d3b2
2019-06-05 20:46:46 -07:00
Yi Jiang
6985649b7e Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev am: d81e2c36f6
am: b7098b181f

Change-Id: I6cbea478176361733957adb06e63f1e9b58f1c8b
2019-06-05 20:40:29 -07:00
Andy Chou
3d43db4e50 Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am: a9e8c50764
am: 8c0d669d6e

Change-Id: I5ff88b4ba6ff4a642834a3453438489ae2804dc2
2019-06-05 20:27:25 -07:00
Andy Chou
8c0d669d6e Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am: a9e8c50764

Change-Id: I8d6b2b025fd039202eca5f6c8eefea1acb8f0e91
2019-06-05 19:49:12 -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
Yi Jiang
b7098b181f Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
am: d81e2c36f6

Change-Id: I34f211f8234fe883c1a646bd27f5d73ca0067463
2019-06-05 17:10:30 -07:00
Anthony Han
94bb7cf9f1 Merge "Hide color mode when unavailable" into qt-r1-dev am: 3472188437
am: 04749dce13

Change-Id: Ifd067bf50fec2df7b13aecdfe57c4a26fb15d25f
2019-06-05 16:51:22 -07: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
Anthony Han
04749dce13 Merge "Hide color mode when unavailable" into qt-r1-dev
am: 3472188437

Change-Id: I434297d5c0c7332270195df48554fdf45f65a251
2019-06-05 16:04:34 -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
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
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
Alexey Kuzmin
506eddcf6e Move vibration preview invokation to the correct place am: f8eb8c3c90 am: df51217157
am: e8200af63a

Change-Id: Ie3d6485881cf48dfd75383985c5de4afad9b69f1
2019-06-04 19:33:32 -07:00
Kevin Chyn
cae6beda95 Merge changes from topic "face-settings-challenge" into qt-r1-dev am: b979a38c8d
am: 2ec0c38e1f

Change-Id: Ia41cdafdb189e71273f4a251b2953cf49b1b2fac
2019-06-04 19:28:14 -07:00
Alexey Kuzmin
e8200af63a Move vibration preview invokation to the correct place am: f8eb8c3c90
am: df51217157

Change-Id: I35c08d49566a58b6add49f807b48a4c6a2afb918
2019-06-04 18:51:10 -07:00
Kevin Chyn
2ec0c38e1f Merge changes from topic "face-settings-challenge" into qt-r1-dev
am: b979a38c8d

Change-Id: I3fd5ba0467eec804d75a5ceb08c56700d7e07b64
2019-06-04 18:48:33 -07:00
Alexey Kuzmin
ef530610fa Move vibration preview invokation to the correct place
am: f8eb8c3c90

Change-Id: Idb50c3733fd1e127149bc3d48c1ac281638b6cd9
2019-06-04 18:16:10 -07:00
Alexey Kuzmin
df51217157 Move vibration preview invokation to the correct place
am: f8eb8c3c90

Change-Id: I252301516d7be6b5026e4fba5b5e9144889f6b1f
2019-06-04 18:00:48 -07:00
Malcolm Chen
57badc2a82 Triggering notifications when dual CDMA SIM combinations are detected
In Settings, catch the intent from Telephony about SIM combination
warning and show a notification about it.

Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.

Change-Id: Ifd0e13781e4afc3bfd82415b3e51fd10176d9f9d
2019-06-04 17:11:09 -07:00
Kevin Chyn
b979a38c8d Merge changes from topic "face-settings-challenge" into qt-r1-dev
* changes:
  Resolve challenge lifecycle race conditions
  Revert "Add generateChallenge() in onResume()"
2019-06-04 23:52:13 +00:00
Kevin Chyn
f20bb1c635 Resolve challenge lifecycle race conditions
1) FaceSettings now gets closed when it loses foreground. This prevents
   A) Keyguard/LockSettingsService's resetLockout's revokeChallenge from
   leaving FaceSettings with a stale HAT which prevents users from
   enrolling or toggling elements that require the HAT.
   B) generateChallenge has a timeout, which may already have been met
   C) User may have forgotten FaceSettings was open and lost context. Thus
   it makes no sense to show ConfirmLock* since the user may have no idea
   why it's showing anymore.

2) FaceSettings now generatesChallenge in onResume. onCreate is too early
   since again, FaceSettings can be launched via intent while on Keyguard.
   Similarly, we must ensure that Settings's challenge is generated
   late enough (e.g. when it actually gains foregroundness)

Fixes: 133440610
Fixes: 133498264

Test: Open face settings, confirm password, lock screen. After unlocking,
      user needs to re-open face settings.

Test: Modify HAL/framework to show re-enroll notification
      Tap re-enroll notificaton on keyguard
      Delete and re-enroll in settings, successful

Test: FaceSettings enroll works accross orientation change

Test: Tapping enroll button doesn't cause challenge to be revoked
      due to onStop()

Change-Id: I60f606314c458a61e9c1b4f4b66bc27bc44287da
2019-06-04 14:27:28 -07:00
Kevin Chyn
e716ce107d Revert "Add generateChallenge() in onResume()"
This reverts commit d59150eca6.

Bug: 133498264
Bug: 133440610

Reason for revert: Fixing in a different way

Change-Id: Ie444278a9e8b8aac259c31d311757ab8a39567f4
2019-06-04 13:29:57 -07:00
Alexey Kuzmin
f8eb8c3c90 Move vibration preview invokation to the correct place
Bug: 133711461
Bug: 130332550
Test: Open Settings > Accessibility > Vibration. Switch between the
vibration settings several times. The preview should be played, and it
should be in line with the selected setting

Change-Id: I65fcd679c4c61afa4cce9cee652987d81572096c
2019-06-04 15:44:43 +00:00
Alan Stokes
7b707bb204 Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d am: dd1545b098
am: c912a02f50

Change-Id: I620a9a71c4495d1c4fd8db458ae0f3c8dd296f41
2019-06-04 07:53:23 -07:00
Alan Stokes
c912a02f50 Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
am: dd1545b098

Change-Id: Iffc9d8bfa0469af6895496c4be8a4c45535c71f5
2019-06-04 07:43:00 -07:00
Alan Stokes
5b09f510e2 Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: Icdfe52632085ea7add4ffa594fddb2d79b412e3b
2019-06-04 07:38:04 -07:00
Alan Stokes
dd1545b098 Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: I4a8c3e569bfc717802e45abfea0ad6b811c33c96
2019-06-04 07:38:00 -07:00
Alan Stokes
c53f5ecb3d Merge "Cleanup background activity starts for release." into qt-dev 2019-06-04 14:26:29 +00:00
Antony Sargent
5217f29671 Add a "data during calls" preference am: aeb1da0db9 am: 7f7f7cda18
am: 7a48cb470b

Change-Id: I8f9e97915fa3063d0a2f865ed749201fb404f5bc
2019-06-03 19:00:57 -07:00
Antony Sargent
7a48cb470b Add a "data during calls" preference am: aeb1da0db9
am: 7f7f7cda18

Change-Id: Iaafabc24ace39911ab3198cd705311595832cb5d
2019-06-03 18:47:56 -07:00
Antony Sargent
bffd3757e0 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: I1b66985de2cc045953a52d647a3568e7a8d03f10
2019-06-03 18:39:54 -07:00
Antony Sargent
7f7f7cda18 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
2019-06-03 18:39:19 -07:00
Antony Sargent
aeb1da0db9 Add a "data during calls" preference
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.

Bug: 132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
2019-06-03 15:20:33 -07:00
Lei Yu
68c81d5b79 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50 am: 057dc8466a
am: 1fa5118618

Change-Id: Icf8db899a7e0f68082e6eaf61f3f1541d456d880
2019-06-03 10:15:47 -07:00