Android Build Merger (Role)
0f8347312f
Merge "Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 am: 00e73e75d5" into nyc-mr1-dev-plus-aosp
2016-05-20 18:28:32 +00:00
Jason Monk
39573c7cf2
Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94
...
am: 00e73e75d5
2016-05-20 18:28:19 +00:00
Jason Monk
0d9fe2a14b
Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94
...
am: cb0e0f9e30
2016-05-20 18:28:18 +00:00
Jason Monk
cb0e0f9e30
Merge "Protect against monkey crash" into nyc-dev
...
am: d3ce331b94
2016-05-20 18:24:36 +00:00
Jason Monk
00e73e75d5
Merge "Protect against monkey crash" into nyc-dev
...
am: d3ce331b94
2016-05-20 18:24:35 +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
4a38f28c19
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 am: 2c04e72414
...
am: e8653d4dd2
2016-05-20 17:48:35 +00:00
Victor Chang
9b94f36138
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 am: 4e47a17a62
...
am: a92877f63c
2016-05-20 17:48:34 +00:00
Victor Chang
e8653d4dd2
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78
...
am: 2c04e72414
2016-05-20 17:41:22 +00:00
Victor Chang
a92877f63c
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78
...
am: 4e47a17a62
2016-05-20 17:39:57 +00: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
2c04e72414
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
...
am: 99a88eca78
2016-05-20 17:30:38 +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
33816a83c1
Merge "Don\'t use ApplicationsState for summaries am: 290ca6ec5c am: a9dc3a8826" into nyc-mr1-dev-plus-aosp
...
am: 7796e8f7cd
2016-05-20 15:15:57 +00:00
Jason Monk
bb160f5de2
Don\'t use ApplicationsState for summaries am: 290ca6ec5c am: fb71469253
...
am: f86de9078a
2016-05-20 15:15:55 +00:00
Android Build Merger (Role)
7796e8f7cd
Merge "Don\'t use ApplicationsState for summaries am: 290ca6ec5c am: a9dc3a8826" into nyc-mr1-dev-plus-aosp
2016-05-20 15:13:20 +00:00
Jason Monk
f86de9078a
Don\'t use ApplicationsState for summaries am: 290ca6ec5c
...
am: fb71469253
2016-05-20 15:13:08 +00:00
Jason Monk
a9d7ea4c15
Don\'t use ApplicationsState for summaries am: 290ca6ec5c
...
am: a9dc3a8826
2016-05-20 15:13:08 +00:00
Jason Monk
a9dc3a8826
Don\'t use ApplicationsState for summaries
...
am: 290ca6ec5c
2016-05-20 15:10:20 +00:00
Jason Monk
fb71469253
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
Daniel Nishi
bbbdf1fa24
Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev am: ab5a648ddb
...
am: d7c52d9a99
2016-05-20 00:16:36 +00:00
Fan Zhang
f579cf9ae1
Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev am: de188186d8
...
am: 9821904876
2016-05-20 00:16:29 +00:00
Sanket Agarwal
243f846fc1
Merge "Handle return value when Bluetooth is enabled am: 77ad3c2531 am: 2463057c6c" into nyc-mr1-dev-plus-aosp
...
am: fde0e5d319
2016-05-20 00:15:57 +00:00
Daniel Nishi
d7c52d9a99
Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev
...
am: ab5a648ddb
2016-05-19 21:29:28 +00:00
Daniel Nishi
ab5a648ddb
Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev
2016-05-19 21:19:02 +00:00
Daniel Nishi
fda4b4625b
Merge "Merge "Update the deletion helper feature factory for photos and videos." into nyc-mr1-dev am: e6d02b6c5e" into nyc-mr1-dev-plus-aosp
...
am: 71069ded1b
2016-05-19 21:07:39 +00:00
Sanket Agarwal
261543c89b
Handle return value when Bluetooth is enabled am: 77ad3c2531 am: 63ddec0756
...
am: 3c2bd1a442
2016-05-19 21:05:58 +00:00
Fan Zhang
9821904876
Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev
...
am: de188186d8
2016-05-19 20:45:14 +00:00
TreeHugger Robot
de188186d8
Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev
2016-05-19 20:41:18 +00:00
Fan Zhang
a2bd32b397
Display disclaimer dialog before starting support.
...
Bug: 28656426
Bug: 28141203
Change-Id: I4fc0d922170badcf5f215fe906fb616c11cf8270
2016-05-19 12:15:38 -07:00
Android Build Merger (Role)
fde0e5d319
Merge "Handle return value when Bluetooth is enabled am: 77ad3c2531 am: 2463057c6c" into nyc-mr1-dev-plus-aosp
2016-05-19 18:39:57 +00:00
Android Build Merger (Role)
71069ded1b
Merge "Merge "Update the deletion helper feature factory for photos and videos." into nyc-mr1-dev am: e6d02b6c5e" into nyc-mr1-dev-plus-aosp
2016-05-19 18:39:46 +00:00
Sanket Agarwal
46bb0dcf30
Handle return value when Bluetooth is enabled am: 77ad3c2531
...
am: 2463057c6c
2016-05-19 18:37:50 +00:00
Sanket Agarwal
3c2bd1a442
Handle return value when Bluetooth is enabled am: 77ad3c2531
...
am: 63ddec0756
2016-05-19 18:37:02 +00:00
Daniel Nishi
a0a580c290
Merge "Update the deletion helper feature factory for photos and videos." into nyc-mr1-dev
...
am: e6d02b6c5e
2016-05-19 18:34:17 +00:00
Sanket Agarwal
2463057c6c
Handle return value when Bluetooth is enabled
...
am: 77ad3c2531
2016-05-19 18:32:29 +00: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
Daniel Nishi
e6d02b6c5e
Merge "Update the deletion helper feature factory for photos and videos." into nyc-mr1-dev
2016-05-19 18:26:43 +00:00
Daniel Nishi
4019400fb5
Merge "Don\'t show app in deletion helper if it was installed recently." into nyc-mr1-dev am: 0772471119
...
am: b09ecc6b8f
2016-05-19 17:17:53 +00:00
Daniel Nishi
b09ecc6b8f
Merge "Don\'t show app in deletion helper if it was installed recently." into nyc-mr1-dev
...
am: 0772471119
2016-05-19 17:13:34 +00:00
Daniel Nishi
a779cd2b16
Add a collapsible checkbox preference for deletion helper.
...
This adds a custom preference group which has both a checkbox
and collapse/expand behavior. This is intended to be used in
the deletion helper for apps deletion and downloads folder
deletion.
This patch implements the apps deletion integration.
Bug: 28769691
Change-Id: I9fb28a1baa4067841742b5dbeaf2083728c16144
2016-05-19 10:12:59 -07:00
Daniel Nishi
0772471119
Merge "Don't show app in deletion helper if it was installed recently." into nyc-mr1-dev
2016-05-19 17:09:17 +00:00
Daniel Nishi
76cd0118e9
Update the deletion helper feature factory for photos and videos.
...
Bug: 28554187
Change-Id: I7fcc34af87ec17e9396f390d851fd31df1dc951a
2016-05-19 10:05:59 -07:00
Daniel Nishi
7ad6c44b15
Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev am: 83ff4b06ec
...
am: d85a19a970
2016-05-19 17:05:15 +00:00
