OSDN Git Service
TreeHugger Robot [Wed, 13 Sep 2017 04:35:32 +0000 (04:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:34:48 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:33:56 +0000 (04:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:32:49 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:32:15 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:31:10 +0000 (04:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Beverly Tai [Tue, 12 Sep 2017 16:41:18 +0000 (16:41 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093
am:
6cd1142360
Change-Id: I1f5c3e90eb7cc9679d54699d2ead567e4db6c789
Beverly Tai [Tue, 12 Sep 2017 16:32:29 +0000 (16:32 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0
am:
b4913b7093
Change-Id: Ie38994ab474ba3f8b34d3ad4dac6b6a714eb2899
Beverly Tai [Tue, 12 Sep 2017 16:23:44 +0000 (16:23 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours
am:
5252746fe0
Change-Id: I9e4cc6677d3ea0c31584efb0416e1d8716285f68
Beverly Tai [Tue, 12 Sep 2017 16:15:49 +0000 (16:15 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec
am:
c64209fb6a -s ours
Change-Id: I8fdcba43f18249ca30843ab780f1cb945c068e37
Beverly Tai [Tue, 12 Sep 2017 16:09:38 +0000 (16:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6
am:
ff058a78ec
Change-Id: Id39f2a417d5feb4c1da0836c3df484ced0eb84ef
Beverly Tai [Tue, 12 Sep 2017 16:01:36 +0000 (16:01 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours
am:
d0d0fea3d6
Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf
Beverly Tai [Tue, 12 Sep 2017 15:53:38 +0000 (15:53 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
am:
89a94b706d -s ours
Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36
Beverly Tai [Tue, 12 Sep 2017 15:29:21 +0000 (15:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
Beverly [Fri, 1 Sep 2017 15:14:03 +0000 (11:14 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: Id9fff28cf54969cbcbdc8a3bfaeadc02ff597c89
Bill Yi [Tue, 12 Sep 2017 04:36:21 +0000 (21:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id5eb5b3248f31366dac48ac077820b742233685e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 04:28:34 +0000 (21:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie79ea5d4e49249e328c98088af5a62959fc4d6cf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 04:12:48 +0000 (21:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5acf10cd74c7c7ced9b3d6a6975e7d116b2033c7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:39:03 +0000 (20:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9970feb36534a07156682d039527d889a074f481
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:31:22 +0000 (20:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I77229f75dd516309bfb61a794d5f3225c3573baf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:00:26 +0000 (20:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0c3392b8cb18eb68e3f7915b3a4bc86c681e3ae7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Siyamed Sinir [Tue, 12 Sep 2017 00:31:18 +0000 (00:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74
am:
5288fcc242
Change-Id: If564d9a1c4feb66163994ffb51233ce589df2465
Siyamed Sinir [Tue, 12 Sep 2017 00:23:53 +0000 (00:23 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e
am:
954b6e9b74
Change-Id: Ic5a041376b5f921b68f85c397b9b56440d11697c
Siyamed Sinir [Tue, 12 Sep 2017 00:16:19 +0000 (00:16 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be
am:
8393b54d3e
Change-Id: If5b7319d2514ce67467d6092c99a4661155938e0
Siyamed Sinir [Tue, 12 Sep 2017 00:09:18 +0000 (00:09 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635
am:
064bfd22be
Change-Id: Idca3441e586206358880953bcbfd7697f0475b2b
Siyamed Sinir [Tue, 12 Sep 2017 00:00:54 +0000 (00:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498
am:
6352ced635
Change-Id: I13044306db2e849d3f02c5d42015567e6b65f30a
Siyamed Sinir [Mon, 11 Sep 2017 23:50:20 +0000 (23:50 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6
am:
028ad8d498
Change-Id: I537277cbc92a3bb45fc967cc7e26b6bf2233aa34
Siyamed Sinir [Mon, 11 Sep 2017 23:42:42 +0000 (23:42 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
am:
06183a57a6
Change-Id: Ia69682e87705f3ede14ab87b2c496037e00d3c5a
Siyamed Sinir [Mon, 11 Sep 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
Tony Mak [Mon, 11 Sep 2017 14:28:44 +0000 (14:28 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357
am:
68cce397b3
Change-Id: Ieb10d27e72646260f0c75535485a6fe11efe2a32
Tony Mak [Mon, 11 Sep 2017 14:17:10 +0000 (14:17 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227
am:
34377e0357
Change-Id: Ief87ce5e1dc9e5b424d70e72144084aa778ca0d6
Tony Mak [Mon, 11 Sep 2017 14:04:00 +0000 (14:04 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev
am:
d7dcc3e227
Change-Id: Ie10cba479c7d83ed001b863c648976a26ae30756
Tony Mak [Mon, 11 Sep 2017 10:38:07 +0000 (11:38 +0100)]
resolve merge conflicts of
56a2b529373b to nyc-dev
Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Merged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512
Change-Id: I81183e5b5bc702fb245a6a51afe6709c5b9dd3de
Tony Mak [Mon, 11 Sep 2017 08:44:22 +0000 (08:44 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c am:
a1cbcf5513
am:
220e7c1628
Change-Id: Ib882539bf0f362d3dbd279418d37b8fd56a9d8f1
Tony Mak [Mon, 11 Sep 2017 08:36:08 +0000 (08:36 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c
am:
a1cbcf5513
Change-Id: I37cafa9ee6e166e27c074e6317a6a818fe9e87a5
Tony Mak [Mon, 11 Sep 2017 08:26:32 +0000 (08:26 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
am:
328c129f4c
Change-Id: If2d6418cf2a71b2ae3094349101e71903c016224
TreeHugger Robot [Mon, 11 Sep 2017 08:14:19 +0000 (08:14 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
Suprabh Shukla [Mon, 11 Sep 2017 04:55:50 +0000 (04:55 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours
am:
6a48feaab8 -s ours
Change-Id: Ie05f69480ee2aec055dad3622072f3fc5e569e8a
Suprabh Shukla [Mon, 11 Sep 2017 04:41:52 +0000 (04:41 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours
am:
467ed9d15a -s ours
Change-Id: I81bac89584c667c35b7fff8ff3446c57c73cf617
Suprabh Shukla [Mon, 11 Sep 2017 04:29:03 +0000 (04:29 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours
am:
3f824a362f -s ours
Change-Id: Ice5595805d71402bbfbdda2efe44e180f346d54b
Suprabh Shukla [Mon, 11 Sep 2017 04:10:16 +0000 (04:10 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0
am:
4b8fb78007 -s ours
Change-Id: Idaff77e48bf3901ef0cbff54d3ceb19223a48338
Suprabh Shukla [Sun, 10 Sep 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124
am:
25ec24740b
Change-Id: I858f75717157bd9269bcd43d4198935302132d5a
Suprabh Shukla [Sun, 10 Sep 2017 20:00:05 +0000 (20:00 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361
am:
54f494ffc0
Change-Id: Ibbdf82686d13d9a554ef62774f140c57115118a3
Suprabh Shukla [Sun, 10 Sep 2017 19:48:10 +0000 (19:48 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229
am:
7d9e844124
Change-Id: Ifc197fbb16e1bb6773b2f08c7c62ca92f82238f7
Suprabh Shukla [Sun, 10 Sep 2017 19:47:46 +0000 (19:47 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73
am:
bf1b308361
Change-Id: Ia01d70256824947bed5e88e103bc263749404fbb
Suprabh Shukla [Sun, 10 Sep 2017 19:32:22 +0000 (19:32 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
am:
fc9e382229
Change-Id: I80e814ed0266b3868bd7039508bbc50b2e2a51aa
Suprabh Shukla [Sun, 10 Sep 2017 19:32:12 +0000 (19:32 +0000)]
Clearing up invalid entries when SyncStorageEngine starts
am:
5470469d73
Change-Id: I8ffaaf35be0e2586a5bdbbe5de6e6bd440e26017
TreeHugger Robot [Sun, 10 Sep 2017 19:25:54 +0000 (19:25 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
Siyamed Sinir [Thu, 7 Sep 2017 01:02:23 +0000 (18:02 -0700)]
Prevent getting data from Clipboard if device is locked
Clipboard should not return data if the device is locked. This CL checks
for device locked state before returning values from get/has functions.
Bug:
64934810
Change-Id: I856a9079fe64db0af44383fae1a9a418de959420
Merged-In: Icefac226615fe22a7735dff4ba4c3b528fb2ac12
Suprabh Shukla [Fri, 12 May 2017 22:26:54 +0000 (15:26 -0700)]
Clearing up invalid entries when SyncStorageEngine starts
Any app with permission WRITE_SYNC_SETTINGS could write sync settings
for authorities or accounts that are not valid. This results in invalid
data being persisted to disk which can effectively lead to a DOS style
attack. Clearing such entries on boot will make sure that a reboot fixes
any such issues.
Test: cts-tradefed run cts-dev -m CtsSyncContentHostTestCases
Bug:
35028827
Change-Id: I9e206a42508e3cba65d7523bf47fff743f47dcb2
Merged-In: I9e206a42508e3cba65d7523bf47fff743f47dcb2
(cherry picked from commit
042a478b73c3b7f7cd73f5bb1af657cfe07d0571)
Julius D'souza [Tue, 5 Sep 2017 17:17:06 +0000 (10:17 -0700)]
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate.
Some devices have catastrophic firmware issues in switching the sensor rate;
for these devices, the sensor rate switch should be skipped entirely.
Change-Id: I04fc3d27c99f95b33f86f012a8d398f817f7713a
Michael Plass [Thu, 13 Jul 2017 17:09:07 +0000 (10:09 -0700)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result
Bug:
62866191
Bug:
63074860
Bug:
65267749
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit
56e46134d364f7f293158979765336721a6c752c)
(cherry picked from commit
9c1d56576e01060f40de74a4c0e35e95064351be)
TreeHugger Robot [Tue, 29 Aug 2017 18:35:04 +0000 (18:35 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev
* changes:
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
DO NOT MERGE ANYWHERE: GnssLocationProvider: listening to conn lost event
DO NOT MERGE ANYWHERE: Restoring Network Available Notification to AGnssRil
Zheng Zhang [Tue, 22 Aug 2017 17:27:14 +0000 (10:27 -0700)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
TRANSPORT_BLUETOOTH is a essential network type for wearable device.
For non-master branch, only listen to Bluetooth on wearable device.
Bug:
64881794
Test: Trigger Bluetooth on/off on watch, check if UpdateNetworkState()
got called.
Change-Id: I30e39943220597987320ea7843d7d36827fdd0c7
(cherry picked from commit
d6886710b5c9ed9d1567c4ee59773071bae7070c)
Kevin Tang [Thu, 11 May 2017 02:36:20 +0000 (19:36 -0700)]
DO NOT MERGE ANYWHERE: GnssLocationProvider: listening to conn lost event
The HAL layer now gets onLost notificaiton as well
as connectivity available. This keeps HAL layer
better informed on what the on what the real
connection status is, for things like assistance
download.
Fixes:
34076506
Test: GPS works, even after delete all, and assistance
downloads wait politely when in airplane mode.
Change-Id: I4b5fb782f9370b0a45282c8a9dd5920120d449fb
Wyatt Riley [Wed, 7 Dec 2016 15:16:25 +0000 (07:16 -0800)]
DO NOT MERGE ANYWHERE: Restoring Network Available Notification to AGnssRil
Bug:
33350903
Change-Id: I8fe0ddbd011689258890ce37e37271cc6f170c6a
Fixes:
33350903
Test: On device GPS-still-works check (Ril check to be done by partners)
Tony Mak [Tue, 15 Aug 2017 18:56:39 +0000 (19:56 +0100)]
DPC should not be allowed to grant development permission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant_developmentPermission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant_developmentPermission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant
Test: Run "Permissions lockdown" test in CtsVerifier
Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Merged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512
Bug:
62623498
Change-Id: Ief96a23fa49f1ea923574840f8ff590a5ea2456e
Siarhei Vishniakou [Wed, 16 Aug 2017 23:09:40 +0000 (23:09 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2
am:
3674e3d9d8
Change-Id: I9bc6659634cd92ceadc9b0560f2802b90b24d573
Siarhei Vishniakou [Wed, 16 Aug 2017 22:55:31 +0000 (22:55 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99
am:
a5e996c2e2
Change-Id: Idfdd87bbf432a23d73a544810bbda29126f15c6d
Siarhei Vishniakou [Wed, 16 Aug 2017 22:39:46 +0000 (22:39 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours
am:
712baa6c99
Change-Id: Ic2c5a354d8ee69609a6152d75ccdbe66fb8e3daa
Siarhei Vishniakou [Wed, 16 Aug 2017 22:19:11 +0000 (22:19 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9
am:
b007784ed1 -s ours
Change-Id: I152a8ebaf97c37be52de29c0639fa221a28b5fce
Siarhei Vishniakou [Wed, 16 Aug 2017 21:56:58 +0000 (21:56 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02
am:
a23674b4f9
Change-Id: I1071a79ff62a800027c5da1ffad9401e83f541b1
Siarhei Vishniakou [Wed, 16 Aug 2017 21:39:41 +0000 (21:39 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7
am:
e8b48abb02
Change-Id: I171e3e1d9575f4e9b61ee46cfc08ac4331d6d245
Siarhei Vishniakou [Wed, 16 Aug 2017 21:26:49 +0000 (21:26 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours
am:
6a7c6a24a7
Change-Id: I72398c99878637d26dbb976bab05aca315368729
Siarhei Vishniakou [Wed, 16 Aug 2017 21:15:05 +0000 (21:15 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553
am:
3d1931d4e3 -s ours
Change-Id: Ieb19904cf060072d2525836ebba9f310da515b4b
Siarhei Vishniakou [Wed, 16 Aug 2017 20:50:20 +0000 (20:50 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours
am:
b737365553
Change-Id: I375324a937478c584e95cb6550d98293162656fc
Siarhei Vishniakou [Wed, 16 Aug 2017 20:35:40 +0000 (20:35 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours
am:
3280efe50e -s ours
Change-Id: Ia7bf4d6991be15c732ba8b55c37f2c9e447b1dbd
Siarhei Vishniakou [Wed, 16 Aug 2017 20:19:29 +0000 (20:19 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6
am:
9d99b0001e -s ours
Change-Id: Ib0fb40f990138b3729b66bdb6d6a095bd3ad231d
Siarhei Vishniakou [Wed, 16 Aug 2017 20:03:29 +0000 (20:03 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff
am:
96fe6421f6
Change-Id: Ia2ce3f8b95b578253c5336407ae85880d3d317f4
Charles He [Wed, 16 Aug 2017 19:51:43 +0000 (19:51 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662
am:
510f02244d
Change-Id: I3bfe22ab41813abbeebee58d7cc8789e95a1a2fa
Siarhei Vishniakou [Wed, 16 Aug 2017 19:48:22 +0000 (19:48 +0000)]
DO NOT MERGE Remove window obscurement information.
am:
c3c2ed94ff
Change-Id: Ib9552165e9b1c2dfcd235d1f7930d85c258b2ece
Charles He [Wed, 16 Aug 2017 19:39:50 +0000 (19:39 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c
am:
a175bae662
Change-Id: Id250bcbcf92bdb95813dc4fcdd772aeef7f29c0a
Charles He [Wed, 16 Aug 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1
am:
6adae5108c
Change-Id: I104eea9bf02f89b6c2bde0daeff81aaa781e323d
Charles He [Wed, 16 Aug 2017 19:13:17 +0000 (19:13 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70
am:
733c7607d1
Change-Id: Id1c4c4de5d6e4da05188326287ae86e74bf89623
Charles He [Wed, 16 Aug 2017 18:58:11 +0000 (18:58 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92
am:
5d34739d70
Change-Id: I51f9bbaa35a853ec3442267cbb9327a2a64ff1d1
Charles He [Wed, 16 Aug 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours
am:
5048fc8e92
Change-Id: Ib55158e1608d7eeba7d41854377ed1e93e283a75
Charles He [Wed, 16 Aug 2017 18:37:17 +0000 (18:37 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev
am:
039b357a46 -s ours
Change-Id: Ia916a0c1a5ec5d63e4e76ed9da9d563fd39d3823
TreeHugger Robot [Tue, 15 Aug 2017 19:30:53 +0000 (19:30 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev
Charles He [Tue, 15 Aug 2017 17:54:35 +0000 (17:54 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4
Change-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00
Charles He [Tue, 15 Aug 2017 17:54:05 +0000 (17:54 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
Charles He [Tue, 15 Aug 2017 17:53:35 +0000 (17:53 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
Charles He [Tue, 15 Aug 2017 17:52:57 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
Charles He [Tue, 15 Aug 2017 17:52:27 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
Charles He [Tue, 15 Aug 2017 17:51:58 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
Charles He [Tue, 15 Aug 2017 17:51:28 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
Tony Mak [Fri, 11 Aug 2017 21:13:21 +0000 (21:13 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12
Change-Id: I3d7846f3b82dd429c69cff700e3d2794039b73db
Tony Mak [Fri, 11 Aug 2017 21:12:38 +0000 (21:12 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc
Change-Id: Iea1acc1d757871aaaa58fb27f547fd6261b73585
Tony Mak [Fri, 11 Aug 2017 21:11:51 +0000 (21:11 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc
Change-Id: I4ab24abc5c58022d92eb399750c8c8ef07995c5b
Tony Mak [Fri, 11 Aug 2017 21:10:58 +0000 (21:10 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a
Change-Id: Ic65e9bb19e46a8d16406a3d02e5b60f375338334
Tony Mak [Fri, 11 Aug 2017 21:09:58 +0000 (21:09 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af
Change-Id: I877b0cba326b85e894d52f24a694a1ef666cdb1c
Tony Mak [Fri, 11 Aug 2017 21:09:21 +0000 (21:09 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7
Change-Id: Ia91fe8b88c04f1b430f8cf90f5691b6b2791610b
Zheng Zhang [Mon, 7 Aug 2017 20:51:23 +0000 (13:51 -0700)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
Bug:
64424030
Change-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb
Wei Wang [Tue, 2 May 2017 03:24:19 +0000 (20:24 -0700)]
Fix Wakelock underlock in GnssLocationProvider.
Added a separate wakelock for xtra download so it won't
interfer with any wakelocks.
Test: manual
Bug:
37545729
Change-Id: I0867166f03802d1ed133437bcd85b0062db69947
Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
Andriy Naborskyy [Tue, 1 Aug 2017 14:16:30 +0000 (14:16 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
* changes:
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
DO NOT MERGE ANYWHERE ConnectivityService: safer locking
Tyler Freeman [Tue, 1 Aug 2017 01:10:44 +0000 (01:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
z00208928 [Fri, 21 Jul 2017 14:26:29 +0000 (22:26 +0800)]
power: gps: add gps read timeout
During download gps file, if network is disconnected, it do not release wakelock
to prevent system to sleep and consume more power until network is connected.
So set gps read tiemout.
Bug:
33469278
Change-Id: I41adf137559d88f76d9da6f63585bfdefc3117b1
Signed-off-by: z00208928 <zhangwei519@huawei.com>
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Merged-In: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit
ad4d1d8e28618546953e75d4983335631feb6f2a)
Change-Id: Ifae3adf6e2aad1f0811c03d3114d1bd0452e7c23
Wei Wang [Tue, 18 Apr 2017 18:26:26 +0000 (11:26 -0700)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
Test: manual
Bug:
36973866
Change-Id: Ia7168f313abebbf3c5c4fc26567ed914f1987a91
(cherry picked from commit
c5706f651a0462e9ae5a91c9a026d44710b1f8ea)
Tony Mak [Fri, 28 Jul 2017 10:53:56 +0000 (11:53 +0100)]
Enforce policy for camera gesture in keyguard
Test:
1. Set lock screen, set keyguard policy. Lock the device.
Observe that double tap is not showing camera
2. Set lock screen, unset the keyguard policy. Lock the device.
Observe that double tap is showing camera
3. Unset lock screen (swipe), set the keyguard policy. Lock the device.
Observe that double tap is showing camera.
4. Unset lock screen (swipe), unset the keyguard policy. Lock the device.
Observe that double tap is showing camera.
Bug:
63787722
Merged-In: I104688eaad719528376e2851f837d5956a6a1169
Change-Id: I42e6d9015682998176fe41971356bde22e1b37b2