Bill Yi
7903044b2b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8d229d7090
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
6b16484afd
[automerger skipped] Import translations. DO NOT MERGE
...
am: 941e94d689
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
joshmccloskey
6a3012f21d
Fixed Settings Crash
...
Fixes: 137319680
Test: Manual
Change-Id: I0e22bd561787b1a141bf2e3060b23fe70a6d96ce
2019-07-12 15:49:24 -07: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
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
2019-07-11 21:10:39 -07:00
Andrew Sapperstein
8c6b2bafb0
Merge "Fix erasing of eSIMs for some devices" into qt-dev
...
am: 1f942d9857
2019-07-11 20:51:33 -07:00
Andrew Sapperstein
44f731c1c7
Merge "Fix erasing of eSIMs for some devices" into qt-dev
...
am: 1f942d9857
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
joshmccloskey
00c05fc246
Ensure feature is supported and enabled.
...
am: a96a84e256
2019-07-11 14:56:10 -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
2019-07-11 14:08:02 -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
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
2019-07-11 03:16:28 -07:00
Bill Yi
025db3d33e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours
...
am: 1da3bf10bf
2019-07-11 03:16:27 -07:00
Bill Yi
3e9da03d0c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 433e625341
2019-07-11 03:10:27 -07:00
Bill Yi
1da3bf10bf
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 433e625341
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
2019-07-11 01:12:18 -07:00
tmfang
c5e2ca58f8
Improve Settings launch performance am: 496d3f6f9c
...
am: edd86364f5
2019-07-11 01:12:16 -07:00
tmfang
49d575b91c
Improve Settings launch performance
...
am: 496d3f6f9c
2019-07-11 00:54:14 -07:00
tmfang
edd86364f5
Improve Settings launch performance
...
am: 496d3f6f9c
2019-07-11 00:54:14 -07:00
Bill Yi
c8334b2099
[automerger skipped] Import translations. DO NOT MERGE
...
am: fa674d85ae
2019-07-11 00:04:07 -07:00
tmfang
496d3f6f9c
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 04:19:42 +00:00
Bill Yi
fa674d85ae
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I67ba6e489c14dc511d485a4895c9e12fce1c3ee1
2019-07-10 20:08:17 -07:00
Bill Yi
f74a94db37
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I09ed37fffcf0bbcf61cdfa0b1f8cf22f5828d23b
2019-07-10 19:31:11 -07:00
Xin Li
547532d23d
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master" am: 0c7e805902 -s ours am: ba73db3e92 -s ours
...
am: 3bf8c80dd5
2019-07-10 19:14:53 -07:00
Xin Li
3bf8c80dd5
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master" am: 0c7e805902 -s ours
...
am: ba73db3e92
2019-07-10 19:02:51 -07:00
Xin Li
ba73db3e92
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
...
am: 0c7e805902
2019-07-10 18:44:45 -07:00
Treehugger Robot
0c7e805902
Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
2019-07-11 00:56:33 +00:00
Joshua Mccloskey
d82eedde6d
Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
...
am: 0839185647
2019-07-09 19:46:38 -07:00
Joshua Mccloskey
0839185647
Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
...
* changes:
Favor setup face in search settings.
Remove highlighting for work profile
2019-07-10 02:29:45 +00:00
Bill Yi
3e66bd6c7e
[automerger skipped] Import translations. DO NOT MERGE am: 13d6e13166 -s ours
...
am: 49175304a4
2019-07-09 17:41:57 -07:00
Bill Yi
d74b179378
[automerger skipped] Import translations. DO NOT MERGE am: 13d6e13166 -s ours
...
am: 6edf1646c1
2019-07-09 17:40:49 -07:00
Bill Yi
6edf1646c1
[automerger skipped] Import translations. DO NOT MERGE
...
am: 13d6e13166
2019-07-09 17:17:49 -07:00
Bill Yi
49175304a4
[automerger skipped] Import translations. DO NOT MERGE
...
am: 13d6e13166
2019-07-09 17:16:02 -07:00
Bill Yi
77f1c50053
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 41a7f9de31
2019-07-09 16:58:40 -07:00
TreeHugger Robot
41a7f9de31
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-09 23:10:22 +00:00
joshmccloskey
235405d66e
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
...
am: 007a1aee1b
2019-07-09 15:51:45 -07:00
joshmccloskey
8bbbe545f2
Favor setup face in search settings.
...
Test: Manual.
Fixes: 137135217
Change-Id: I5e0a72a117e2af6d9262d07616cc539ee7a7e55e
2019-07-09 22:41:33 +00:00
Xin Li
f03ae69f69
DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master
...
Bug: 136196576
Change-Id: I660faf68e8a703ac26d79313ead245949f587e59
2019-07-09 15:31:44 -07:00
TreeHugger Robot
007a1aee1b
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
2019-07-09 22:24:00 +00:00
joshmccloskey
85081a4f7e
Remove highlighting for work profile
...
Test: Manual.
Fixes: 137126517
Change-Id: Iefcbf498cc0805cd130981e522177a7c16b7adfc
2019-07-09 15:23:37 -07:00
Bill Yi
43682f3f27
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I84335ed2cdca77f9f506c084b11c5bb3215dd05f
2019-07-09 12:31:21 -07:00
joshmccloskey
97a95798ac
Diversity extra no longer gets overwritten.
...
Test: Manual.
Fixes: 136963876
Change-Id: Ia62e7ac1ff942fa078a2fd5f1d7efc339132aaa3
2019-07-09 18:59:20 +00:00
