OSDN Git Service

android-x86/frameworks-base.git
6 years agoImport translations. DO NOT MERGE am: 80d87da085 -s ours
Bill Yi [Sun, 8 Oct 2017 14:08:20 +0000 (14:08 +0000)]
Import translations. DO NOT MERGE am: 80d87da085  -s ours
am: d250d3aa34  -s ours

Change-Id: I8b02ede43b1430713761f1ff89c7c864ef6ae4a7

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

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 17:10:50 +0000 (17:10 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc am: f32424b90d am: 54c2cbb0f9
am: 85a68d9e71  -s ours

Change-Id: I09f8c134edef5c4cf67805faaf8cd56cae65ed69

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

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 agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Mon, 2 Oct 2017 17:33:24 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

6 years agoImport translations. DO NOT MERGE am: 45de16dde5 -s ours
Bill Yi [Mon, 2 Oct 2017 16:54:38 +0000 (16:54 +0000)]
Import translations. DO NOT MERGE am: 45de16dde5  -s ours
am: a8c4c7aa94  -s ours

Change-Id: I6485896b6b814d124c5a7a7b69e0e0a5910a383b

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 2 Oct 2017 11:16:10 +0000 (04:16 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I35ffe572de6f4cf7b2d871bae713da183300b353

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 03:19:36 +0000 (03:19 +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
am: 36153a9689  -s ours

Change-Id: I341930f4f2195705ec0ddcef29e807602f93f98b

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

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 agoMerge "Fix ClipboardService device lock check for cross profile" into oc-dev
Siyamed Sinir [Fri, 29 Sep 2017 23:15:06 +0000 (23:15 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-dev

6 years agoImport translations. DO NOT MERGE am: 47749a01d7 -s ours
Bill Yi [Thu, 28 Sep 2017 20:12:05 +0000 (20:12 +0000)]
Import translations. DO NOT MERGE am: 47749a01d7  -s ours
am: 27d4c36a3d  -s ours

Change-Id: Ie5b388d1266df622b41aabc29991509e2a0dc94f

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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 28 Sep 2017 15:59:12 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 28 Sep 2017 10:46:39 +0000 (03:46 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I78318e3a6213ef4ec92a409d319d076740914da0

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 agoMerge "Only construct real Throwable objects." into oc-dev
TreeHugger Robot [Thu, 28 Sep 2017 00:05:42 +0000 (00:05 +0000)]
Merge "Only construct real Throwable objects." into oc-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 26 Sep 2017 18:42:25 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

6 years agoImport translations. DO NOT MERGE am: 1df9bbaafe -s ours
Bill Yi [Tue, 26 Sep 2017 18:03:49 +0000 (18:03 +0000)]
Import translations. DO NOT MERGE am: 1df9bbaafe  -s ours
am: 6cc2a9cdc2  -s ours

Change-Id: I4d3d9da8dcdc0c898c49856cae530c14f6aa915e

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 26 Sep 2017 13:58:36 +0000 (06:58 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I348ab7ada9d98e745fe4716beadb6857d39705ec

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 agoMerge "Improve AVRCP quality and state handling (2/2)" into oc-dev
Andre Eisenbach [Thu, 21 Sep 2017 18:15:27 +0000 (18:15 +0000)]
Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev

6 years agoImport translations. DO NOT MERGE am: de5eefa935 -s ours
Bill Yi [Thu, 21 Sep 2017 16:04:11 +0000 (16:04 +0000)]
Import translations. DO NOT MERGE am: de5eefa935  -s ours
am: 9d008286c7  -s ours

Change-Id: I5535968d3817e8c09e9d5e3e0a75180d29dbe303

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Sep 2017 10:12:01 +0000 (03:12 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I0e4df67a950b6e0d541548c01f0812141102fb91

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 agoOnly construct real Throwable objects.
Jeff Sharkey [Wed, 20 Sep 2017 22:09:16 +0000 (16:09 -0600)]
Only construct real Throwable objects.

Without this test, someone could trick us into constructing other
shady classes.

Test: builds, boots
Bug: 65281159
Change-Id: If678d0681708d1b0dcf056aa1133830ad3dbce31

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Mon, 18 Sep 2017 19:31:18 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

6 years agoImport translations. DO NOT MERGE am: 791ebeed32 -s ours
Bill Yi [Mon, 18 Sep 2017 19:16:08 +0000 (19:16 +0000)]
Import translations. DO NOT MERGE am: 791ebeed32  -s ours
am: fee3748d04  -s ours

Change-Id: I4d666020e912f122850cc140e3f62d65aea029ca

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

6 years agoMerge "Fix nomanservice notificationrecord leak" into oc-dev
TreeHugger Robot [Mon, 18 Sep 2017 17:35:06 +0000 (17:35 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 18 Sep 2017 15:21:35 +0000 (08:21 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I6a56e46644120a42a4a0cff43dfd5f8b61ca6f8f

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 agoMerge "disable carrier actions on redirection by default" into oc-dev
Chen Xu [Fri, 15 Sep 2017 17:54:26 +0000 (17:54 +0000)]
Merge "disable carrier actions on redirection by default" into oc-dev

6 years agodisable carrier actions on redirection by default
fionaxu [Wed, 6 Sep 2017 21:19:16 +0000 (14:19 -0700)]
disable carrier actions on redirection by default

    1. the assumption of "carrier will redirect users to their captive
    portal page when users dont have data plan" might not be true for all
    carriers. We have seem issues like carriers random redirect users when
    they still have balance left.
    2. turn this off by default and turn it on if the carrier is
    behaving correctly and agree with it.

Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Bug: 65113738
Test: Manual
Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3

6 years agoMerge "docs: updated link on RemoteInput page" into oc-dev
Kevin Hufnagle [Fri, 15 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev

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 oc-dev
Beverly Tai [Thu, 14 Sep 2017 18:49:00 +0000 (18:49 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1...
Beverly Tai [Thu, 14 Sep 2017 18:00:15 +0000 (18:00 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3  -s ours
am: 26e84466d3  -s ours

Change-Id: I8564ca1d5f7c185bd6eedd0ee23adbefa9a421e0

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev
Beverly Tai [Thu, 14 Sep 2017 17:50:15 +0000 (17:50 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev
am: 121d3b89f7  -s ours

Change-Id: I91cb627a007c03660d41b0a01d3de71165373ff1

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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev...
Beverly Tai [Thu, 14 Sep 2017 17:40:12 +0000 (17:40 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a  -s ours am: 0a93f42be2 am: 8462da779b
am: ba55b3bea6  -s ours

Change-Id: I0d0ce4d4a017126cb5f6cab1fbe4da2e8ba37ce9

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

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

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 15:10:05 +0000 (15:10 +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
am: a126d94892  -s ours

Change-Id: Iafccd7ef757e1b858a58ce31df55f0f0b545903f

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

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 am: 5b812c8df6 -s ours
Bill Yi [Wed, 13 Sep 2017 23:50:04 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5b812c8df6  -s ours
am: 98313f5996  -s ours

Change-Id: If26ea10608d586d3014bd99d2c27720d2316e37a

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: b53e9cf4a2 -s ours
Bill Yi [Wed, 13 Sep 2017 23:41:40 +0000 (23:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b53e9cf4a2  -s ours
am: 8eb6ff0212  -s ours

Change-Id: I6bf75581266953ee24347d9248a6f672a0db7651

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours
Bill Yi [Wed, 13 Sep 2017 23:37:36 +0000 (23:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d  -s ours
am: 2b492b6502  -s ours

Change-Id: I1968606706a2c4a0041b4e26f08d3de5aa6e4046

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b -s ours
Bill Yi [Wed, 13 Sep 2017 23:31:03 +0000 (23:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b  -s ours
am: fc0a43743e  -s ours

Change-Id: Idd71b32264c2fe1dc2b2cc572778882650170f81

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 7804b17f0e -s ours
Bill Yi [Wed, 13 Sep 2017 23:26:19 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7804b17f0e  -s ours
am: b7c6238556  -s ours

Change-Id: Id8c25356f63b7755f305b6f88eaa49ebdb3903df

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: b69531f99e -s ours
Bill Yi [Wed, 13 Sep 2017 23:14:37 +0000 (23:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b69531f99e  -s ours
am: 16bc5f15b7  -s ours

Change-Id: I09bbb5157c9e43f348cba855db6430245c525c54

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 37f29b0359 -s ours
Bill Yi [Wed, 13 Sep 2017 23:11:18 +0000 (23:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 37f29b0359  -s ours
am: 4f8b486f69  -s ours

Change-Id: I915c191c0d807b6347df276661ad850d9ef7bd17

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: f9075cb448 -s ours
Bill Yi [Wed, 13 Sep 2017 23:05:48 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: f9075cb448  -s ours
am: c0ccea9bf5  -s ours

Change-Id: Ie82ec238bedf1d6b36fa027b466f1682c368f8c4

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: c016ef25c8 -s ours
Bill Yi [Wed, 13 Sep 2017 23:00:37 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c016ef25c8  -s ours
am: 318728fd6b  -s ours

Change-Id: I230701f9b32e0b51962459ac740ddcb446415b96

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 9f5e95f64e -s ours
Bill Yi [Wed, 13 Sep 2017 22:52:33 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9f5e95f64e  -s ours
am: 697f149acf  -s ours

Change-Id: Iee1a8646963d52b43be7fc9de34cc88468b23bec

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 79bfe12e6b -s ours
Bill Yi [Wed, 13 Sep 2017 22:48:33 +0000 (22:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 79bfe12e6b  -s ours
am: 1db479ee26  -s ours

Change-Id: Icba327537143ff1f0753a31123e3f3feb2f862da

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: e5fe30c1b0 -s ours
Bill Yi [Wed, 13 Sep 2017 22:44:20 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e5fe30c1b0  -s ours
am: 9abe093864  -s ours

Change-Id: I2f2564a295bdaa73cabc41ade774c3ced7d07e6b

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee -s ours
Bill Yi [Wed, 13 Sep 2017 22:40:02 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee  -s ours
am: 289d6b71a9  -s ours

Change-Id: I30dcfc1b085a93df65ef63354e824c395ab8fecc

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoFix ClipboardService device lock check for cross profile
Siyamed Sinir [Wed, 13 Sep 2017 19:19:41 +0000 (12:19 -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: I712abfe8d542cd1be9c1816f407c8912321ac480

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: b484143b40 -s ours
Bill Yi [Wed, 13 Sep 2017 21:31:42 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b484143b40  -s ours
am: 307f6a4d92  -s ours

Change-Id: Ibfc25bcb992c45a43c799412a7f47f6a12a77234