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

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 62bee2f5ff -s ours

Change-Id: I2c72358b3b45a3321d76d9af147d3f3c0b179846

commit | commitdiff | tree

TreeHugger Robot [Sat, 10 Jun 2017 06:00:04 +0000 (06:00 +0000)]

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

commit | commitdiff | tree

Winson Chung [Sat, 10 Jun 2017 05:07:05 +0000 (05:07 +0000)]

Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am: a304564081
am: c596ef26c6

Change-Id: I3e7006c0fc54d7131a2a44c70a8b216bfc646b3c

commit | commitdiff | tree

Winson Chung [Sat, 10 Jun 2017 05:02:02 +0000 (05:02 +0000)]

Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am: a304564081
am: 489e22503e

Change-Id: Ia2448b59ad2e0afd8d265572c81d794055423b8b

commit | commitdiff | tree

Winson Chung [Sat, 10 Jun 2017 04:57:50 +0000 (04:57 +0000)]

Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am: a304564081

Change-Id: I035b2e3f957334a7ef125256d5a44d2e798e61eb

commit | commitdiff | tree

Winson Chung [Sat, 10 Jun 2017 04:56:09 +0000 (04:56 +0000)]

Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am: a304564081

Change-Id: I916e692fae56ed79a60d37b471b6e07457d2509d

commit | commitdiff | tree

Winson Chung [Sat, 10 Jun 2017 04:50:09 +0000 (04:50 +0000)]

Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev

Import translations. DO NOT MERGE

Change-Id: I9310dd36258cc026421953cbea84b51650c47a35
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Jun 2017 00:55:03 +0000 (00:55 +0000)]

Merge "Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8 am: 6a71949f6e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Ben Gruver [Sat, 10 Jun 2017 00:52:24 +0000 (00:52 +0000)]

Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8
am: 5be97babd6

Change-Id: Ic49f4796cf1bf26036a7d0aa7c06b2d0823e15de

commit | commitdiff | tree

Ben Gruver [Sat, 10 Jun 2017 00:52:22 +0000 (00:52 +0000)]

Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8
am: 6a71949f6e

Change-Id: I2bb0ba88e8daeecc82014388d1a0fba54cd7847f

commit | commitdiff | tree

Ben Gruver [Sat, 10 Jun 2017 00:45:04 +0000 (00:45 +0000)]

Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am: ffd8343ba8

Change-Id: Ia3b7fe1bad2f3c2d13ce58f97174511ed8434e0b

commit | commitdiff | tree

Ben Gruver [Sat, 10 Jun 2017 00:45:02 +0000 (00:45 +0000)]

Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am: ffd8343ba8

Change-Id: I5ac1fce3ab71415061ba152d9e34c96f9a53e1c9

commit | commitdiff | tree

Ben Gruver [Sat, 10 Jun 2017 00:38:54 +0000 (00:38 +0000)]

Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev

commit | commitdiff | tree

Robert Greenwalt [Sat, 10 Jun 2017 00:26:26 +0000 (00:26 +0000)]

Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6 am: af04c43e3b
am: 40b0ef4579

Change-Id: I6b40f88b1793b157ec3babcb39caf5d916c6301d

commit | commitdiff | tree

Robert Greenwalt [Sat, 10 Jun 2017 00:17:22 +0000 (00:17 +0000)]

Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6
am: af04c43e3b

Change-Id: I5fb2897cb5456f92ea4da17d333f091f2f2c1e42

commit | commitdiff | tree

Robert Greenwalt [Sat, 10 Jun 2017 00:10:33 +0000 (00:10 +0000)]

Merge "Changed Locale in ServiceInfo to a list."
am: a1df5b25e6

Change-Id: I7477fa88ae9cc83605d2172294bf2ecbcafc567e

commit | commitdiff | tree

Robert Greenwalt [Sat, 10 Jun 2017 00:03:56 +0000 (00:03 +0000)]

