OSDN Git Service
Bill Yi [Sun, 8 Oct 2017 04:49:36 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibfe6303b4d78d1ac0c8a0dbb235c6be683504018
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Leon Scroggins III [Fri, 6 Oct 2017 16:32:10 +0000 (16:32 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc
am:
f32424b90d
Change-Id: I405bee24b11319430e3490f3299d9c8b6438e407
Leon Scroggins III [Fri, 6 Oct 2017 16:18:49 +0000 (16:18 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88
am:
2399d935bc
Change-Id: Ib219c4c5299b681b6f3858cb67c70a7fd9110f20
Leon Scroggins III [Fri, 6 Oct 2017 16:06:34 +0000 (16:06 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
am:
cfe2352d88
Change-Id: Id7d59d95e8f5dfa68f7ff55ca5729a11a1fdf1d0
TreeHugger Robot [Fri, 6 Oct 2017 15:45:37 +0000 (15:45 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
Bill Yi [Mon, 2 Oct 2017 04:27:23 +0000 (21:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ca153d375ff59721c164c9841f7c873aaa562fc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Siyamed Sinir [Sat, 30 Sep 2017 01:07:30 +0000 (01:07 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137
am:
9865205a4e
Change-Id: I7c34d6b58d5aacadd6efa07ce12f9b7e9898768a
Siyamed Sinir [Sat, 30 Sep 2017 00:58:30 +0000 (00:58 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a
am:
d93f91a137
Change-Id: If4bb2848e0df71257a1f7e162524ebd08a5dad4d
Siyamed Sinir [Sat, 30 Sep 2017 00:51:02 +0000 (00:51 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114
am:
17735f183a
Change-Id: I71795f8f2f454956797ffaa78d22ca3573e5d626
Siyamed Sinir [Sat, 30 Sep 2017 00:37:54 +0000 (00:37 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77
am:
85439e9114
Change-Id: Ic616bde55a3a60eec10d9330907e6d8164b76c86
Siyamed Sinir [Sat, 30 Sep 2017 00:28:19 +0000 (00:28 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307
am:
a4f6ca3e77
Change-Id: If3b713963f393b7a16352d03c28dced60e2df7db
Siyamed Sinir [Sat, 30 Sep 2017 00:22:03 +0000 (00:22 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c
am:
095eda9307
Change-Id: I4ff17f12c20f95efe68115cc3d6b7d5e9b47228c
Siyamed Sinir [Sat, 30 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Fix ClipboardService device lock check for cross profile
am:
6d79675e0c
Change-Id: Icea573859a6d441e18665d9da855370582f2992a
Bill Yi [Thu, 28 Sep 2017 05:05:41 +0000 (22:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief8d48c64b95c4b11f3015bd311d8a569af54a17
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 26 Sep 2017 05:29:40 +0000 (22:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3bce312584c61d6bc31d4e7c4068b757336fbe25
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Thu, 21 Sep 2017 03:12:47 +0000 (20:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6f78b65137e2f7cd0e64ddc2bcdb7e2aa32817c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Mon, 18 Sep 2017 05:12:38 +0000 (22:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icff28a8957c2a3192b2aeaf0d646c866eb2ebbd8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Leon Scroggins III [Fri, 10 Mar 2017 15:50:33 +0000 (10:50 -0500)]
Stop explicitly using kCallerPasses_Ownership
Bug:
65646012
Bug:
65426286
Cherry-picked from master. The original CL just updates BitmapFactory.
This also updates ExifInterface in the same way. ExifInterface.cpp no
longer existed by the time the Skia change landed.
Required for Ib7aaf367f68f8764147887d858f65ee14fa7a1d9, which fixes
the aforementioned bugs.
Test: No change in behavior, no new tests.
This enum is going away in https://skia-review.googlesource.com/c/9498,
and this method is using the default anyway.
Merged-In: I928a72851f90e84f45ce2fa49560f8ba894a8058
Merged-In: I8f6c761e50cb29476dc0784f58908ec35e3c70e9
Change-Id: I928a72851f90e84f45ce2fa49560f8ba894a8058
Beverly Tai [Thu, 14 Sep 2017 17:25:25 +0000 (17:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev
am:
61bc3f3c9b
Change-Id: Iba63e8e9b1c543478c16e49c2f81a8cb32567529
Beverly Tai [Thu, 14 Sep 2017 17:21:42 +0000 (17:21 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8 am:
3be1269c0a -s ours
am:
0a93f42be2
Change-Id: I2da7592547bbd1c3c028eb06360c15baf9a8c13c
Beverly Tai [Thu, 14 Sep 2017 17:16:48 +0000 (17:16 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev
Beverly Tai [Thu, 14 Sep 2017 17:14:13 +0000 (17:14 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8
am:
3be1269c0a -s ours
Change-Id: I194e18d7ac9ac98010e00db548e8f39bec220fc0
Beverly Tai [Thu, 14 Sep 2017 16:46:42 +0000 (16:46 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
am:
0bdb7902d8
Change-Id: I67c6ceac68b57b9d2e619a25b5e08721b0385db8
Beverly Tai [Thu, 14 Sep 2017 16:40:01 +0000 (16:40 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
Beverly Tai [Thu, 14 Sep 2017 14:55:33 +0000 (14:55 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c am:
d54bc6a908 -s ours am:
b004901c92 am:
9a74d618c2
am:
0bf81b63f9
Change-Id: Id2d47d51581669ee4eb8354e3881f9cbeb57e24f
Beverly Tai [Thu, 14 Sep 2017 14:50:33 +0000 (14:50 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c am:
d54bc6a908 -s ours am:
b004901c92
am:
9a74d618c2
Change-Id: If044222a2428095f3faa492f72d39acbb0db5bd3
Beverly Tai [Thu, 14 Sep 2017 14:43:40 +0000 (14:43 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c am:
d54bc6a908 -s ours
am:
b004901c92
Change-Id: I528ac97ec904ce789b50bde5e8174d81c85d5e1b
Beverly Tai [Thu, 14 Sep 2017 14:35:34 +0000 (14:35 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c
am:
d54bc6a908 -s ours
Change-Id: Ie91e9f362cc247babdc4cfc8eee7f75b647107c2
Beverly Tai [Thu, 14 Sep 2017 14:29:56 +0000 (14:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee
am:
97b98a3b1c
Change-Id: If39d33d4c5b9e1057c7cdfd9b9b52f42d4b193d2
Beverly Tai [Thu, 14 Sep 2017 14:25:02 +0000 (14:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
am:
8150eb82ee
Change-Id: I85a98e8c857c9c7b7597fafb13ecb6ae44cb9b69
Beverly Tai [Thu, 14 Sep 2017 14:18:07 +0000 (14:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
Siyamed Sinir [Wed, 13 Sep 2017 23:32:21 +0000 (16:32 -0700)]
Fix ClipboardService device lock check for cross profile
ClipboardService.isDeviceLocked should clear callingIdentity before
accessing KeyguardManager.
Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest
Bug:
64934810
Change-Id: I81a7adac8c9d56ed801ffc1380fcbc987d5df3e6
Merged-In: I712abfe8d542cd1be9c1816f407c8912321ac480
TreeHugger Robot [Wed, 13 Sep 2017 04:54:24 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:40:30 +0000 (04:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:39:44 +0000 (04:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:38:39 +0000 (04:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:38:04 +0000 (04:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:37:22 +0000 (04:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:36:45 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:36:15 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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 [Thu, 7 Sep 2017 18:25:02 +0000 (14:25 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: Ic7a81cf130fc70bc18f6990a662e921eb0d22635
Beverly [Tue, 5 Sep 2017 17:33:12 +0000 (13:33 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: I9f1d5c6605d6401f9811aef0db68cbf3e6dba06b
Beverly [Fri, 1 Sep 2017 15:14:57 +0000 (11:14 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: I02f615624b33c3fb6e2fbb15ce44a0032b6f4387
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 05:44:16 +0000 (22:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife1dd85496a4f99c95e6620970fcda9364f100d3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 05:36:07 +0000 (22:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebafa9958d7c5dbb9600897fb4a2cd284b901958
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
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:20:45 +0000 (21:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib60541d67a15603af67a8c0246df26901d70d30d
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:54:50 +0000 (20:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic40e264d75737f574cd2f5b66045d88a13abf67b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:46:35 +0000 (20:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8bc67ec371eee9c6ac521fa1137e6cc48206d2e3
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:16:43 +0000 (20:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I582cdd23abc2024c369353d2ce9ef5ab0e093a35
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:08:41 +0000 (20:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I73f2bcb2ea1ba973425305c7d0e38f4ba5ec0b60
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
Bill Yi [Tue, 12 Sep 2017 02:52:14 +0000 (19:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7525340cf04332581060c36ca1454b9fd628b65
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
OSDN Git Service
