OSDN Git Service
Suprabh Shukla [Wed, 18 Oct 2017 20:19:08 +0000 (20:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours
am:
28a1dd26e8 -s ours
Change-Id: If444060396d2b80c4073ac2c9fd2c4dcb1129590
Suprabh Shukla [Wed, 18 Oct 2017 20:05:12 +0000 (20:05 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours
am:
9913314caf -s ours
Change-Id: I5acc3db78fd84503b35aaa61539b1c6922e64465
Suprabh Shukla [Wed, 18 Oct 2017 19:43:57 +0000 (19:43 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours
am:
f0f1b1fe9e -s ours
Change-Id: I8ecb93fa4fa973ea6ee4694e1cd458b353a44bac
Suprabh Shukla [Wed, 18 Oct 2017 19:17:53 +0000 (19:17 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours
am:
17f0e4bc00 -s ours
Change-Id: I6dafcb8d51f40d157c2d6efbb41012d19c7eb1d2
Suprabh Shukla [Wed, 18 Oct 2017 19:05:08 +0000 (19:05 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours
am:
62dbcc9af0 -s ours
Change-Id: Ica4728bb090b2653d47308848ef8f771154879ca
Suprabh Shukla [Wed, 18 Oct 2017 18:51:00 +0000 (18:51 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours
am:
88f4c765a6 -s ours
Change-Id: Ia620503c958f9b1b2f44f2e99ba47d36bb558e0f
Suprabh Shukla [Wed, 18 Oct 2017 18:36:52 +0000 (18:36 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours
am:
54cbf03ecb -s ours
Change-Id: I500740d20bb4ee1b9cdb2de29387377e02be5872
Suprabh Shukla [Wed, 18 Oct 2017 18:19:39 +0000 (18:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours
am:
5bd2c48ac0 -s ours
Change-Id: Ib09d2326565a43d3ff0c4d0a88041703658a8804
Suprabh Shukla [Wed, 18 Oct 2017 18:04:15 +0000 (18:04 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f
am:
53a2e46036 -s ours
Change-Id: Ic0fa17750a252a75912c4a2da73d45ff9a9fea1d
Bill Yi [Mon, 16 Oct 2017 05:41:21 +0000 (05:41 +0000)]
Import translations. DO NOT MERGE
am:
b081f1e809 -s ours
Change-Id: I8589e76f2f5197beefddb2027261e290932d268f
Bill Yi [Sun, 15 Oct 2017 20:13:44 +0000 (13:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id17cd2d22442f7bf1221be8f98164189757695a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jeff Sharkey [Wed, 11 Oct 2017 22:27:31 +0000 (22:27 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7
am:
92d80b72aa
Change-Id: I872a35e35cf8a997108daad39447bbad36ccfcaf
Jeff Sharkey [Wed, 11 Oct 2017 22:12:39 +0000 (22:12 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224
am:
44adace6c6
Change-Id: I3d0c489f0a6b3522f93b6d3b4db7892d081dc11c
Jeff Sharkey [Wed, 11 Oct 2017 22:11:57 +0000 (22:11 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb
am:
f1f2a61fb7
Change-Id: Ib999a03b6b52d8ca7446b1db6450578bab50d5d9
Jeff Sharkey [Wed, 11 Oct 2017 22:00:35 +0000 (22:00 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853
am:
7512875224
Change-Id: I55e255c4089089403a327cb0e24f750b5b9975ec
Jeff Sharkey [Wed, 11 Oct 2017 21:51:37 +0000 (21:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571
am:
300e6ffafb
Change-Id: Iaef9ffa2cdfd6cf424fa22e554df3a0ea4d3e41f
Jeff Sharkey [Wed, 11 Oct 2017 21:41:50 +0000 (21:41 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7
am:
8860624853
Change-Id: Iea7736cd9e60673296bd39377393fa785bd58b17
Jeff Sharkey [Wed, 11 Oct 2017 21:34:52 +0000 (21:34 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours
am:
ba1f2d2571
Change-Id: Ie72b8e52cd8717ac87d90627c1f53cbe2261c5e5
Jeff Sharkey [Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c
am:
da3d10591a
Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b
Jeff Sharkey [Wed, 11 Oct 2017 21:24:00 +0000 (21:24 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours
am:
e9d2113af7
Change-Id: Id1d09fd582e8a213f49e215af708291dfc76bb78
Jeff Sharkey [Wed, 11 Oct 2017 21:20:52 +0000 (21:20 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63
am:
8916c30c54 -s ours
Change-Id: Ia94b157d80bec5c24616af67c19bbceb0c384c36
Jeff Sharkey [Wed, 11 Oct 2017 21:12:09 +0000 (21:12 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0
am:
72df97053c
Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3
Jeff Sharkey [Wed, 11 Oct 2017 20:59:51 +0000 (20:59 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee
am:
e62d479921 -s ours
Change-Id: I1bc814da2ad8f108189d7f2293bf373b04434257
Jeff Sharkey [Wed, 11 Oct 2017 20:58:32 +0000 (20:58 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c
am:
5d60a49d63
Change-Id: I1b0f66ccf915436637a804ff0517c431b2813ec8
Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a
am:
4a60106aa0
Change-Id: Iaace5d103229b9028d1b81602107af35857ca55c
Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c
am:
b4d23d55c2
Change-Id: Idfcdf295be77c9ab39d790e7793d2d772c92f9f7
Jeff Sharkey [Wed, 11 Oct 2017 20:44:45 +0000 (20:44 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9
am:
d20cad62ee
Change-Id: Iaee355315a29be72ffd670178f88510aacdfc042
Jeff Sharkey [Wed, 11 Oct 2017 20:42:42 +0000 (20:42 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9
am:
7555eb508c
Change-Id: Ida6bf3d99469b443d6312066497ddb067569cd1d
Jeff Sharkey [Wed, 11 Oct 2017 20:34:50 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
am:
9d3706046c
Change-Id: I46ef6e731af52bd7404e580f85611804abb8bcef
Jeff Sharkey [Wed, 11 Oct 2017 20:34:48 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
am:
254369967a
Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff
Jeff Sharkey [Wed, 11 Oct 2017 20:32:40 +0000 (20:32 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
04b96d76a9
Change-Id: Ie2ae7f5071a534e1245c92293014963c8e4187ca
Jeff Sharkey [Wed, 11 Oct 2017 20:31:35 +0000 (20:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
d87d2746a9
Change-Id: Ia5455efc69556e5a52b1cc945e99b2ef51fdcd23
TreeHugger Robot [Wed, 11 Oct 2017 20:23:53 +0000 (20:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:23:33 +0000 (20:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:22:22 +0000 (20:22 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
Bill Yi [Wed, 11 Oct 2017 19:20:06 +0000 (19:20 +0000)]
Import translations. DO NOT MERGE
am:
757057a5b5 -s ours
Change-Id: I35b629a43daf6ef991fc4ec61a4aba933cad0ae2
Bill Yi [Tue, 10 Oct 2017 22:31:12 +0000 (15:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4d38b1392fb97117f7a403a224fc65a871dcea19
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 8 Oct 2017 14:00:50 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
80d87da085 -s ours
Change-Id: I7b560ea83669c408725cf2e7d6e1a7c3d7eb191f
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:53:46 +0000 (16:53 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d
am:
54c2cbb0f9
Change-Id: Iae83cebe615d0df3a6f2c6bdee6f8002d3ae82b0
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
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Bill Yi [Mon, 2 Oct 2017 16:47:00 +0000 (16:47 +0000)]
Import translations. DO NOT MERGE
am:
45de16dde5 -s ours
Change-Id: Idaa0738ef0b990ef955a0f6c55c7a0905739439a
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:15:21 +0000 (01:15 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e
am:
7c7945c959
Change-Id: I0d4f109c2e73ee7088bb8b77eba563d60ee0113f
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 20:06:06 +0000 (20:06 +0000)]
Import translations. DO NOT MERGE
am:
47749a01d7 -s ours
Change-Id: I8c9c8f1ef6b35bffc1939fd7313261aa104ffe09
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 17:53:44 +0000 (17:53 +0000)]
Import translations. DO NOT MERGE
am:
1df9bbaafe -s ours
Change-Id: I2bf2ceaea1279df64cf7409c57c75039caaa7879
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 15:56:53 +0000 (15:56 +0000)]
Import translations. DO NOT MERGE
am:
de5eefa935 -s ours
Change-Id: I53abfc53a067bca1cec279285f59185b8b18a64e
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 19:09:21 +0000 (19:09 +0000)]
Import translations. DO NOT MERGE
am:
791ebeed32 -s ours
Change-Id: Iff6d60fe8fd1444c88ffa76634a50a4bb377334d
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:44:23 +0000 (17:44 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b
am:
68f91528c3 -s ours
Change-Id: Ib051065fc2e83bc001d82f18c9150339842f5e21
Beverly Tai [Thu, 14 Sep 2017 17:34:14 +0000 (17:34 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev
Beverly Tai [Thu, 14 Sep 2017 17:29:37 +0000 (17:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8 am:
3be1269c0a -s ours am:
0a93f42be2
am:
8462da779b
Change-Id: Ibbfa865f666f174b307fbe7a50ac73030d4a5c01
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 15:03:04 +0000 (15:03 +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
am:
e148e39d61
Change-Id: Ia19f7708f64129c5ab3fb37c516e00a81b3cfc1b
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
Bill Yi [Wed, 13 Sep 2017 23:18:12 +0000 (23:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
5b812c8df6 -s ours
Change-Id: Ie715aed27dae619de572006fe4a37210ac4cf21a
Bill Yi [Wed, 13 Sep 2017 23:12:27 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b53e9cf4a2 -s ours
Change-Id: Ibe71d1a15eba70b96675afcb711eaa46597ab82d
Bill Yi [Wed, 13 Sep 2017 23:08:34 +0000 (23:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c00cf0a49d -s ours
Change-Id: Icaaa9992ba23d840e46ab7ab774dadb7c279ba7b
Bill Yi [Wed, 13 Sep 2017 23:05:08 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7cc053233b -s ours
Change-Id: I728dcfc27c89c3f9d494b06d1a09625e6b33b085
Bill Yi [Wed, 13 Sep 2017 23:00:53 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7804b17f0e -s ours
Change-Id: I828e11d0d99cf7f5081ab3e4ea67d86dc6d44e9f
Bill Yi [Wed, 13 Sep 2017 22:54:23 +0000 (22:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b69531f99e -s ours
Change-Id: I27d6736b64df7e2887de545008d99b1bb5418049
Bill Yi [Wed, 13 Sep 2017 22:47:26 +0000 (22:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
37f29b0359 -s ours
Change-Id: I8a446d3a47db4c97e7292a8b6322a12013807813
Bill Yi [Wed, 13 Sep 2017 22:43:36 +0000 (22:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
f9075cb448 -s ours
Change-Id: Icabcb2f90bb9a1ab13ec338f8d57ae27bc540d2b
Bill Yi [Wed, 13 Sep 2017 22:39:09 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c016ef25c8 -s ours
Change-Id: I96d9c99869652d2d1aad512772394ef433296b6d
Bill Yi [Wed, 13 Sep 2017 22:35:01 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
9f5e95f64e -s ours
Change-Id: I2291d935b088a54cdb71524770c47b8be7dc97ae
Bill Yi [Wed, 13 Sep 2017 22:30:34 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
79bfe12e6b -s ours
Change-Id: I5c0b3e5592d6e3912bdfbb264961fcc37b43a941
Bill Yi [Wed, 13 Sep 2017 21:17:16 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e5fe30c1b0 -s ours
Change-Id: Ib28bd3a43d5fc857143345f25d63219f86149af5
Bill Yi [Wed, 13 Sep 2017 20:49:32 +0000 (20:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
222cc10fee -s ours
Change-Id: I711cdf888e217534fc50d3beae235cc516a28434
Bill Yi [Wed, 13 Sep 2017 20:07:25 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b484143b40 -s ours
Change-Id: I1b4a0545fe3e873bf3276e036f1f7edc067a25eb