git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Android Build Merger (Role) [Fri, 20 Oct 2017 00:59:12 +0000 (00:59 +0000)]

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac -s ours am: b6ecd1f88a am: f2e1ef2297 am: edc549d78e" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Beverly Tai [Fri, 20 Oct 2017 00:56:21 +0000 (00:56 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac -s ours am: b6ecd1f88a am: f2e1ef2297
am: edc549d78e

Change-Id: I4fcd58e1471efc519e2c3bcba2d1bcdca4b747e9

commit | commitdiff | tree

Nan Zhang [Fri, 20 Oct 2017 00:50:31 +0000 (00:50 +0000)]

Merge "Shard framework during Java compilation for target side." am: 6a90c3f793 am: b06e03c134
am: 6b4f75ec4a

Change-Id: Iba206e39782bf0ac8057470d856251a599a230c9

commit | commitdiff | tree

Beverly Tai [Fri, 20 Oct 2017 00:36:59 +0000 (00:36 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac -s ours am: b6ecd1f88a
am: f2e1ef2297

Change-Id: I99d77a01bbd5992effb98cc2cec15a27ab78d223

commit | commitdiff | tree

Suprabh Shukla [Fri, 20 Oct 2017 00:33:21 +0000 (00:33 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55 am: a4454ba4a9 am: 29257874f9 am: 02d89a3c0c am: 14164f1bdf am: 7078aaa62a
am: d6e80237d9

Change-Id: Id57a09b062896003af97edb7b25b8fd077004586

commit | commitdiff | tree

Nan Zhang [Fri, 20 Oct 2017 00:27:11 +0000 (00:27 +0000)]

Merge "Shard framework during Java compilation for target side." am: 6a90c3f793
am: b06e03c134

Change-Id: I9ae5c3ae45cac0a53b81043f33af2fd2910e86f8

commit | commitdiff | tree

Suprabh Shukla [Fri, 20 Oct 2017 00:21:45 +0000 (00:21 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55 am: a4454ba4a9 am: 29257874f9 am: 02d89a3c0c am: 14164f1bdf am: 7078aaa62a
am: fa4d0a1d80

Change-Id: Ifaa66862877cbdde99a93f2ba7c59f8f1da8a5f4

commit | commitdiff | tree

Nan Zhang [Fri, 20 Oct 2017 00:17:23 +0000 (00:17 +0000)]

Merge "Shard framework during Java compilation for target side."
am: 6a90c3f793

Change-Id: I1a24f704d3537bde1e4aaef5bd4edf4cc898bb04

commit | commitdiff | tree

Beverly Tai [Fri, 20 Oct 2017 00:17:11 +0000 (00:17 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac -s ours
am: b6ecd1f88a

Change-Id: Id7edf88371f89d5ff9a4aad06c25cd133eb17415

commit | commitdiff | tree

Suprabh Shukla [Fri, 20 Oct 2017 00:02:54 +0000 (00:02 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55 am: a4454ba4a9 am: 29257874f9 am: 02d89a3c0c am: 14164f1bdf
am: 7078aaa62a

Change-Id: Ib2de51e856b8fe7da42c37490cb84bafee9ed2f7

commit | commitdiff | tree

Suprabh Shukla [Fri, 20 Oct 2017 00:01:26 +0000 (00:01 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55 am: a4454ba4a9 am: 29257874f9 am: 02d89a3c0c am: 14164f1bdf
am: 7078aaa62a

Change-Id: I00826913bfa33d529b3056c7d4a2b4a9215172d8

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 23:52:10 +0000 (23:52 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1
am: 260ef208ac -s ours

Change-Id: If5929149e8173cd14c15e9d4d6e513e10f96f876

commit | commitdiff | tree

Treehugger Robot [Thu, 19 Oct 2017 23:46:18 +0000 (23:46 +0000)]

Merge "Shard framework during Java compilation for target side."

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 23:43:16 +0000 (23:43 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55 am: a4454ba4a9 am: 29257874f9 am: 02d89a3c0c
am: 14164f1bdf

Change-Id: I6bea094bde1b97604d7769646d9b04f7e6b21ca2

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 23:37:21 +0000 (23:37 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16
am: 4dd01948c1

Change-Id: I7426cd9b8f68f80a924662b4870558974bad347b

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 23:22:43 +0000 (23:22 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55 am: a4454ba4a9 am: 29257874f9
am: 02d89a3c0c

Change-Id: If82c97668497ce72ad29b055b15646291df66157

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 23:11:55 +0000 (23:11 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294
am: 791d8a5b16

Change-Id: I0678613fd0293afeafa38c4ac9fb0a55fb4b3969

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 23:09:02 +0000 (23:09 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55 am: a4454ba4a9
am: 29257874f9

Change-Id: I3852ef99532b956fd3280c49d6722c2aed1d79a6

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 22:56:23 +0000 (22:56 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef
am: 5fda53b294

Change-Id: Idda35731b13787fb00e0c7474eebc5b7d8660251

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 22:54:42 +0000 (22:54 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55
am: a4454ba4a9

Change-Id: Ie24e5fc3ab442ca5c51ca79687d417ae563d631c

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 22:40:05 +0000 (22:40 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b
am: d1150b7e55

Change-Id: Iac842a9f018f24c905d4e165362f5bf87470d296

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 22:39:14 +0000 (22:39 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 22:25:04 +0000 (22:25 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1
am: 55ffaea04b

Change-Id: I10a7a16d5463e4cbf7880b1979541ea82a56ddd3

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 22:20:11 +0000 (22:20 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 22:06:31 +0000 (22:06 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06
am: cf8fe172a1

Change-Id: I8600883ef4cad6f8b11fc005fc9cfd62d84aeb08

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 22:06:02 +0000 (22:06 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c
am: 06bd19c1fb

Change-Id: I6f6cb9cf71ba1584b162d6b18c28c2825323e7be

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 21:55:31 +0000 (21:55 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef
am: 8fb52c8d06

Change-Id: I2d8cdac51baf7b8df6b903f0416e525e9ec44784

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 21:50:59 +0000 (21:50 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b
am: d7ece4da2c

Change-Id: Icfd3af47bed5a40d23d1a48ecbb654625898ca2f

commit | commitdiff | tree

Adam Lesinski [Thu, 19 Oct 2017 21:43:31 +0000 (21:43 +0000)]

Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
am: 8da74b1bfd

Change-Id: Ifd3555db424136fe8a8057504df414f41fb020a1

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 21:41:08 +0000 (21:41 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5
am: 6f0e6952ef

Change-Id: Ie4cf94614784c4938776c8c6c37fff64e6cfa240

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 21:35:03 +0000 (21:35 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours
am: dfbaa1fd8b

Change-Id: I3bcc1adb52f00e95ef31dc17fc29b2e0242bc753

commit | commitdiff | tree

jackqdyulei [Thu, 19 Oct 2017 21:31:54 +0000 (21:31 +0000)]

Reuse the BluetoothBatteryDrawable in QS detail
am: 4b7f43bcae

Change-Id: Ie5fd81010fae4660bb0fdd5d6d061fa535d86150

commit | commitdiff | tree

TreeHugger Robot [Thu, 19 Oct 2017 21:31:10 +0000 (21:31 +0000)]

Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 21:25:06 +0000 (21:25 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours
am: 159648d6e5

Change-Id: I34260f4fd841084a9e91b89905d84004efb40b23

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 21:18:55 +0000 (21:18 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
am: f2b592726d -s ours

Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 20:57:26 +0000 (20:57 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28
am: 8b438236ce -s ours

Change-Id: Ib8c3a4e6e8e39e42aa640c9988d0dd2022f486ec

commit | commitdiff | tree

jackqdyulei [Thu, 19 Oct 2017 18:05:09 +0000 (11:05 -0700)]

Reuse the BluetoothBatteryDrawable in QS detail

BluetoothBatteryDrawable creates the drawable lazily using
the latest(and most correct) context. So it could get the
correct color from the theme.

Also add iconScale field in BluetoothBatteryDrawable so the size
of the battery icon could be scaled.

Bug: 67377756
Test: Manual - connected to bluetooth headphone and open the qs
page and detail page. Retest it after changing it to dark theme.
Change-Id: Ic6c871985a89a503221755eed4bc2605ab53f630

commit | commitdiff | tree

Jerry Zhang [Thu, 19 Oct 2017 18:36:22 +0000 (18:36 +0000)]

Merge "Add storageId to moveObjects" am: 1f4f6d2a18 am: 18abf57e99
am: 59ff05a59f

Change-Id: I024be0c75e20e58152dbe0c81e5548d70f06a925

commit | commitdiff | tree

Jerry Zhang [Thu, 19 Oct 2017 18:22:46 +0000 (18:22 +0000)]

Merge "Add storageId to moveObjects" am: 1f4f6d2a18
am: 18abf57e99

Change-Id: Ieb79d5a10307c47cd772ae5ef621717d5c90cdc2

commit | commitdiff | tree

Jerry Zhang [Thu, 19 Oct 2017 18:11:49 +0000 (18:11 +0000)]

Merge "Add storageId to moveObjects"
am: 1f4f6d2a18

Change-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e

commit | commitdiff | tree

Jerry Zhang [Thu, 19 Oct 2017 17:55:34 +0000 (17:55 +0000)]

Merge "Add storageId to moveObjects"

commit | commitdiff | tree

Benedict Wong [Thu, 19 Oct 2017 17:37:22 +0000 (17:37 +0000)]

Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35 am: d3a5792024
am: f92bfc3b77

Change-Id: I49932a5fc048b4a60512fac45a3537f050397168

commit | commitdiff | tree

Benedict Wong [Thu, 19 Oct 2017 17:26:19 +0000 (17:26 +0000)]

Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35
am: d3a5792024

Change-Id: I5bf43f78716769a6f1f90169f500e9eee7a91f18

commit | commitdiff | tree

Benedict Wong [Thu, 19 Oct 2017 17:14:53 +0000 (17:14 +0000)]

Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
am: b6df7f0d35

Change-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b

commit | commitdiff | tree

Benedict Wong [Thu, 19 Oct 2017 17:06:30 +0000 (17:06 +0000)]

Merge "Add support for AES-GCM-ESP as an IPSec algorithm"

commit | commitdiff | tree

Tobias Thierer [Thu, 19 Oct 2017 16:42:50 +0000 (16:42 +0000)]

Merge "Move most android.util.Mutable* classes to framework." am: cd06caf10e am: 4719440f3f
am: 23c2a6578b

Change-Id: I990ecf36ee6d2cd1d55c7cb1e652a8998ff84f35

commit | commitdiff | tree

Tobias Thierer [Thu, 19 Oct 2017 16:31:25 +0000 (16:31 +0000)]

Merge "Move most android.util.Mutable* classes to framework." am: cd06caf10e
am: 4719440f3f

Change-Id: I699ae1fdec65f8c0ed584c13424e922f226d3ce0

commit | commitdiff | tree

Tobias Thierer [Thu, 19 Oct 2017 16:18:44 +0000 (16:18 +0000)]

Merge "Move most android.util.Mutable* classes to framework."
am: cd06caf10e

Change-Id: I25fd01bd4bc8c582e6cb79a03de47847b46bcb83

commit | commitdiff | tree

Tobias Thierer [Thu, 19 Oct 2017 16:08:07 +0000 (16:08 +0000)]

Merge "Move most android.util.Mutable* classes to framework."

commit | commitdiff | tree

Bill Yi [Thu, 19 Oct 2017 16:02:24 +0000 (16:02 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: db768d45e0 -s ours

Change-Id: Ie3665e5f71cf66f0eb36741a42244043b70b78b4

commit | commitdiff | tree

TreeHugger Robot [Thu, 19 Oct 2017 15:52:22 +0000 (15:52 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

Tobias Thierer [Thu, 19 Oct 2017 15:12:57 +0000 (16:12 +0100)]

resolve merge conflicts of 5c9e47d28b24 to oc-mr1-dev-plus-aosp

Test: This merge conflict was automatically resolved by meld.
      The automatic resolution of the same merge conflict by meld
      from cherrypicking this CL into internal-master has passed
      Treehugger (and was already submitted).
Exempt-From-Owner-Approval: Resolving merge conflicts with no deltas
Change-Id: I61f15aeb79c1ad26cc7c51be2af59ecb7b672a7b

commit | commitdiff | tree

Tobias Thierer [Thu, 19 Oct 2017 14:34:36 +0000 (14:34 +0000)]

Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os" am: 5f04db96b3
am: 07efe116b1

Change-Id: I1c9f25ea1ac00037cc90dfe4c8c2552f90a33ecd

commit | commitdiff | tree

Tobias Thierer [Thu, 19 Oct 2017 14:25:12 +0000 (14:25 +0000)]

Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
am: 5f04db96b3

Change-Id: If85216d03022708787a7218e494434453d5548e3

commit | commitdiff | tree

Tobias Thierer [Thu, 19 Oct 2017 14:15:52 +0000 (14:15 +0000)]

Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"

commit | commitdiff | tree

Bill Yi [Thu, 19 Oct 2017 08:21:34 +0000 (01:21 -0700)]

Import translations. DO NOT MERGE

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

Bug: 64712476
Change-Id: I359b63c9efc317b1a6053d73321a3769871efbf3

commit | commitdiff | tree

Manu Viswanadhan [Thu, 19 Oct 2017 06:21:39 +0000 (06:21 +0000)]

Merge "Settings: Fix leak of BroadcastReceiver intents" am: 3499af28c4 am: 1b4a0abdbb
am: 517b35fa1c

Change-Id: I11f0b50f93e2a722ecf3c8bd398462c967d9bfb2

commit | commitdiff | tree

Manu Viswanadhan [Thu, 19 Oct 2017 06:12:20 +0000 (06:12 +0000)]

Merge "Settings: Fix leak of BroadcastReceiver intents" am: 3499af28c4
am: 1b4a0abdbb

Change-Id: I4779532a0be4e8a821e521d1b962b4c57ecf86b8

commit | commitdiff | tree

Manu Viswanadhan [Thu, 19 Oct 2017 06:02:23 +0000 (06:02 +0000)]

Merge "Settings: Fix leak of BroadcastReceiver intents"
am: 3499af28c4

Change-Id: I2b0f3920f39981956d25017999a25799d995252b

commit | commitdiff | tree

Treehugger Robot [Thu, 19 Oct 2017 05:53:23 +0000 (05:53 +0000)]

Merge "Settings: Fix leak of BroadcastReceiver intents"

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 04:26:57 +0000 (04:26 +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 am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99 am: a9d3b4d806
am: ea0b574ea5

Change-Id: I998c65ff305494f8527f97c4b4d28fb4f791585d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 19 Oct 2017 04:16:51 +0000 (04:16 +0000)]

Merge "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 am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99 am: a9d3b4d806 am: 1fa3f2a9d0" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 04:15:24 +0000 (04:15 +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 am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99 am: a9d3b4d806
am: 1fa3f2a9d0

Change-Id: I2847d3a98f87781d601406283a6909f55fe0db82

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 04:09:18 +0000 (04:09 +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 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2 am: b614e5560e
am: 1d1aac8621

Change-Id: I4142801a260251282d78a8e1c4b69a6d7b4b3b54

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 03:59:12 +0000 (03:59 +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 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2 am: b614e5560e
am: 5cf9cbd3a3

Change-Id: I4d24939ad00fdf262e8a81c2a2468645093601cf

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 03:58:38 +0000 (03:58 +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 am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99
am: a9d3b4d806

Change-Id: I325ff1074f1481ffdb661a8bee155b64e7586f1b

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 03:58:35 +0000 (03:58 +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 am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99
am: a9d3b4d806

Change-Id: Id867bdf6b1756dd2a1cf8a9229d61125aeccf463

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 03:43:31 +0000 (03:43 +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 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2
am: b614e5560e

Change-Id: If3c96f55d78b11e7372ca8783cf41f9a50984faa

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 03:43:28 +0000 (03:43 +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 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2
am: b614e5560e

Change-Id: I34c80d0a98a7a4ea1c78f5ae8619e9566bb33476

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 03:34:46 +0000 (03:34 +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 am: b00fd6bb97 am: 93d9ac257d -s ours
am: 1ce0456b99

Change-Id: I9650a76a4f2dacb2c37e8232409e03c8745383f7

commit | commitdiff | tree

Svet Ganov [Thu, 19 Oct 2017 03:26:00 +0000 (03:26 +0000)]

Merge "Preserve ranking attrs of resolve infos for installing a feature split" into oc-mr1-dev
am: 8f231b7aa6

Change-Id: Id85257c481a7d4e387ffc6ee628bfd2986ab5b3c

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 03:22:50 +0000 (03:22 +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 am: 8621a28b04 am: 685b515140
am: 65f1a4c4c2

Change-Id: I97965f18ce2146b65542ef8c2125c88c024c67c8

commit | commitdiff | tree

TreeHugger Robot [Thu, 19 Oct 2017 03:16:48 +0000 (03:16 +0000)]

Merge "Preserve ranking attrs of resolve infos for installing a feature split" into oc-mr1-dev

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 03:06:40 +0000 (03:06 +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 am: b00fd6bb97
am: 93d9ac257d -s ours

Change-Id: Ic1a98303821102d3cddbdbf52b98f2739c2507f6

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 03:00:17 +0000 (03:00 +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 am: 8621a28b04
am: 685b515140

Change-Id: I42139be71b55e6a9a7c88b97cd99936216541cc3

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 02:59:41 +0000 (02:59 +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
am: b00fd6bb97

Change-Id: Ie1ed5edaabe4cf6206764c0f343a70eb588009c5

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 02:49:27 +0000 (02: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 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5
am: 8621a28b04

Change-Id: Ifac3ab83e23f93d8f0834029b44ec8f32bbab243

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 02:41:36 +0000 (02:41 +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 am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4 am: 2bded32359
am: da605f5a0e

Change-Id: Ifbb088171def4c9ecfc723f6aa3fd44fe3e4c091

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 02:33:18 +0000 (02:33 +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 am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4 am: 2bded32359
am: 7f9454d63d

Change-Id: I4106b6b3a5ffce44afbe2fb0a515222a5fb97d69

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 02:16:32 +0000 (02:16 +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 am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4
am: 2bded32359

Change-Id: I630b1db9d19f34f6f42601a36a5883e824087287

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 02:16:29 +0000 (02:16 +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 am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4
am: 2bded32359

Change-Id: I61b5f44bbddc391303dfec7e64895d83c588f7f8

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 02:12:01 +0000 (02:12 +0000)]

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 01:59:51 +0000 (01:59 +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 am: 9ecbe6f6e7 am: a9e9e83964
am: f580b0f6a4

Change-Id: Ie647ac50b0d312df13a163005c2a7bbfd8a4a26e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 01:44:47 +0000 (01:44 +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 am: 9ecbe6f6e7
am: a9e9e83964

Change-Id: I97ab1af2f24b3773cb879f13d00fb1df0177f3fc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 01:30:27 +0000 (01:30 +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
am: 9ecbe6f6e7

Change-Id: I6c55e7667d23c638f16bd4bd5c62f9f706542154

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help