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

Beverly Tai [Thu, 14 Sep 2017 18:17:48 +0000 (18:17 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours am: 95e10b296e
am: c3e2d40309

Change-Id: I2376a371a5b4e5e29155dff85054b5620dfd2fa6

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 18:02:07 +0000 (18:02 +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 am: ef696aa47b
am: a35989b007

Change-Id: Iac8295f193dca56ed6a1817e729c024921abe593

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 18:00:56 +0000 (18:00 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours
am: 95e10b296e

Change-Id: I4cc393a504461b206355dd269c59cd5b38c80f09

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 17:51:28 +0000 (17:51 +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
am: ef696aa47b

Change-Id: I977532e25b0bbfb05c1687d9cca7311d46d5eb8c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Siyamed Sinir [Thu, 14 Sep 2017 17:34:02 +0000 (17:34 +0000)]

Merge "Fix maxLines/lines properties for BoringLayout" into oc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hall Liu [Thu, 14 Sep 2017 17:20:12 +0000 (17:20 +0000)]

Merge changes from topic "embms-cherry-pick" into oc-mr1-dev

* changes:
Make EMBMS adjustments for 08/04
Prepare EMBMS apis for un-hiding

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 14 Sep 2017 17:07:16 +0000 (17:07 +0000)]

Merge "Show Autofill Service icon on Save UI." into oc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 14 Sep 2017 16:29:56 +0000 (16:29 +0000)]

Merge "Update network rules on meteredness changes." into oc-mr1-dev

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 15:26:41 +0000 (15:26 +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 am: 2435c816d8
am: a62951f28f

Change-Id: I98176e73e4fc9e1627c638ff7510fdc35b3b874f

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 15:19:03 +0000 (15:19 +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
am: 2435c816d8

Change-Id: Idba71a4e659947f4ebf0dd76c3d305bc3a9132e6

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 14 Sep 2017 13:53:49 +0000 (13:53 +0000)]

Merge "Add logs to IOExceptions during adb backup" into oc-mr1-dev

commit | commitdiff | tree

Chris Wren [Thu, 14 Sep 2017 12:05:12 +0000 (12:05 +0000)]

Merge "don't log auto-expansion of notificaitons" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 14 Sep 2017 11:27:32 +0000 (11:27 +0000)]

Merge "Fix typo in LockSettingsService.getDecryptedPasswordsForAllTiedProfiles" into oc-mr1-dev

commit | commitdiff | tree

Jan Althaus [Wed, 13 Sep 2017 11:55:29 +0000 (13:55 +0200)]

Change default smart select range for logging to [0,0]

Bug: 64914512
Test: Manually tested that logs are correct. Will follow up with automated tests.
Change-Id: I5eb151f49f9dd665c6c76625ebb2b9c0be96a11d

commit | commitdiff | tree

Jakub Pawlowski [Wed, 13 Sep 2017 16:33:34 +0000 (09:33 -0700)]

Bluetooth: thread-safe callback invocation

Bug: 65596701
Test: manual
Change-Id: I92a436328a3070ea842e8e652891e485406c2ed7
Merged-In: I92a436328a3070ea842e8e652891e485406c2ed7
(cherry picked from commit 3eb569fc72781857f1f2722bb645a6090a9b53ce)

commit | commitdiff | tree

Jakub Pawlowski [Thu, 14 Sep 2017 02:32:28 +0000 (02:32 +0000)]

Merge "Bluetooth: fix GATT race conditions when using Handler" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:43:50 +0000 (01:43 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5b812c8df6 -s ours am: 98313f5996 -s ours am: 95dd448a5e -s ours
am: abc3417961 -s ours

Change-Id: I61c531101305b5875be83847991d4514cc773511

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:39:21 +0000 (01:39 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b53e9cf4a2 -s ours am: 8eb6ff0212 -s ours am: c8ede1e966 -s ours
am: ea94475791 -s ours

Change-Id: I2c90c8467634d338d1eebe8cdfdfa0de6cb0902b

commit | commitdiff | tree

TreeHugger Robot [Thu, 14 Sep 2017 01:35:42 +0000 (01:35 +0000)]

Merge "vendor apk is unbundled" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 14 Sep 2017 01:35:01 +0000 (01:35 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours am: 2b492b6502 -s ours am: 8d1cdbb135 -s ours am: 1186c6ec45 -s ours" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 14 Sep 2017 01:25:22 +0000 (01:25 +0000)]

Merge "Fixed an issue where the pattern wouldn't show properly" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:24:43 +0000 (01:24 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours am: 2b492b6502 -s ours am: 8d1cdbb135 -s ours
am: 1186c6ec45 -s ours

Change-Id: I44ea9e39a0c4dfcf5da7d0415d6c941a2a93d686

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:17:51 +0000 (01:17 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b -s ours am: fc0a43743e -s ours am: 8d0a15c4f5 -s ours
am: 3989c8b1f7 -s ours

Change-Id: I607c1016f3eb395ebc015e362c00d4ac1914e1ce

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:14:07 +0000 (01:14 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7804b17f0e -s ours am: b7c6238556 -s ours am: a690e7362d -s ours
am: 2dd51799b2 -s ours

Change-Id: I0594a7e4f0eaaa2ab607ecbf6dab50e64d72fe33

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:05:27 +0000 (01:05 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5b812c8df6 -s ours am: 98313f5996 -s ours
am: 95dd448a5e -s ours

Change-Id: I9dabad9b8dbfb88c9c41fb9334730e3d9a13b822

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:01:00 +0000 (01:01 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b69531f99e -s ours am: 16bc5f15b7 -s ours am: 69259c2b32 -s ours
am: 9ebfe48df5 -s ours

Change-Id: Id4c8b1da2079dcc92deefbecd6faa18df2651597

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:00:57 +0000 (01:00 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b53e9cf4a2 -s ours am: 8eb6ff0212 -s ours
am: c8ede1e966 -s ours

Change-Id: Ic177de299decf09261daf18f8a0b779bf10727de

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:54:20 +0000 (00:54 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 37f29b0359 -s ours am: 4f8b486f69 -s ours am: 0dd2e975ca -s ours
am: bcbc39e695 -s ours

Change-Id: I875a747924bd5f89ae7b73b6282bd9cd878c5c71

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:53:06 +0000 (00:53 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours am: 2b492b6502 -s ours
am: 8d1cdbb135 -s ours

Change-Id: I5ae31f699edb0155b27dacccea4ed5972f8cb666

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:49:39 +0000 (00:49 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b -s ours am: fc0a43743e -s ours
am: 8d0a15c4f5 -s ours

Change-Id: I69b7c005b4dc5b4c63743a7a315bf2aa3e4e290a

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:47:57 +0000 (00:47 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: f9075cb448 -s ours am: c0ccea9bf5 -s ours am: 4e72aa2314 -s ours
am: 797dca48c9 -s ours

Change-Id: Ie697f29340feabdd2f5c0c729afbe6ba571f119f

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:39:22 +0000 (00:39 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c016ef25c8 -s ours am: 318728fd6b -s ours am: 9ce3cc9c78 -s ours
am: 0973e9a34e -s ours

Change-Id: I7246fb14f24a8ed13fe663570672a95c196f4210

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:37:57 +0000 (00:37 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7804b17f0e -s ours am: b7c6238556 -s ours
am: a690e7362d -s ours

Change-Id: Iffe01cedcfb01c31c9f89e3ddb459552934fb000

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:35:58 +0000 (00:35 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9f5e95f64e -s ours am: 697f149acf -s ours am: b5b1b7b505 -s ours
am: eb29e3e357 -s ours

Change-Id: Iebb6da5d93e09f986e8092107b363b869efd7a05

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 14 Sep 2017 00:31:51 +0000 (00:31 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 79bfe12e6b -s ours am: 1db479ee26 -s ours am: 1ff18ac097 -s ours am: ac23d4afac -s ours" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:30:00 +0000 (00:30 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 79bfe12e6b -s ours am: 1db479ee26 -s ours am: 1ff18ac097 -s ours
am: ac23d4afac -s ours

Change-Id: I3d314ff51d4294f927ef3eb7df257502c6326626

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 14 Sep 2017 00:28:25 +0000 (00:28 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e5fe30c1b0 -s ours am: 9abe093864 -s ours am: 4c152ae488 -s ours am: 4379f07401 -s ours" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:28:00 +0000 (00:28 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b69531f99e -s ours am: 16bc5f15b7 -s ours
am: 69259c2b32 -s ours

Change-Id: Ied34ede3136f40d23dbbe9309afd13fbf5c1ca5d

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:26:44 +0000 (00:26 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e5fe30c1b0 -s ours am: 9abe093864 -s ours am: 4c152ae488 -s ours
am: 4379f07401 -s ours

Change-Id: I9a4569287599b61d81034e0cc42cc446c8849cfd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 14 Sep 2017 00:24:55 +0000 (00:24 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee -s ours am: 289d6b71a9 -s ours am: 74e9007c7b -s ours am: 5e220d0800 -s ours" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:23:39 +0000 (00:23 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 37f29b0359 -s ours am: 4f8b486f69 -s ours
am: 0dd2e975ca -s ours

Change-Id: I9ce1bd9180a009958d9dd60d794235869e28529a

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:22:26 +0000 (00:22 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee -s ours am: 289d6b71a9 -s ours am: 74e9007c7b -s ours
am: 5e220d0800 -s ours

Change-Id: I3a646b1f624767fc735474111f2adc71523e5b72

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 14 Sep 2017 00:19:15 +0000 (00:19 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b484143b40 -s ours am: 307f6a4d92 -s ours am: 106e58f93c -s ours am: 9b4b22a52f -s ours" into oc-mr1-dev

commit | commitdiff | tree

Siyamed Sinir [Thu, 14 Sep 2017 00:18:31 +0000 (00:18 +0000)]

Merge "Fix ClipboardService device lock check for cross profile" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:17:51 +0000 (00:17 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: f9075cb448 -s ours am: c0ccea9bf5 -s ours
am: 4e72aa2314 -s ours

Change-Id: Ic6a131df00ed57b03414e7708e91bc7faf9bccc9

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:16:30 +0000 (00:16 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b484143b40 -s ours am: 307f6a4d92 -s ours am: 106e58f93c -s ours
am: 9b4b22a52f -s ours

Change-Id: I862aadc444f81d8941b9e9378f36063de71c1872

commit | commitdiff | tree

Dave Friedman [Thu, 14 Sep 2017 00:11:57 +0000 (00:11 +0000)]

Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718 am: 4b3a4b58ed
am: d1412d3d60

Change-Id: Ia63b719e65f0d82f7aa65fd4a74a442ffa27190d

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:11:20 +0000 (00:11 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c016ef25c8 -s ours am: 318728fd6b -s ours
am: 9ce3cc9c78 -s ours

Change-Id: Ib3cf951855174e511b70e7e82fcf1041b654d9fd

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:07:37 +0000 (00:07 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9f5e95f64e -s ours am: 697f149acf -s ours
am: b5b1b7b505 -s ours

Change-Id: I3d7a232e2eaa57bc3225857cec63b20fd1b1999e

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:00:27 +0000 (00:00 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 79bfe12e6b -s ours am: 1db479ee26 -s ours
am: 1ff18ac097 -s ours

Change-Id: Ie004d9ef022c5297e783e2e79db6adc05c31c1d3

commit | commitdiff | tree

Jeff Sharkey [Wed, 13 Sep 2017 23:30:45 +0000 (17:30 -0600)]

Update network rules on meteredness changes.

The CONFIGURED_NETWORKS_CHANGED_ACTION broadcast can be dispatched
before WifiStateMachine has a chance to update NetworkCapabilities,
resulting in a race condition. To fix this, update network rules
whenever we actually notice a meteredness change take place.

Test: builds, boots
Bug: 64274313
Change-Id: I490eaa789fc0754e4c1c413b6606378ef6f90662

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:56:54 +0000 (23:56 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e5fe30c1b0 -s ours am: 9abe093864 -s ours
am: 4c152ae488 -s ours

Change-Id: I586e557c9257797642cafb7857ba1a2b60e3edee

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:53:37 +0000 (23:53 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee -s ours am: 289d6b71a9 -s ours
am: 74e9007c7b -s ours

Change-Id: I3a7afab3700da0464ca24e2aa5e7ac73b756855f

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:49:38 +0000 (23:49 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b484143b40 -s ours am: 307f6a4d92 -s ours
am: 106e58f93c -s ours

Change-Id: I37e5c41fe54c5cc009da415395ae54e1c872f57d

commit | commitdiff | tree

Dave Friedman [Wed, 13 Sep 2017 23:42:48 +0000 (23:42 +0000)]

Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718
am: 4b3a4b58ed

Change-Id: I2925d1d3bf70cebfb8d830a28a977208138d91af

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 13 Sep 2017 23:17:37 +0000 (23:17 +0000)]

Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 13 Sep 2017 23:12:21 +0000 (23:12 +0000)]

Merge "Change score cache eviction time to settings value." into oc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Selim Cinek [Sat, 9 Sep 2017 01:00:18 +0000 (18:00 -0700)]

Fixed an issue where the pattern wouldn't show properly

Because we were still collapsed, the height of the pattern
could still remain 0 and we would try to animate in a state
that doesn't make sense. we're now delaying it until we're
drawn.

Change-Id: I2588e5ccd45f1f472825e5502590a9890029a9b8
Fixes: 65441390
Test: follow steps on bug, observe normal pattern

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jakub Pawlowski [Tue, 12 Sep 2017 21:48:30 +0000 (14:48 -0700)]

Bluetooth: fix GATT race conditions when using Handler

Bug: 65596701
Test: manual
Change-Id: Id703cea0543626bdd5a583da95615b650bbcc331
Merged-In: Id703cea0543626bdd5a583da95615b650bbcc331

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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
(cherry picked from commit 2fd9f7a0fe80436e55f93dd0deb6baf7bd2901c3)

commit | commitdiff | tree

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