Commit Graph

54908 Commits

Author SHA1 Message Date
Lyn Han
bb81e0660d Merge "Revert "Secure => global bubble settings pt 2"" into qt-r1-bubbles-dev 2019-07-15 18:43:44 +00:00
Lyn Han
ca77022900 Revert "Secure => global bubble settings pt 2"
This reverts commit a978ab4526.

Reason for revert: fix test

Change-Id: Id6b49106ab7d8a42ea5de8b16a0dd3ed49d58817
2019-07-15 18:06:32 +00:00
TreeHugger Robot
51eeea8680 Merge "Secure => global bubble settings pt 2" into qt-r1-bubbles-dev 2019-07-15 18:04:34 +00:00
Android Build Merger (Role)
4919b857e6 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours am: 09be23ffaa -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-15 08:28:50 +00:00
Bill Yi
7d98d178e9 [automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
am: 09be23ffaa -s ours
am skip reason: subject contains skip directive

Change-Id: I9d171a15cab4e4ce14376567126ccc0fd4d30d86
2019-07-15 01:28:32 -07:00
Bill Yi
d6c2681911 [automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
am: 09be23ffaa -s ours
am skip reason: subject contains skip directive

Change-Id: Ibe55cf198621fef719bb27d1d7773a724458dfda
2019-07-15 01:28:12 -07:00
Bill Yi
5a71e96c3a [automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
am: 7903044b2b -s ours
am skip reason: subject contains skip directive

Change-Id: Ifdcebac440af1d2a114637d9ddbc32661ef4f46a
2019-07-15 01:28:12 -07:00
Bill Yi
09be23ffaa [automerger skipped] Import translations. DO NOT MERGE
am: 8d229d7090 -s ours
am skip reason: subject contains skip directive

Change-Id: I4989ac93f690299f130945cc4b2ae4984974345f
2019-07-15 01:21:17 -07:00
Bill Yi
7903044b2b [automerger skipped] Import translations. DO NOT MERGE
am: 8d229d7090 -s ours
am skip reason: subject contains skip directive

Change-Id: Ied4eb2aed709ef90008edf7c49509522e96eb512
2019-07-15 01:21:16 -07:00
Bill Yi
8d229d7090 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9ecaff62cfd0370a1ff7e5f6eb36a871c8486dee
2019-07-14 22:26:37 -07:00
Bill Yi
d1002fc748 [automerger skipped] Import translations. DO NOT MERGE
am: 941e94d689 -s ours
am skip reason: subject contains skip directive

Change-Id: I6e5471fb31bd2e5820f5f4930d33c016e99edd65
2019-07-14 21:51:26 -07:00
Bill Yi
6b16484afd [automerger skipped] Import translations. DO NOT MERGE
am: 941e94d689 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib4ce2d83d5967669ab5ecf18eca8af89bc63b2b1
2019-07-14 21:40:54 -07:00
Bill Yi
941e94d689 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id33f437d9b802519be1544de7616b3a5b0528680
2019-07-13 22:19:58 -07:00
android-build-team Robot
1a9f571ace Snap for 5726890 from 44f731c1c7 to qt-c2f2-release
Change-Id: I537bb914cdeac1f821619ad7c954f77aca69bf67
2019-07-13 23:06:35 +00:00
joshmccloskey
6a3012f21d Fixed Settings Crash
Fixes: 137319680
Test: Manual
Change-Id: I0e22bd561787b1a141bf2e3060b23fe70a6d96ce
2019-07-12 15:49:24 -07:00
Lyn Han
a978ab4526 Secure => global bubble settings pt 2
Follow up to http://ag/8222583
- Replace references to Secure.NOTIFICATION_BUBBLES with
Global.NOTIFICATION_BUBBLES

Fixes: 136034310
Bug: 129158983
Test: atest SystemUITests
Test: manual - work profile bubbles show up
Change-Id: I03ffd7f1126f2c20d819f741cd4f7dcced81a405
2019-07-12 11:32:39 -07:00
android-build-team Robot
6d7f8afe65 Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018, 8558886, 8558887, 8558888, 8558889, 8558071, 8558072, 8556231] into qt-release
Change-Id: Id07c91777f0b9ff3283ff1dfc53b5e1680c5f2f0
2019-07-12 04:11:18 +00:00
Android Build Merger (Role)
7d92e3d2a2 Merge "Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857 am: 8c6b2bafb0" into qt-r1-dev-plus-aosp 2019-07-12 04:11:01 +00:00
Andrew Sapperstein
b07cee3139 Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857
am: 44f731c1c7

Change-Id: I34bb2383b9f14e624ab93caa0108d2a2510f4439
2019-07-11 21:10:41 -07:00
Andrew Sapperstein
07b41c6055 Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857
am: 8c6b2bafb0

Change-Id: I07c20368230159ea28af24c95087e74a3e830ab5
2019-07-11 21:10:39 -07:00
Antony Sargent
8d2baf64c7 Fix erasing of eSIMs for some devices
Doing a factory data reset used to always erase eSIMs. Then a few months
ago we added a default-on checkbox to let users opt out of erasing the
eSIM during this process, but only had it show for some devices (ones
which support the "fastboot oem esim_erase" command) by adding a system
property named masterclear.allow_retain_esim_profiles_after_fdr.

When recently updating the strings shown in the factory data reset
screen and the confirmation dialog, we changed the code so that if that
the checkbox is hidden we'll pass false for the ERASE_ESIMS_EXTRA
parameter sent to the factory data reset confirmation dialog. This had
the unintended side effect of making devices that don't specify true for
masterclear.allow_retain_esim_profiles_after_fdr skip erasing the eSIM.

This CL fixes that by removing the "is the checkbox hidden" check, going
back to the previous behavior of just using the checkbox value, which is
on by default even if hidden.

Fixes: 135284765
Test: make RunSettingsRoboTests
Change-Id: Ia9f335920e4e3c4a90f0a6a49d1722a0c19ea83d
(cherry picked from commit 5f612a4b44)
2019-07-12 04:10:26 +00:00
Andrew Sapperstein
6971e3d4cc Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857
am: 44f731c1c7

Change-Id: I5f6f9c95d0495c09f3514e7356ed7409ffd9eb7e
2019-07-11 20:59:39 -07:00
Andrew Sapperstein
8c6b2bafb0 Merge "Fix erasing of eSIMs for some devices" into qt-dev
am: 1f942d9857

Change-Id: I04bc60ed040546a64ea157840b76d815169d32a3
2019-07-11 20:51:33 -07:00
Andrew Sapperstein
44f731c1c7 Merge "Fix erasing of eSIMs for some devices" into qt-dev
am: 1f942d9857

Change-Id: I44e11b7a63c329883b01dc03f820e807c15953cf
2019-07-11 20:51:32 -07:00
Andrew Sapperstein
1f942d9857 Merge "Fix erasing of eSIMs for some devices" into qt-dev 2019-07-12 03:13:39 +00:00
android-build-team Robot
bd7ec984d2 Merge cherrypicks of [8551866, 8551867, 8551868, 8552336, 8552337, 8552338, 8551869, 8552339, 8552376, 8551887] into qt-c2f2-release
Change-Id: I32d4a9bd37c3ca77d5f40d0baf2f5eaf19742782
2019-07-12 00:13:17 +00:00
joshmccloskey
0f01190638 Ensure feature is supported and enabled.
Fixes: 137285390
Test: Verified that SecuritySettings no longer crashes.
Test: Verified that this PrefenceController no longer shows up
if the device does not support it.
Test: Verified that this PreferenceController no longer
shows up when the work profile is disabled.

Change-Id: I10f015e18491b203db6f942f07034d55f620cfe5
(cherry picked from commit a96a84e256)
2019-07-12 00:12:54 +00:00
joshmccloskey
00c05fc246 Ensure feature is supported and enabled.
am: a96a84e256

Change-Id: I5a1870ed55326fb9e8a5616ffa279bccc42b04ff
2019-07-11 14:56:10 -07:00
joshmccloskey
5c571b8896 Ensure feature is supported and enabled.
am: a96a84e256

Change-Id: Ie607b615a64665c91cccffc50901c8099c0413ca
2019-07-11 14:56:08 -07:00
joshmccloskey
a96a84e256 Ensure feature is supported and enabled.
Fixes: 137285390
Test: Verified that SecuritySettings no longer crashes.
Test: Verified that this PrefenceController no longer shows up
if the device does not support it.
Test: Verified that this PreferenceController no longer
shows up when the work profile is disabled.

Change-Id: I10f015e18491b203db6f942f07034d55f620cfe5
2019-07-11 21:31:31 +00:00
joshmccloskey
5dbcfc9d27 Update FaceSlice to use correct pref & FaceManager
am: 365beaebdb

Change-Id: I3762f68d4f16ad529ad7a1cc56891812daad7016
2019-07-11 14:08:02 -07:00
joshmccloskey
cab111d8a5 Update FaceSlice to use correct pref & FaceManager
am: 365beaebdb

Change-Id: If26b32c83bfbda5f6268985c4d8812ff25d76e05
2019-07-11 14:05:56 -07:00
Antony Sargent
5f612a4b44 Fix erasing of eSIMs for some devices
Doing a factory data reset used to always erase eSIMs. Then a few months
ago we added a default-on checkbox to let users opt out of erasing the
eSIM during this process, but only had it show for some devices (ones
which support the "fastboot oem esim_erase" command) by adding a system
property named masterclear.allow_retain_esim_profiles_after_fdr.

When recently updating the strings shown in the factory data reset
screen and the confirmation dialog, we changed the code so that if that
the checkbox is hidden we'll pass false for the ERASE_ESIMS_EXTRA
parameter sent to the factory data reset confirmation dialog. This had
the unintended side effect of making devices that don't specify true for
masterclear.allow_retain_esim_profiles_after_fdr skip erasing the eSIM.

This CL fixes that by removing the "is the checkbox hidden" check, going
back to the previous behavior of just using the checkbox value, which is
on by default even if hidden.

Fixes: 135284765
Test: make RunSettingsRoboTests
Change-Id: Ia9f335920e4e3c4a90f0a6a49d1722a0c19ea83d
2019-07-11 20:23:58 +00:00
android-build-team Robot
58949a7d72 Merge cherrypicks of [8549820, 8549668, 8549613, 8549614, 8549935, 8549808, 8549876, 8549809, 8549552] into qt-release
Change-Id: I9d4e0032c124831e73c042f5b7e263a6ab7fb740
2019-07-11 19:50:24 +00:00
tmfang
58dcca9844 Improve Settings launch performance
From traces analysis, we found getFreeBytes
was taking a long time to return.

getFreeBytes was used when storage controller
tried to get storage information.

In order to prevent this case, we put the action
which takes too much time in background thread.

Test: I can't reproduce it locally. From code view,
this is a reasonable root cause.
Fixes: 136268875

Change-Id: I78e42cde88553c003f198cffb5747b352055f59a
(cherry picked from commit 0c37f019f6)
2019-07-11 19:50:02 +00:00
joshmccloskey
365beaebdb Update FaceSlice to use correct pref & FaceManager
Fixes: 137137134
Test: Manual.
Change-Id: Idc707a7d2009975f81902867e4c37a8ee5775700
2019-07-11 16:28:21 +00:00
Android Build Merger (Role)
f6311a88da Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours am: 3e9da03d0c -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-11 10:16:49 +00:00
Bill Yi
4df6694c6e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours
am: 3e9da03d0c -s ours
am skip reason: subject contains skip directive

Change-Id: I59f8af945535b6aae8ab1a286816fdff2b0addbf
2019-07-11 03:16:28 -07:00
Bill Yi
a037c5b89e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours
am: 3e9da03d0c -s ours
am skip reason: subject contains skip directive

Change-Id: Iad91c18121a564cc1ef7a6f0b704c16a7fa37c06
2019-07-11 03:16:27 -07:00
Bill Yi
025db3d33e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours
am: 1da3bf10bf -s ours
am skip reason: subject contains skip directive

Change-Id: I1550a0d712b5b8853292e5f05ffda2b4d4a90bff
2019-07-11 03:16:27 -07:00
Bill Yi
3e9da03d0c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 433e625341 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5c4e1030a1f9907e3274be1a14c49d30783d839
2019-07-11 03:10:27 -07:00
Bill Yi
1da3bf10bf [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 433e625341 -s ours
am skip reason: subject contains skip directive

Change-Id: I22d56ba044543ee2389402ca28ae5ecf49b4a9cc
2019-07-11 03:10:27 -07:00
TreeHugger Robot
433e625341 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-07-11 09:54:20 +00:00
Android Build Merger (Role)
c2b7196945 Merge "Improve Settings launch performance am: 496d3f6f9c am: edd86364f5" into qt-r1-dev-plus-aosp 2019-07-11 08:12:38 +00:00
tmfang
6ed2484766 Improve Settings launch performance am: 496d3f6f9c
am: 49d575b91c

Change-Id: I544556c17a56dd1e36efded7ae565fa7d97fa8ba
2019-07-11 01:12:18 -07:00
tmfang
9b961232be Improve Settings launch performance am: 496d3f6f9c
am: 49d575b91c

Change-Id: I36d43b032a7ac815c680b1b875e0d7b5cf5e7e96
2019-07-11 01:12:16 -07:00
tmfang
c5e2ca58f8 Improve Settings launch performance am: 496d3f6f9c
am: edd86364f5

Change-Id: I1a90c8c49d6f226997e59b9af4518b93b7194e93
2019-07-11 01:12:16 -07:00
tmfang
49d575b91c Improve Settings launch performance
am: 496d3f6f9c

Change-Id: I16eb11d8850cbd75dd3571d16fce5758e5280bfd
2019-07-11 00:54:14 -07:00
tmfang
edd86364f5 Improve Settings launch performance
am: 496d3f6f9c

Change-Id: I5256fa0c04af07108b76cf21e9558b03d499e883
2019-07-11 00:54:14 -07:00
TreeHugger Robot
9df6623b73 Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev 2019-07-11 07:40:47 +00:00