Merge "Changed Locale in ServiceInfo to a list."

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 23:59:07 +0000 (23:59 +0000)]

Merge "Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c am: 4e76728dea" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

George Mount [Fri, 9 Jun 2017 23:56:46 +0000 (23:56 +0000)]

Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c
am: 4e76728dea

Change-Id: Ia31e1eefe3771f5cc76b53112e01efdedfe55c58

commit | commitdiff | tree

George Mount [Fri, 9 Jun 2017 23:56:41 +0000 (23:56 +0000)]

Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c
am: 62a18e12a3

Change-Id: I0c164eb98dd7265cdc67f107c3500f62dde7536a

commit | commitdiff | tree

George Mount [Fri, 9 Jun 2017 23:51:06 +0000 (23:51 +0000)]

Merge "Add target sdk check for behavior change." into oc-dev
am: e5e246ce5c

Change-Id: Ia06fe694f2afe55cd9560c2d6ae9112a6735cf93

commit | commitdiff | tree

George Mount [Fri, 9 Jun 2017 23:49:21 +0000 (23:49 +0000)]

Merge "Add target sdk check for behavior change." into oc-dev
am: e5e246ce5c

Change-Id: I3734ee5cd46536a015a8fc60bf8b57818800c792

commit | commitdiff | tree

George Mount [Fri, 9 Jun 2017 23:41:40 +0000 (23:41 +0000)]

Merge "Add target sdk check for behavior change." into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 23:39:37 +0000 (23:39 +0000)]

Merge "Merge "Fix thread booster" into oc-dev am: 4c1209e00e am: c48a8176e8" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jorim Jaggi [Fri, 9 Jun 2017 23:38:50 +0000 (23:38 +0000)]

Merge "Fix thread booster" into oc-dev am: 4c1209e00e
am: c48a8176e8

Change-Id: I30b49d87ad875b6a0bc30177959a2197cfc5a0b8

commit | commitdiff | tree

Jorim Jaggi [Fri, 9 Jun 2017 23:37:22 +0000 (23:37 +0000)]

Merge "Fix thread booster" into oc-dev am: 4c1209e00e
am: 2bdff7d64e

Change-Id: I3dc39403e74581946f90f0d9b21e981694e752ab

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 23:34:08 +0000 (23:34 +0000)]

Merge "Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8 am: ed268dc350" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jorim Jaggi [Fri, 9 Jun 2017 23:33:16 +0000 (23:33 +0000)]

Merge "Fix thread booster" into oc-dev
am: 4c1209e00e

Change-Id: I3ef8bce9cd703a630280595a47baebae12c28387

commit | commitdiff | tree

Lucas Dupin [Fri, 9 Jun 2017 23:33:16 +0000 (23:33 +0000)]

Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8
am: ed268dc350

Change-Id: I202bed758385f4918452d78dfef42682521132df

commit | commitdiff | tree

Lucas Dupin [Fri, 9 Jun 2017 23:31:01 +0000 (23:31 +0000)]

Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8
am: c9d11b7e83

Change-Id: I94a073c6151d19a40a5fea2db5871b6dc970de80

commit | commitdiff | tree

Jorim Jaggi [Fri, 9 Jun 2017 23:30:24 +0000 (23:30 +0000)]

Merge "Fix thread booster" into oc-dev
am: 4c1209e00e

Change-Id: Iea1b674cefc1d63eaeb77511904afcf4fdc7639e

commit | commitdiff | tree

Lucas Dupin [Fri, 9 Jun 2017 23:26:36 +0000 (23:26 +0000)]

Merge "Removed test from presubmit." into oc-dev
am: 4f30aa2be8

Change-Id: I3f73f3581fad4575f774f2c5ba870cc3308443a4

commit | commitdiff | tree

Jorim Jaggi [Fri, 9 Jun 2017 23:23:56 +0000 (23:23 +0000)]

Merge "Fix thread booster" into oc-dev

commit | commitdiff | tree

