Jason Monk
25f821c3c2
Don\'t update conditions on background threads
...
am: 6cb280d146
2016-05-25 18:42:38 +00:00
Jason Monk
6cb280d146
Don't update conditions on background threads
...
Instead build a list and set it on the main thread to avoid
concurrent modification crashes.
Change-Id: I936fbeb70359583e55ae8ddcb0ea46b5753cb3b0
Fixes: 28794277
2016-05-25 12:53:34 -04:00
Ricky Wai
7a2eb4d3a9
Hide work profile key in user credentials screen
...
am: 9579274cda
2016-05-25 13:21:01 +00:00
Ricky Wai
9579274cda
Hide work profile key in user credentials screen
...
Bug: 28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef
2016-05-25 13:11:24 +00:00
Adrian Roos
aea945a821
Merge "Remove option to configure emergency app" into nyc-dev
...
am: 06b7d7cdf9
2016-05-25 00:23:29 +00:00
TreeHugger Robot
06b7d7cdf9
Merge "Remove option to configure emergency app" into nyc-dev
2016-05-25 00:17:20 +00:00
Victor Chang
8cc4630521
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
...
am: 32e17d0862
2016-05-24 14:20:02 +00:00
Victor Chang
32e17d0862
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
2016-05-24 14:03:29 +00:00
Victor Chang
45ca906e27
Trust the certificate after unlocking screenlock
...
When trust button is clicked, if ConfirmCredential (CC) is shown,
and user successfully unlock CC, trust the cert immediately
Bug: 28752364
Change-Id: Ied4aeda59a668a9dd2bf079a385b1fecd8eabb9e
2016-05-23 20:11:18 +01:00
Bill Yi
08f2eaf5ae
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: dad7b893b2
2016-05-23 15:42:21 +00:00
TreeHugger Robot
dad7b893b2
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-23 15:35:35 +00:00
Jason Monk
9d16b2ddf3
Merge "Fix the momery leak in DrawOverlayDetails" am: 34646006ce
...
am: 05c4c91a6c
2016-05-23 14:25:55 +00:00
宋凯伦
05c4c91a6c
Merge "Fix the momery leak in DrawOverlayDetails"
...
am: 34646006ce
2016-05-23 14:23:08 +00:00
Jason Monk
34646006ce
Merge "Fix the momery leak in DrawOverlayDetails"
2016-05-23 14:13:08 +00:00
宋凯伦
4feb4d9a8b
Fix the momery leak in DrawOverlayDetails
...
https://code.google.com/p/android/issues/detail?id=210852
we need to release the mOverlayBridge in onDestroy, or it will cause Memory Leak issue
Signed-off-by: 宋凯伦 <songkailun@xiaomi.com >
Change-Id: If0113ed72773c366596a2c915ec504c1c68fe3b7
2016-05-23 14:12:34 +00:00
Felipe Leme
ddc0c42464
Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev
...
am: b103f4497d
2016-05-23 13:54:16 +00:00
TreeHugger Robot
b103f4497d
Merge "Fixed whitelist stats so it's only logged on add." into nyc-dev
2016-05-23 13:45:55 +00:00
Bill Yi
906224c4dd
Import translations. DO NOT MERGE
...
Change-Id: I18ff7e3d70d30e76e01214b31c1df2065209f30f
Auto-generated-cl: translation import
2016-05-23 06:35:00 -07:00
Victor Chang
e8df0892d4
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
...
am: b0054ec4e2
2016-05-23 11:58:58 +00:00
Victor Chang
b0054ec4e2
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
2016-05-23 11:51:54 +00:00
Baligh Uddin
e973bb7182
Import translations. DO NOT MERGE
...
am: ffe930ec76
2016-05-22 23:20:36 +00:00
Baligh Uddin
ffe930ec76
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e
2016-05-21 13:10:17 -07:00
Adrian Roos
78091bf8ca
Remove option to configure emergency app
...
Bug: 28873644
Change-Id: Iddf4e781af8cb3ca3b62d1141c58402933bd8ec8
2016-05-20 14:36:24 -07:00
Felipe Leme
ec218b75ac
Merge "Defined help page for Data Saver." into nyc-dev
...
am: f8265a8f1e
2016-05-20 21:33:30 +00:00
Felipe Leme
f8265a8f1e
Merge "Defined help page for Data Saver." into nyc-dev
2016-05-20 21:27:57 +00:00
Felipe Leme
746b384700
Fixed whitelist stats so it's only logged on add.
...
BUG: 28166693
Change-Id: If1f91167c21054e78a966670c20c174c3f73d2a5
2016-05-20 14:13:22 -07:00
Jason Monk
cb0e0f9e30
Merge "Protect against monkey crash" into nyc-dev
...
am: d3ce331b94
2016-05-20 18:24:36 +00:00
Jason Monk
d3ce331b94
Merge "Protect against monkey crash" into nyc-dev
2016-05-20 18:21:08 +00:00
Jason Monk
fd41b42487
Protect against monkey crash
...
When rebuild comes in after context is no longer valid
Change-Id: Ib64e93372bff4c6b0e1232ac257f3df0e9d0be0a
Fixes: 28875397
2016-05-20 14:15:10 -04:00
Victor Chang
5e0a46bff6
Fix Continous loop in unifed screenlock when trying to Trust a CA cert
...
Cause: with unified screenlock, ConfirmDeviceCredentialActivity didn't
forward result with FLAG_ACTIVITY_FORWARD_RESULT
Also, fixed that ConfirmDeviceCredentialActivity didn't allow fingerprint
authenication in unified screenlock after keystore unlocked.
In ChooseLockSettingsHelper, add one new util function to allow
extra option to set returnCredentials to false while external to true.
Set StrongAuth to "not required" when it has been successfully unlocked.
Test:
1. PO Unified Screenlock/Work Challenge x fingerprint -> ok to trust cert
(Also, no credential is returned in intent)
2. WorkMode off -> Reboot -> turn on Work mode
-> no fingerprint option, PIN unlock successful to turn work mode on
Bug: 28752364
Change-Id: I6dc8865e8f005545f8577d7731afb4495647062b
2016-05-20 19:10:33 +01:00
Victor Chang
4e47a17a62
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
...
am: 99a88eca78
2016-05-20 17:34:08 +00:00
Victor Chang
99a88eca78
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
2016-05-20 17:19:42 +00:00
Victor Chang
00859bd548
Temp fix for NPE when race condition happens in TrustedCredentialsSettings
...
Bug: 28762124
Change-Id: I21e46c2008e106db1c43573171e0d852cbe0a68a
2016-05-20 17:19:29 +00:00
Felipe Leme
cf2c0b1b97
Defined help page for Data Saver.
...
BUG: 28865521
Change-Id: I07930232312df2775ecee5beacee6921f7245847
2016-05-20 09:08:28 -07:00
Jason Monk
a9dc3a8826
Don\'t use ApplicationsState for summaries
...
am: 290ca6ec5c
2016-05-20 15:10:20 +00:00
Jason Monk
290ca6ec5c
Don't use ApplicationsState for summaries
...
Since it grabs a lock that can be slow on the main thread, don't use
ApplicationsState in any of the summaries, instead load the information
directly from the PM.
Change-Id: Ibefe867810d2a9926177a8de4e23a7faea4b1c3b
Fixes: 28435146
2016-05-20 09:37:53 -04:00
Sanket Agarwal
63ddec0756
Handle return value when Bluetooth is enabled
...
am: 77ad3c2531
2016-05-19 18:32:25 +00:00
Sanket Agarwal
77ad3c2531
Handle return value when Bluetooth is enabled
...
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.
Bug: b/28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
2016-05-19 18:27:03 +00:00
Kenny Guy
01891c5bf0
Merge "Update work challenge background image." into nyc-dev
...
am: 726085c5c7
2016-05-19 11:07:59 +00:00
Kenny Guy
726085c5c7
Merge "Update work challenge background image." into nyc-dev
2016-05-19 11:01:37 +00:00
Baligh Uddin
43a6de268d
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 7ffeda3633
2016-05-18 19:13:59 +00:00
Baligh Uddin
7ffeda3633
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-18 19:06:53 +00:00
Robert Greenwalt
aae2022cb5
Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9
...
am: eb88257f07
2016-05-18 18:06:49 +00:00
yifan.bai
eb88257f07
Merge "Fix register multiple PhoneStateListeners."
...
am: 91f6b496a9
2016-05-18 18:02:56 +00:00
Robert Greenwalt
91f6b496a9
Merge "Fix register multiple PhoneStateListeners."
2016-05-18 17:54:47 +00:00
Kenny Guy
846e182385
Update work challenge background image.
...
Updated so the orange briefcase in the image
isn't central so avoiding clashing with text.
Bug: 28557192
Change-Id: Ic8e4ea71f47449e81619b28b979f59c3d9aaf6a0
2016-05-18 16:14:19 +01:00
Julia Reynolds
d6575bcee2
Merge "Null check." into nyc-dev
...
am: fc1bb74186
2016-05-18 14:10:13 +00:00
Julia Reynolds
fc1bb74186
Merge "Null check." into nyc-dev
2016-05-18 14:02:05 +00:00
Yohei Yukawa
eb84d19de2
Follow class package change: LocaleList
...
am: 1ef9c4afd5
2016-05-18 02:24:58 +00:00
Yohei Yukawa
1ef9c4afd5
Follow class package change: LocaleList
...
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1]. This CL follows up that
package change.
No behavior change is intended.
[1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
Bug: 28819696
Change-Id: Ibd7934b30062046830d63f33d1c6febef32da976
2016-05-17 16:25:39 -07:00
