Commit Graph

27865 Commits

Author SHA1 Message Date
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
Sunny Shao
2c6d308ecb Set the mAccountName as null while device has no any account
It doesn't clean the mAccountName buffer while device has no any account. And it will be put into
the Intent and pass to MeCard when user click the ghost boy avatar. It does not make sense and
modify code to fixed it.

Fixes: 129265427
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard

Change-Id: Ib8cfab2cb416515018f335b21ef49a95699a1597
2019-06-04 15:56:18 +08: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
Lei Yu
1fa5118618 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
am: 057dc8466a

Change-Id: If66ff93e4f4caddd9ebe62f9409812d4ed480c9b
2019-06-03 10:08:14 -07:00
Lei Yu
7f8a269a3a Merge "Use new API to build NetworkTemplate" into qt-dev
am: c9fbd2ee50

Change-Id: I237921af2781264fdbec688ddc06ca7c66961856
2019-06-03 10:06:14 -07:00
Lei Yu
057dc8466a Merge "Use new API to build NetworkTemplate" into qt-dev
am: c9fbd2ee50

Change-Id: I7737bc0fd3321f13edf2e9440ee870d059817dc3
2019-06-03 10:03:30 -07:00
Lei Yu
c9fbd2ee50 Merge "Use new API to build NetworkTemplate" into qt-dev 2019-06-03 16:54:29 +00:00
Fan Zhang
aa08a2cc0e Use slice uri from slice index db directly.
During SettingsSliceProvider#onGetSliceDescendants, use the uris from
database directly instead of getting the key and construct the uris
manually.

Bug: 126222433
Test: robotest
Change-Id: Iad4e9fc28ec4442b6bb323878503d743582b35ac
2019-05-31 16:03:33 -07:00
Joel Galenson
9e05bf902a Merge "Revert "Remove Permissions Hub."" into qt-r1-dev am: 4a9055a99c
am: efbf351167

Change-Id: Ib2dd0082d7b4b8d4d38fd6b3fdaa1c43eb94a69a
2019-05-31 15:34:06 -07:00
Joel Galenson
efbf351167 Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
am: 4a9055a99c

Change-Id: I90215bb8b92b6a5288647891bf5042e5a5802486
2019-05-31 15:04:56 -07:00
TreeHugger Robot
4a9055a99c Merge "Revert "Remove Permissions Hub."" into qt-r1-dev 2019-05-31 21:54:29 +00:00
Mehdi Alizadeh
793cb2c9c7 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a am: c4be5512a7
am: ecf3028123

Change-Id: I90f792dd3f24533411deafd15988b70278a7fd27
2019-05-31 14:43:50 -07:00
Mehdi Alizadeh
ecf3028123 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
am: c4be5512a7

Change-Id: I61477938f506b07ce01ad8d3b6214fb38df1936a
2019-05-31 14:34:09 -07:00
Mehdi Alizadeh
9b378dd381 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
am: cad67cdc0a

Change-Id: Icba26f525b33f2a09a014fb88a4076362a289681
2019-05-31 14:30:18 -07:00
Mehdi Alizadeh
c4be5512a7 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
am: cad67cdc0a

Change-Id: I9458cdbcc819e1d203266a8ff5b3b4ade1f3aeef
2019-05-31 14:26:04 -07:00
Mehdi Alizadeh
cad67cdc0a Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev 2019-05-31 21:08:08 +00:00
Mehdi Alizadeh
ffea2ae488 Disables the Gesture nav option if 3P launcher is default
Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.

Bug: 129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest

Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637
2019-05-31 12:26:28 -07:00
Lei Yu
09c60c349f Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207 am: fad8cec592
am: a22bf1cd8b

Change-Id: Iaadee52c55098da5941dab5edfa1087dac7822c3
2019-05-31 11:10:26 -07:00
TreeHugger Robot
75a5ef8c16 Merge "Override 2 getSliceUri() instance to return platform slice" 2019-05-31 18:03:44 +00:00
Lei Yu
a22bf1cd8b Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
am: fad8cec592

Change-Id: I9b4a73685b8091760f375b58ad58d501046386d9
2019-05-31 10:53:59 -07:00
Lei Yu
fad8cec592 Merge "Fix issues in battery usage accounting" into qt-dev
am: 2148c1a207

Change-Id: Ia73d2e5ab630668b73a6dd6b69aa831a6262a80b
2019-05-31 10:41:54 -07:00
Lei Yu
677d5a5e01 Merge "Fix issues in battery usage accounting" into qt-dev
am: 2148c1a207

Change-Id: Ifd2d4c3928ba706071a575c28db21c7586a2e692
2019-05-31 10:40:50 -07:00
Lei Yu
ded55a1401 Use new API to build NetworkTemplate
This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.

Bug: 133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5
2019-05-31 10:19:17 -07:00
Lei Yu
2148c1a207 Merge "Fix issues in battery usage accounting" into qt-dev 2019-05-31 17:17:51 +00:00
Joel Galenson
2118f8a63f Revert "Remove Permissions Hub."
This reverts commit 1e7c172ad5.

Bug: 132292477
Test: None.
Change-Id: Icae2cd4edbb22e2f3ea72e20f0ebd818f1ac6629
2019-05-31 07:55:19 -07:00
Joel Galenson
5a9c0f861e Merge "Remove Permissions Hub." into qt-dev am: 63088840c4 am: 58246f66db
am: 0709624634

Change-Id: I9ebf8ab89c1bd7cdbb0f46df75cd842dc50a3bee
2019-05-31 06:17:32 -07:00
Joel Galenson
0709624634 Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
am: 58246f66db

Change-Id: I87733a341c28ebd6bbaa3bfe846fc835dc4a745e
2019-05-31 06:12:29 -07:00
Joel Galenson
d8efe209f7 Merge "Remove Permissions Hub." into qt-dev
am: 63088840c4

Change-Id: I4d086debe20235d132fd62d96441c358ffe01b48
2019-05-31 06:07:30 -07:00
Joel Galenson
58246f66db Merge "Remove Permissions Hub." into qt-dev
am: 63088840c4

Change-Id: I59cef5b593630d75b6db51ae324c94f9dc3a8841
2019-05-31 06:07:29 -07:00
TreeHugger Robot
63088840c4 Merge "Remove Permissions Hub." into qt-dev 2019-05-31 13:02:12 +00:00
zoey chen
3aa9c79341 UE showed wrong title and message when enabling data roaming.
It set wrong string when building the roaming dialog.

BUG: 133731388
Test: Manual test
Change-Id: Ib46b2b2ba1d62f84da7cd82bbbc03fe4f3069afc
2019-05-31 17:37:26 +08:00
Lucas Dupin
ff5dde9f05 Merge "Fix exception on non face-enabled devices" into qt-r1-dev am: 1a3112ab32
am: d3e686fc33

Change-Id: I067abe881c9ac0f511cf184343c12a6ac74d1e9d
2019-05-30 21:33:17 -07:00
TreeHugger Robot
c0fbb533d2 Merge "Guard NPE when using search view" 2019-05-31 04:27:43 +00:00
Lucas Dupin
d3e686fc33 Merge "Fix exception on non face-enabled devices" into qt-r1-dev
am: 1a3112ab32

Change-Id: I8c0512ac98aecfb3306ee89e3a4ff1e711f45d89
2019-05-30 21:27:15 -07:00
TreeHugger Robot
1a3112ab32 Merge "Fix exception on non face-enabled devices" into qt-r1-dev 2019-05-31 04:15:54 +00:00
TreeHugger Robot
46a221434b Merge "Fixed the IllegalStateException on removing account" 2019-05-31 03:04:48 +00:00