Lucas Dupin [Fri, 9 Jun 2017 23:23:20 +0000 (23:23 +0000)]

Merge "Removed test from presubmit." into oc-dev
am: 4f30aa2be8

Change-Id: I49a803f8ecadfab53a686c91c601aaead8a1c81f

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 23:23:17 +0000 (23:23 +0000)]

Merge "Instrument captive portal login activity" into oc-dr1-dev
am: 169f7bebce

Change-Id: I25f8400556ed82e32bbb7abd6e3fccd3df83cd5f

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 23:17:22 +0000 (23:17 +0000)]

Merge "Instrument captive portal login activity" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Jun 2017 23:17:13 +0000 (23:17 +0000)]

Merge "Removed test from presubmit." into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 23:16:26 +0000 (23:16 +0000)]

Merge "Merge "" into oc-dev am: 0aaae4ae78 am: 770a4f20cc" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Daniel Sandler [Fri, 9 Jun 2017 23:13:58 +0000 (23:13 +0000)]

Merge "" into oc-dev am: 0aaae4ae78
am: 9bb81db15e

Change-Id: Ic0654fa608e873075938dd2b4ad5aaafd59cc2eb

commit | commitdiff | tree

Daniel Sandler [Fri, 9 Jun 2017 23:13:57 +0000 (23:13 +0000)]

Merge "" into oc-dev am: 0aaae4ae78
am: 770a4f20cc

Change-Id: Idc25cc03b6c6d9f2441b90487757dea1e795d48c

commit | commitdiff | tree

Daniel Sandler [Fri, 9 Jun 2017 23:05:29 +0000 (23:05 +0000)]

Merge "" into oc-dev
am: 0aaae4ae78

Change-Id: Ibeceac21612da6669d0a216729c2671170651480

commit | commitdiff | tree

Daniel Sandler [Fri, 9 Jun 2017 23:05:19 +0000 (23:05 +0000)]

Merge "" into oc-dev
am: 0aaae4ae78

Change-Id: Ic671cd9a8718509728f6058b8d8b695cefbdc0f3

commit | commitdiff | tree

Daniel Sandler [Fri, 9 Jun 2017 22:55:42 +0000 (22:55 +0000)]

Merge "🐙" into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:27:07 +0000 (22:27 +0000)]

Merge "Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp am: c3f93e120c" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 22:26:02 +0000 (22:26 +0000)]

Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp
am: c3f93e120c

Change-Id: Iaaf0f43a5d395110633c261e2f73025a284821b7

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:25:32 +0000 (22:25 +0000)]

Merge "Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebfc1 am: cfbb73bcde" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:25:08 +0000 (22:25 +0000)]

Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408 am: d11e14b428" into oc-dr1-dev-plus-aosp

Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebfc1
am: cfbb73bcde

Change-Id: Ib841554ba1ad15eceefcbb2ee32599e1087b9f76

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 22:24:17 +0000 (22:24 +0000)]

Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408
am: d11e14b428

Change-Id: I80bd1592ca2b093e263f2ddfedc174dc401ec567

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:24:01 +0000 (22:24 +0000)]

Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: 216352792e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:23:47 +0000 (22:23 +0000)]

Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: b9bcc1c66a" into oc-dr1-dev-plus-aosp

Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97
am: 216352792e

Change-Id: I510d5cd01b7c46ae24347b90154dbdbf09439545

Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97
am: b9bcc1c66a

Change-Id: I4031c0127f4ac9ee87eeb9ae8106f343504085f6

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:22:36 +0000 (22:22 +0000)]

Merge "Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358 am: c1801c9a8d" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 22:20:48 +0000 (22:20 +0000)]

Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
am: c1801c9a8d

Change-Id: Iac201ccb8123f114b492fbbe4c6a151b57f6dd27

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 22:20:15 +0000 (22:20 +0000)]

Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
am: f99e84e4dd

