OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:48:23 +0000 (02:48 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509  -s ours am: f1a95220a3 am: c6ca9254ed
am: 7fd4bec14a

Change-Id: Iadf94c4dcda9ae3e7a068838de87a4fadc18be7f

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 02:37:50 +0000 (02:37 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841
am: 9950579eb5

Change-Id: I9019cab591a3729592ddd142867f6b3f0c40c369

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:37:19 +0000 (02:37 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509  -s ours am: f1a95220a3
am: c6ca9254ed

Change-Id: I8715d787f890827442c098b7ef5c93c563e4246e

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 02:26:01 +0000 (02:26 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c
am: 19a3c53841

Change-Id: I20e8fba8fe69c10c5cbdd1a1d3db27a20a206e51

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:25:35 +0000 (02:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509  -s ours
am: f1a95220a3

Change-Id: Icccff07eedee53fdc20c40d62e41b40af0b4992f

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 02:12:01 +0000 (02:12 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa
am: 69cc90b01c

Change-Id: Ia0630be45dfa4778b204585002c299c847d32366

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714
am: 9b0a6a3509  -s ours

Change-Id: I8a0b0468b053f31a5e28b335cfdd68d7adf7e4b5

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 02:03:19 +0000 (02:03 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d
am: d34366e714

Change-Id: I1574e30ff64f6c7a691e8f4e1e4110cb0af9ee81

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 01:58:22 +0000 (01:58 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006
am: 2bab19f9aa

Change-Id: I3ee3147762e5ad8d72f4478d87800a35639228e0

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 01:49:20 +0000 (01:49 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0
am: c26e04b006

Change-Id: Iade150e6e33a8ac095941e55c5871215bf54fe2d

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 01:48:33 +0000 (01:48 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966
am: 3d600ede6d

Change-Id: Ibc39fe483882017cbd47733259bd04eb30b187f3

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 01:39:57 +0000 (01:39 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe
am: b24023a7e0

Change-Id: If0f97db33c9f48c13c5f97c313807e8aab25a16b

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 01:38:56 +0000 (01:38 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours
am: 01ae445966

Change-Id: Ia2dff6ee69c4c7f10413aa98ba17ca717cb492d2

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 01:30:16 +0000 (01:30 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours
am: dcdb0e6bbe

Change-Id: I245194dbfd5da9eb5f5d13977b12b5dde39c1bb2

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
Beverly Tai [Thu, 19 Oct 2017 01:23:57 +0000 (01:23 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours
am: 3ca0cc0ae6  -s ours

Change-Id: Id5662a7d789e3e17e365d99b439cc8e8ab5d1c37

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
Siyamed Sinir [Thu, 19 Oct 2017 01:20:25 +0000 (01:20 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0
am: 4973227cbf  -s ours

Change-Id: I9f53bf5a896885860e204764a8a282f77eff50cd

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 01:18:27 +0000 (01:18 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3
am: d1e7db9f4a

Change-Id: Ia7824e38f4b5d92d09577e30a20a72bdf513534f

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 01:07:40 +0000 (01:07 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba
am: 4e61bdb7d3

Change-Id: I6baddf0fcdcdd5a1236f69f5b19c67aa1e35b3c2

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 00:57:00 +0000 (00:57 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da
am: f0d00e51ba

Change-Id: I4e775fd5b0c2ad74e92ef84ac1b1e2f307d6b54e

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 00:47:30 +0000 (00:47 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c
am: cf16ef09da

Change-Id: I82ed951a2f528dab65b95332db48a865b3fe9296

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 00:37:28 +0000 (00:37 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958
am: 57bbf9bb9c

Change-Id: Ia3f528efeaca69830c1a858e6c4637690c70062a

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 00:28:13 +0000 (00:28 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2
am: 2d194e5958

Change-Id: I669966eb694623fe3052db84dd1dc6375e1bfde9

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
Suprabh Shukla [Thu, 19 Oct 2017 00:18:17 +0000 (00:18 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours
am: d2455f8fa2

Change-Id: I20c7da32465a525b0a0bcd21f862a0a49cf727cb

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448
Suprabh Shukla [Thu, 19 Oct 2017 00:07:54 +0000 (00:07 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448
am: 0597a93629  -s ours

Change-Id: I08d261935eb00ae8e8a929ff9ab54f6ec48fac88

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c...
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee...
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c...
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee...
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c...
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee...
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c...
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

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369...
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c
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

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9
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

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
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

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
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

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-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

6 years agoMerge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoMerge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88...
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

6 years agoMerge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88
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

6 years agoMerge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
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

6 years agoMerge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
TreeHugger Robot [Fri, 6 Oct 2017 15:45:37 +0000 (15:45 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
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: 3299034132879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
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: 3299034132879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
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: 3299034132879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
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: 3299034132879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42

6 years agoImport translations. DO NOT MERGE
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

6 years agoFix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda930...
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

6 years agoFix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda930...
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

6 years agoFix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda930...
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

6 years agoFix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda930...
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

6 years agoFix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307
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

6 years agoFix ClipboardService device lock check for cross profile am: 6d79675e0c
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

6 years agoFix ClipboardService device lock check for cross profile
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoStop explicitly using kCallerPasses_Ownership
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
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

6 years agoFix ClipboardService device lock check for cross profile
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:54:24 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "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

6 years agoMerge "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

6 years agoMerge "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

6 years agoMerge "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

6 years agoMerge "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

6 years agoMerge "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

6 years agoMerge "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

6 years agoMerge "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

6 years agoMerge "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

6 years agoMerge "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