Change-Id: I04a26678d8df05ea59bcec48061f027b0b567baf

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:17:09 +0000 (22:17 +0000)]

Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: 012c7d29d6" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 22:15:07 +0000 (22:15 +0000)]

Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
am: 012c7d29d6

Change-Id: Ifbf4fd1083e9bb865fa3a20e5aedec43d1bf5eb5

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 22:13:59 +0000 (22:13 +0000)]

Merge "Minor fix on autofill() javadoc." into oc-dev
am: 211e760408

Change-Id: I1dddd4e6a326ccd0fb6f57dbd30b0c4ba0d08106

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 22:13:37 +0000 (22:13 +0000)]

Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
am: fa6b5ac317

Change-Id: Idca89686865f91cf2c3a0af895456e865ca4d90b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:09:28 +0000 (22:09 +0000)]

Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp

Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
am: 308d0dd03c

Change-Id: Ifa87d06d51598b005a6f51d2bf3a2ac936848d6e

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 22:07:34 +0000 (22:07 +0000)]

Copy smearing method to BatteryStatsHelper am: 5dad8068e2
am: 5047d7bf7f -s ours

Change-Id: Ie76637f4bfc0bf23b5d74ba9688a03fba795cca5

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 22:07:19 +0000 (22:07 +0000)]

Merge "Minor fix on autofill() javadoc." into oc-dev
am: 211e760408

Change-Id: Iaea8691ad9d7ce3ff1936f966a780a801e508e1f

Merge "Update documentation for streaming methods" am: 186a588d57
am: 01604ebfc1

Change-Id: Ia7772c9f8b231af0cf48c50c09ec72fa38007df3

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 22:02:40 +0000 (22:02 +0000)]

Merge "Minor fix on autofill() javadoc." into oc-dev

Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394
am: 1b39c88b97

Change-Id: I62c0a5776bf6307d8d9e580b7d5592352e2efdc8

Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
am: bd499f9319

Change-Id: I2add2be471c83285f104f137e45a9a8bbb2b8ce7

Merge "Update documentation for streaming methods"
am: 186a588d57

Change-Id: I44825b99a968b110bb23373d59aa0bb5ecaf7eac

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 21:58:06 +0000 (21:58 +0000)]

Copy smearing method to BatteryStatsHelper am: 5dad8068e2 -s ours
am: 6d1e7537f3 -s ours

Change-Id: Iac673806f829a216ce3f7222f9d94fd0aac7d371

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 21:56:09 +0000 (21:56 +0000)]

Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am: bc626c6358

Change-Id: I4d3cff4bf6a0403f311011709c3074bca532de15

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 21:49:49 +0000 (21:49 +0000)]

Merge "Protect autofill UI against redressing" into oc-dev
am: 0541862ec5

Change-Id: I07b91f8baa721b58f7f0ff9bf90a29481fdedaac

Merge "Update documentation for streaming methods"

Merge changes from topic 'battery_smear_move' into oc-dev
am: 883db32859

Change-Id: I45d4eaadbc992663b3453b52c391d5d4d660e046

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 21:41:14 +0000 (21:41 +0000)]

Copy smearing method to BatteryStatsHelper
am: 5dad8068e2 -s ours

Change-Id: I07d9a563f224d739e734af92ae5078d8c6f41100

Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394
am: 1b39c88b97

Change-Id: Ib1de633f27978fd6b87606b44b45c3ac71bc2113

commit | commitdiff | tree

Winson Chung [Fri, 9 Jun 2017 21:38:39 +0000 (14:38 -0700)]

Preemptively create Bitmap from GraphicBuffer

- This call moves up the code to create a ThumbnailData from the
  TaskSnapshot to ensure that it is registered with the GC even if there
  is no active TaskView bound to process the event.

Bug: 62360156
Test: Run "bit CtsMediaTestCases:.DecodeAccuracyTest", and ensure that
      the "Lost RAM" is relatively unchanged afterwards

Change-Id: I64af55aa40e80604864e17045798823cc6fee483

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 21:37:17 +0000 (21:37 +0000)]

Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am: bc626c6358

Change-Id: I8688bda33124a78d439f1cbcf23926a0672b0735

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 21:32:14 +0000 (21:32 +0000)]

Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: 6890569c04" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:28:01 +0000 (21:28 +0000)]

Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
am: 6890569c04

Change-Id: I8a2985107086b53b450137502e32f07dd5229f6c

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:27:48 +0000 (21:27 +0000)]

Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
am: b32c05a36a

Change-Id: I69f9a67ae35a2f8e3ae9982531e391ea8a5b49e5

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 21:25:58 +0000 (21:25 +0000)]

Merge "Protect autofill UI against redressing" into oc-dev
am: 0541862ec5

Change-Id: I0073d1eb75fc3460ad126ad08b9d4cf3f566a305

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:20:09 +0000 (21:20 +0000)]

Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4
am: d66af648c2

Change-Id: I6317c298d0340cb283e5cdc9b7ec70a7d3fe8e8f

Merge changes from topic 'battery_smear_move' into oc-dev
am: 883db32859

Change-Id: Ibb862780286006efb4a4a117f007cc652dac4ce9

Add missing values for screen percent width dimens am: 5fc6653ea7
am: a58e208394

Change-Id: I0bd6a5e8fe67439d823068229f4bbd828560d7c1

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 21:15:56 +0000 (21:15 +0000)]

Copy smearing method to BatteryStatsHelper
am: 5dad8068e2

Change-Id: I1a99fc38a665c3219999b464c1549dd707832f3d

Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
am: 25c1a060bc

Change-Id: I2f400e951b3e1f7cc5fc1ac1548a09c3ae65da7b

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:12:03 +0000 (21:12 +0000)]

Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am: 8db148093c

Change-Id: I966af17b26d67f7f29290ee73053e1b833a6623a

commit | commitdiff | tree

Lucas Dupin [Fri, 9 Jun 2017 21:10:33 +0000 (14:10 -0700)]

Removed test from presubmit.

testOnNotification_stillWorksAfterOneFailedProxCheck needs to
be ignored on presubmit runs. It fails on Tree Hugger but
runs locally.

Test: runtest systemui
Change-Id: Id4e1107528715c7e0b6ce7c69e2da7fa837e79a2

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 21:10:19 +0000 (21:10 +0000)]

Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4 am: 0425f9ceea" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:09:29 +0000 (21:09 +0000)]

Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4
am: 0425f9ceea

Change-Id: I3f817a83fcbda052ba3ca65fb539a7d77ec8d6a9

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 21:08:59 +0000 (21:08 +0000)]

Merge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3 am: fce339c49c" into oc-dr1-dev-plus-aosp

Add missing values for screen percent width dimens
am: 5fc6653ea7

Change-Id: Icecf451c5cb97275234f75f55292729a5f213560

Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
am: fce339c49c

Change-Id: I1b2478820fbc282aa0448d1e1966f0cf81a2b207

commit | commitdiff | tree

Hemant Gupta [Fri, 9 Jun 2017 21:06:09 +0000 (21:06 +0000)]

OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
am: e2ac2e20d6

Change-Id: I4641c8bc03d0886d614165ac3c0fd42721c5a046

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:05:39 +0000 (21:05 +0000)]

Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am: 8db148093c

Change-Id: I8f0bfb221b17804d3f9ec7b682ebd1256f53aa76

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:03:27 +0000 (21:03 +0000)]

Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am: e4835a2af4

Change-Id: If88ec9c1de2d81d5b629ed0ead8c9911e6f2c0c5

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 21:02:45 +0000 (21:02 +0000)]

Merge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am: 49444fc090 -s ours" into oc-dr1-dev-plus-aosp

Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am: cdec393aa3

Change-Id: I2e175c9a475d2cc2ad225154dbc5c2f855173975