OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "ApfFilter: more precise IPv4 broadcast filter" into nyc-mr1-dev
Hugo Benichi [Tue, 13 Sep 2016 03:54:19 +0000 (03:54 +0000)]
Merge "ApfFilter: more precise IPv4 broadcast filter" into nyc-mr1-dev
am: f7c2ba5481

Change-Id: I3ca03d531603536944af3d7db49eaf977ebb24cf

7 years agoApfFilter: more precise IPv4 broadcast filter
Hugo Benichi [Tue, 13 Sep 2016 03:54:13 +0000 (03:54 +0000)]
ApfFilter: more precise IPv4 broadcast filter
am: 0dc1d31470

Change-Id: If30f5966bcd8d1a343a49979b3ac0f70e4faedb6

7 years agoMerge "ApfFilter: more precise IPv4 broadcast filter" into nyc-mr1-dev
TreeHugger Robot [Tue, 13 Sep 2016 03:47:34 +0000 (03:47 +0000)]
Merge "ApfFilter: more precise IPv4 broadcast filter" into nyc-mr1-dev

7 years agoMerge "Have WakeupMessage call Handler#dispatchMessage()" into nyc-mr1-dev
Erik Kline [Tue, 13 Sep 2016 03:33:44 +0000 (03:33 +0000)]
Merge "Have WakeupMessage call Handler#dispatchMessage()" into nyc-mr1-dev
am: 46de5f4917

Change-Id: I5e3cbb240654287cc9299582a63bdb04a07e2ea0

7 years agoHave WakeupMessage call Handler#dispatchMessage()
Erik Kline [Tue, 13 Sep 2016 03:33:39 +0000 (03:33 +0000)]
Have WakeupMessage call Handler#dispatchMessage()
am: a457ebbda6

Change-Id: I57ef0f980e4b63735affee6127fffe454e44756f

7 years agoMerge "Have WakeupMessage call Handler#dispatchMessage()" into nyc-mr1-dev
TreeHugger Robot [Tue, 13 Sep 2016 03:25:36 +0000 (03:25 +0000)]
Merge "Have WakeupMessage call Handler#dispatchMessage()" into nyc-mr1-dev

7 years agoMerge changes I8604c9d0,I436a3770,If89fd6d2,I6bad3e75 into nyc-mr1-dev
Selim Cinek [Tue, 13 Sep 2016 02:08:55 +0000 (02:08 +0000)]
Merge changes I8604c9d0,I436a3770,If89fd6d2,I6bad3e75 into nyc-mr1-dev
am: 2c64636a24

Change-Id: Ide3f89cfeaff80598aef19f2114b8348ec5bb7e5

7 years agoEscalate HeadsUp when dreaming starts
Selim Cinek [Tue, 13 Sep 2016 02:08:52 +0000 (02:08 +0000)]
Escalate HeadsUp when dreaming starts
am: 994153944e

Change-Id: I3b5c8589278bf0f8bbf53f21dc6ae242a6682fff

7 years agoOverflow number supports RTL layout
Selim Cinek [Tue, 13 Sep 2016 02:06:52 +0000 (02:06 +0000)]
Overflow number supports RTL layout
am: 09b7dea5b7

Change-Id: Id8fbc4a333ba259bc469a405e7faafa2da30b468

7 years agoUpdate contentDescription of the DismissView when locale changes
Selim Cinek [Tue, 13 Sep 2016 02:05:21 +0000 (02:05 +0000)]
Update contentDescription of the DismissView when locale changes
am: 68422fd129

Change-Id: I0c7279e7297aba352f3e0e31a520e8f6890e1141

7 years agoFixes a crash with a renderthread camera animation
Selim Cinek [Tue, 13 Sep 2016 02:03:51 +0000 (02:03 +0000)]
Fixes a crash with a renderthread camera animation
am: 2c984f16eb

Change-Id: Ie58ef3c9297a1712c29b30660dc3495343fa9427

7 years agoMerge changes I8604c9d0,I436a3770,If89fd6d2,I6bad3e75 into nyc-mr1-dev
TreeHugger Robot [Tue, 13 Sep 2016 01:56:33 +0000 (01:56 +0000)]
Merge changes I8604c9d0,I436a3770,If89fd6d2,I6bad3e75 into nyc-mr1-dev

* changes:
  Escalate HeadsUp when dreaming starts
  Overflow number supports RTL layout
  Update contentDescription of the DismissView when locale changes
  Fixes a crash with a renderthread camera animation

7 years agoApfFilter: more precise IPv4 broadcast filter
Hugo Benichi [Fri, 2 Sep 2016 03:40:31 +0000 (12:40 +0900)]
ApfFilter: more precise IPv4 broadcast filter

This patch refines the Apf IPv4 filter for interfaces with Apf
capabilities to drop packets when:
  - the multicast lock is not held
  - the packet is an IPv4 packet
  - the packet is not a DHCP packet addressed to us
  - the packet is L2 broadcast, or IPv4 multicast, or IPv4 broadcast
      - caveat: subnet broadcast address is not checked.

This allows to drop IPv4 broadcast packets whose MAC destination
address is not the L2 broadcast address but the current address of the
interface. Such packets can be received on network that rewrite L2
addresses and can put significant pressure on battery by waking up the
phone unnecessarily.

Bug: 30231088

Change-Id: I8b1785fc5ceadaa1f2881765983e502135dcbc46

7 years agoMerge changes Ic26b25e7,I653571d6 into nyc-mr1-dev
Sergei Vasilinetc [Tue, 13 Sep 2016 01:54:21 +0000 (01:54 +0000)]
Merge changes Ic26b25e7,I653571d6 into nyc-mr1-dev
am: e3a9785386

Change-Id: I7ec30088b0f24bb0a55fd0cf2637bff9a2c82670

7 years agoHWUI: track upload & recent usage in font cache
sergeyv [Tue, 13 Sep 2016 01:54:15 +0000 (01:54 +0000)]
HWUI: track upload & recent usage in font cache
am: af102bee51

Change-Id: I2c08fc8d81ce8e0a1442cb65cfec11c1981a1768

7 years agoHWUI: calculate used memory in FontCache for gfxinfo
sergeyv [Tue, 13 Sep 2016 01:53:08 +0000 (01:53 +0000)]
HWUI: calculate used memory in FontCache for gfxinfo
am: baf29e7cf4

Change-Id: I0e100f38166f191552172bef640f73157c45b714

7 years agoMerge changes Ic26b25e7,I653571d6 into nyc-mr1-dev
Sergei Vasilinetc [Tue, 13 Sep 2016 01:41:10 +0000 (01:41 +0000)]
Merge changes Ic26b25e7,I653571d6 into nyc-mr1-dev

* changes:
  HWUI: track upload & recent usage in font cache
  HWUI: calculate used memory in FontCache for gfxinfo

7 years agoMerge "Fix Zen mode for different notification usage types" into nyc-mr1-dev
Jean-Michel Trivi [Tue, 13 Sep 2016 00:50:40 +0000 (00:50 +0000)]
Merge "Fix Zen mode for different notification usage types" into nyc-mr1-dev
am: 156a29f981

Change-Id: I178d9dd66013106950c07fd5274e902b9db1fa36

7 years agoFix Zen mode for different notification usage types
Jean-Michel Trivi [Tue, 13 Sep 2016 00:50:34 +0000 (00:50 +0000)]
Fix Zen mode for different notification usage types
am: e743bda5de

Change-Id: Id5820ab61a8672b7b1a2857c8e6356a11f78be07

7 years agoMerge "Audio focus: clean up FocusRequester early" into nyc-mr1-dev
Jean-Michel Trivi [Tue, 13 Sep 2016 00:50:30 +0000 (00:50 +0000)]
Merge "Audio focus: clean up FocusRequester early" into nyc-mr1-dev
am: d9daf12b33

Change-Id: Icf6d6418d7bc0fa6b3b79d8d3595d04f79d10778

7 years agoAudio focus: clean up FocusRequester early
Jean-Michel Trivi [Tue, 13 Sep 2016 00:50:28 +0000 (00:50 +0000)]
Audio focus: clean up FocusRequester early
am: e89877245f

Change-Id: I49f597e6c4f23c916ac7a1bd6cb4047c68e25214

7 years agoMerge "Fix Zen mode for different notification usage types" into nyc-mr1-dev
Jean-Michel Trivi [Tue, 13 Sep 2016 00:46:49 +0000 (00:46 +0000)]
Merge "Fix Zen mode for different notification usage types" into nyc-mr1-dev

7 years agoMerge "Audio focus: clean up FocusRequester early" into nyc-mr1-dev
Jean-Michel Trivi [Tue, 13 Sep 2016 00:44:54 +0000 (00:44 +0000)]
Merge "Audio focus: clean up FocusRequester early" into nyc-mr1-dev

7 years agoEscalate HeadsUp when dreaming starts
Selim Cinek [Fri, 9 Sep 2016 21:58:41 +0000 (14:58 -0700)]
Escalate HeadsUp when dreaming starts

1. When dreaming starts before locking, notifications can remain
pinned. This is because the device is locked without
screen off, and HeadsUp are not escalated.
As a result is the pinned heads up shown behind the bouncer
when unlocking.
In this case touchable bound is limited to headsup bounds,
so the user can't unlock at all.

2. Escalate HeadsUp when bar state changes to KEYGUARD

3. This also fixed a bug where the bouncer isn't touchable
When device is occluded and locked, HeadsUp can appear.
If the user then clicks on the HeadsUp and try to send
pending intent, Bouncer can be shown without expanding
panel.

Bug:30820511
Change-Id: I8604c9d00d839d773b32d8b913dfdcd2ed72f1dd

7 years agoMerge "Don't try to show crash dialog if lock screen is showing." into nyc-mr1-dev
Wale Ogunwale [Mon, 12 Sep 2016 23:23:50 +0000 (23:23 +0000)]
Merge "Don't try to show crash dialog if lock screen is showing." into nyc-mr1-dev
am: cb443c529b

Change-Id: I2063f989c441657ee903749dd507f489d610e7bf

7 years agoDon't try to show crash dialog if lock screen is showing.
Wale Ogunwale [Mon, 12 Sep 2016 23:23:47 +0000 (23:23 +0000)]
Don't try to show crash dialog if lock screen is showing.
am: 9645b0ffda

Change-Id: Idd038c90bc28a8f094cd3684a8f56ec53f77d054

7 years agoMerge "Don't try to show crash dialog if lock screen is showing." into nyc-mr1-dev
TreeHugger Robot [Mon, 12 Sep 2016 23:18:59 +0000 (23:18 +0000)]
Merge "Don't try to show crash dialog if lock screen is showing." into nyc-mr1-dev

7 years agoHWUI: track upload & recent usage in font cache
sergeyv [Sat, 10 Sep 2016 01:02:07 +0000 (18:02 -0700)]
HWUI: track upload & recent usage in font cache

FontCacheHistoryTracker should be turned off before shipping: b/31438876

bug:30427106
Change-Id: Ic26b25e790d4ee69e484ca0cb23dc9cc522b2ed3

7 years agoMerge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written...
Scott Main [Mon, 12 Sep 2016 22:08:49 +0000 (22:08 +0000)]
Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568" into nyc-dev am: bf5f1674c7 am: 50c4b9269c
am: 6c3f26e5fe

Change-Id: I250dca9c971684110a32c2fde6241842b3fce869

7 years agoupdate Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron...
smain@google.com [Mon, 12 Sep 2016 22:08:47 +0000 (22:08 +0000)]
update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568 am: b433d73843 am: f4db98ef0c
am: fbfa922db7

Change-Id: I4d9dcba39a34203c26bfd7549c228f8c3fd0f50b

7 years agoMerge "Cancel pending selection before filtering input" into nyc-mr1-dev
Alan Viverette [Mon, 12 Sep 2016 22:08:45 +0000 (22:08 +0000)]
Merge "Cancel pending selection before filtering input" into nyc-mr1-dev
am: a4e2b2a1c1

Change-Id: I9ce3e5fd479e9e3fe9b7a233b75fa7c7a3b01ae8

7 years agoCancel pending selection before filtering input
Alan Viverette [Mon, 12 Sep 2016 22:08:43 +0000 (22:08 +0000)]
Cancel pending selection before filtering input
am: 57fe701ddf

Change-Id: I54c33948716e7b37976c65b0f822d626a518b03a

7 years agoMerge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written...
Scott Main [Mon, 12 Sep 2016 22:02:18 +0000 (22:02 +0000)]
Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568" into nyc-dev am: bf5f1674c7
am: 50c4b9269c

Change-Id: I7ce11c6f37dc7427f1b886b0e6cd0110c6cde530

7 years agoupdate Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron...
smain@google.com [Mon, 12 Sep 2016 22:02:16 +0000 (22:02 +0000)]
update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568 am: b433d73843
am: f4db98ef0c

Change-Id: I64f7fdb76877be4b72bec476c163e4f9f566ca78

7 years agoMerge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev...
Scott Main [Mon, 12 Sep 2016 22:01:23 +0000 (22:01 +0000)]
Merge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev am: b42e41e9c8 am: 1e1e5a23af
am: 4040cf64b5

Change-Id: I680d84275cd4e00bf16d903a2ff53ade5dea1bbc

7 years agoadd link for how to update the gradle plugin. bug: 23725775 am: 3d5a4c9eda am: 9276eda434
smain@google.com [Mon, 12 Sep 2016 22:01:20 +0000 (22:01 +0000)]
add link for how to update the gradle plugin. bug: 23725775 am: 3d5a4c9eda am: 9276eda434
am: a1cf16c992

Change-Id: Ic98d6f5f378a438b4e1be86ce77ef8fdb76db197

7 years agoMerge "Cancel pending selection before filtering input" into nyc-mr1-dev
TreeHugger Robot [Mon, 12 Sep 2016 21:57:11 +0000 (21:57 +0000)]
Merge "Cancel pending selection before filtering input" into nyc-mr1-dev

7 years agoMerge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written...
Scott Main [Mon, 12 Sep 2016 21:55:07 +0000 (21:55 +0000)]
Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568" into nyc-dev
am: bf5f1674c7

Change-Id: Iad337f73d09934756ff4b7b0bb56a811cb9d1502

7 years agoupdate Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron...
smain@google.com [Mon, 12 Sep 2016 21:55:00 +0000 (21:55 +0000)]
update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568
am: b433d73843

Change-Id: I58226a7c07f5830a892c6d68bb166b6f82dfe116

7 years agoMerge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev...
Scott Main [Mon, 12 Sep 2016 21:54:00 +0000 (21:54 +0000)]
Merge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev am: b42e41e9c8
am: 1e1e5a23af

Change-Id: Ia7303a0738d792fb7cb37873b52de3d7330149e9

7 years agoadd link for how to update the gradle plugin. bug: 23725775 am: 3d5a4c9eda
smain@google.com [Mon, 12 Sep 2016 21:53:58 +0000 (21:53 +0000)]
add link for how to update the gradle plugin. bug: 23725775 am: 3d5a4c9eda
am: 9276eda434

Change-Id: I6b20c23f92f6ae0085b4dbccff6055b97544aa6d

7 years agoMerge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev
Scott Main [Mon, 12 Sep 2016 21:49:49 +0000 (21:49 +0000)]
Merge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev
am: b42e41e9c8

Change-Id: I058c56b1296e96e840775116d040fcfbb588f24c

7 years agoadd link for how to update the gradle plugin. bug: 23725775
smain@google.com [Mon, 12 Sep 2016 21:49:42 +0000 (21:49 +0000)]
add link for how to update the gradle plugin. bug: 23725775
am: 3d5a4c9eda

Change-Id: I19f1bd78e3a7cd984e8dce7a2ca859471791afa6

7 years agoMerge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written...
Scott Main [Mon, 12 Sep 2016 21:42:27 +0000 (21:42 +0000)]
Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568" into nyc-dev

7 years agoMerge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev
Scott Main [Mon, 12 Sep 2016 21:41:23 +0000 (21:41 +0000)]
Merge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev

7 years agoMerge "Persist package's test-only flag and always use it" into nyc-mr1-dev
Makoto Onuki [Mon, 12 Sep 2016 21:39:41 +0000 (21:39 +0000)]
Merge "Persist package's test-only flag and always use it" into nyc-mr1-dev
am: 3304f950bd

Change-Id: Ib03bd7a56eb5b3df5734b49dce8d1b037ce0aa6f

7 years agoPersist package's test-only flag and always use it
Makoto Onuki [Mon, 12 Sep 2016 21:39:38 +0000 (21:39 +0000)]
Persist package's test-only flag and always use it
am: 46ea8e7f9d

Change-Id: Ib6a24171828bbdf884c9d71ab8c07622a8f1fddb

7 years agoLocationManager - Handle Shutdown for right User am: a8037fffd3 am: 130d7957a1
Wyatt Riley [Mon, 12 Sep 2016 21:34:34 +0000 (21:34 +0000)]
LocationManager - Handle Shutdown for right User am: a8037fffd3 am: 130d7957a1
am: 55a2c3ef67

Change-Id: I3fda6b814c8a5b47f3132494d8b9a62624c32334

7 years agoMerge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc...
Eino-Ville Talvala [Mon, 12 Sep 2016 21:33:26 +0000 (21:33 +0000)]
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev am: e93c655093  -s ours am: def3c209db  -s ours
am: d28f5d5e5a  -s ours

Change-Id: I988ecb14f0898db2302c41070216ee2d4a970c6f

7 years agoDO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method am: e175aa82b5...
Eino-Ville Talvala [Mon, 12 Sep 2016 21:32:22 +0000 (21:32 +0000)]
DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method am: e175aa82b5  -s ours am: 7d99482be5  -s ours
am: ca7e060945  -s ours

Change-Id: I2c05a45f7c3595d21e11e3579a050a098e9e708d

7 years agoDon't try to show crash dialog if lock screen is showing.
Wale Ogunwale [Mon, 12 Sep 2016 17:49:35 +0000 (10:49 -0700)]
Don't try to show crash dialog if lock screen is showing.

The crash dialog doesn't show on top of the lock screen so
don't try to display the crash dialog in this case so that
the process can be killed right way instead of waiting for
the user to interact with the crash dialog that isn't visible.

Bug: 31395870
Change-Id: Ic1ce9a133ea12cee8a27690004ac3b56cf75808b

7 years agoMerge "docs: Updated for Support Library 24.2.1" into nyc-dev am: 2f4c688710 am:...
Andrew Solovay [Mon, 12 Sep 2016 21:26:31 +0000 (21:26 +0000)]
Merge "docs: Updated for Support Library 24.2.1" into nyc-dev am: 2f4c688710 am: bea9b13715
am: 64bf79a714

Change-Id: Ic451076f6f0e4ebf7c986f1b359abd63920cea64

7 years agodocs: Updated for Support Library 24.2.1 am: 88082e9ff8 am: 6e87969f94
Andrew Solovay [Mon, 12 Sep 2016 21:26:25 +0000 (21:26 +0000)]
docs: Updated for Support Library 24.2.1 am: 88082e9ff8 am: 6e87969f94
am: 657be45b0f

Change-Id: I9a7ae1626694fd55012d030784c04fb8fc8deaee

7 years agoMerge "PopupWindow: Don't ignore top decorations in getMaxAvailableHeight." into...
Rob Carr [Mon, 12 Sep 2016 21:26:18 +0000 (21:26 +0000)]
Merge "PopupWindow: Don't ignore top decorations in getMaxAvailableHeight." into nyc-mr1-dev
am: 33c879fe14

Change-Id: I71afb6a403de49ede152407e43b1ac2d4941e65d

7 years agoPopupWindow: Don't ignore top decorations in getMaxAvailableHeight.
Robert Carr [Mon, 12 Sep 2016 21:26:11 +0000 (21:26 +0000)]
PopupWindow: Don't ignore top decorations in getMaxAvailableHeight.
am: 701d73084d

Change-Id: Ie8fba517534ca2bd2324b3d88e05b8854700bcc4

7 years agoMerge "Add a flag to indicate if a ScanData is for a scan for all channels" into...
Mitchell Wills [Mon, 12 Sep 2016 21:26:01 +0000 (21:26 +0000)]
Merge "Add a flag to indicate if a ScanData is for a scan for all channels" into nyc-mr1-dev
am: 13d5e3b7fe

Change-Id: I7c3ace79b0b4cda904d9cd70a90b7fa912c3536f

7 years agoAdd a flag to indicate if a ScanData is for a scan for all channels
Mitchell Wills [Mon, 12 Sep 2016 21:20:41 +0000 (21:20 +0000)]
Add a flag to indicate if a ScanData is for a scan for all channels
am: 4bfb391c91

Change-Id: I61543fdbaf30b19aa82c30090a1a0145b38a1b4d

7 years agoMerge "Mark 'candidates_style' as not translatable" into nyc-mr1-dev
Mark Renouf [Mon, 12 Sep 2016 21:18:37 +0000 (21:18 +0000)]
Merge "Mark 'candidates_style' as not translatable" into nyc-mr1-dev
am: 041db68b14

Change-Id: I2d7e73d3fdd3f4991be29493cccaa780054d1fa7

7 years agoMerge "Persist package's test-only flag and always use it" into nyc-mr1-dev
Makoto Onuki [Mon, 12 Sep 2016 21:06:05 +0000 (21:06 +0000)]
Merge "Persist package's test-only flag and always use it" into nyc-mr1-dev

7 years agoLocationManager - Handle Shutdown for right User am: a8037fffd3
Wyatt Riley [Mon, 12 Sep 2016 20:43:15 +0000 (20:43 +0000)]
LocationManager - Handle Shutdown for right User am: a8037fffd3
am: 130d7957a1

Change-Id: I811dd060bc387d1a12c5e57c371d16bee5338132

7 years agoLocationManager - Handle Shutdown for right User
Wyatt Riley [Mon, 12 Sep 2016 20:27:10 +0000 (20:27 +0000)]
LocationManager - Handle Shutdown for right User
am: a8037fffd3

Change-Id: I1b5211af53995de0ca62e3be42dba51824e7ea89

7 years agoLocationManager - Handle Shutdown for right User
Wyatt Riley [Thu, 4 Aug 2016 23:10:06 +0000 (16:10 -0700)]
LocationManager - Handle Shutdown for right User

Only process a shutdown when it is for all users (whole system),
not a single user

Change-Id: Id51b7fb4606460462c2f6749e5ac3984bdd8319f
Bug: 30646142
(cherry picked from commit 1b24fb17b8613894d6066dcf408e60caf2a56192)

7 years agoresolve merge conflicts of 292c86d to cw-f-dev
Mark Renouf [Mon, 12 Sep 2016 19:58:47 +0000 (15:58 -0400)]
resolve merge conflicts of 292c86d to cw-f-dev

* commit '292c86dac9d7bdf739a88cd8d7ff86f084c81334':
  Mark 'candidates_style' as not translatable

Change-Id: Iec80465ddea997460c7e1c50f3b229373b666107

7 years agoMerge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc...
Eino-Ville Talvala [Mon, 12 Sep 2016 19:34:56 +0000 (19:34 +0000)]
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev am: e93c655093  -s ours
am: def3c209db  -s ours

Change-Id: Iab2a96adb127673a01e2cba872c34825c72e8a69

7 years agoDO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method am: e175aa82b5...
Eino-Ville Talvala [Mon, 12 Sep 2016 19:33:36 +0000 (19:33 +0000)]
DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method am: e175aa82b5  -s ours
am: 7d99482be5  -s ours

Change-Id: If6a0f0930f0012405186a8171af8c04f525adc52

7 years agoMerge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
Eino-Ville Talvala [Mon, 12 Sep 2016 19:26:54 +0000 (19:26 +0000)]
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
am: e93c655093  -s ours

Change-Id: Ieef907979d788ca3e9662e3f476698f6365f90ec

7 years agoDO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method
Eino-Ville Talvala [Mon, 12 Sep 2016 19:25:22 +0000 (19:25 +0000)]
DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method
am: e175aa82b5  -s ours

Change-Id: I9a635c89e407129392ce122224be3e6d05400492

7 years agoMerge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
Eino-Ville Talvala [Mon, 12 Sep 2016 19:20:02 +0000 (19:20 +0000)]
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev

7 years agoadd link for how to update the gradle plugin.
smain@google.com [Mon, 12 Sep 2016 19:07:26 +0000 (12:07 -0700)]
add link for how to update the gradle plugin.
bug: 23725775

Change-Id: I5338cec2fed09b4b91e063d989b311d027b169ed

7 years agoMerge "docs: Updated for Support Library 24.2.1" into nyc-dev am: 2f4c688710
Andrew Solovay [Mon, 12 Sep 2016 19:07:04 +0000 (19:07 +0000)]
Merge "docs: Updated for Support Library 24.2.1" into nyc-dev am: 2f4c688710
am: bea9b13715

Change-Id: Ib2c4ab277dd0b1b3c3f4b6934f479ea89e433f31

7 years agodocs: Updated for Support Library 24.2.1 am: 88082e9ff8
Andrew Solovay [Mon, 12 Sep 2016 19:07:02 +0000 (19:07 +0000)]
docs: Updated for Support Library 24.2.1 am: 88082e9ff8
am: 6e87969f94

Change-Id: I8c26d293069eba1b5c1c609357d99aeb23f77ecf

7 years agoMerge "docs: Updated for Support Library 24.2.1" into nyc-dev
Andrew Solovay [Mon, 12 Sep 2016 18:53:54 +0000 (18:53 +0000)]
Merge "docs: Updated for Support Library 24.2.1" into nyc-dev
am: 2f4c688710

Change-Id: I7778f656b0d223601ba29a8dfead42bbb5e0eefb

7 years agodocs: Updated for Support Library 24.2.1
Andrew Solovay [Mon, 12 Sep 2016 18:53:49 +0000 (18:53 +0000)]
docs: Updated for Support Library 24.2.1
am: 88082e9ff8

Change-Id: I77646eb17f95c05bac84616b3d2a8f4ce282c916

7 years agoMerge "docs: Updated for Support Library 24.2.1" into nyc-dev
Andrew Solovay [Mon, 12 Sep 2016 18:45:05 +0000 (18:45 +0000)]
Merge "docs: Updated for Support Library 24.2.1" into nyc-dev

7 years agoMerge "PopupWindow: Don't ignore top decorations in getMaxAvailableHeight." into...
Rob Carr [Mon, 12 Sep 2016 18:43:39 +0000 (18:43 +0000)]
Merge "PopupWindow: Don't ignore top decorations in getMaxAvailableHeight." into nyc-mr1-dev

7 years agoMerge "Add a flag to indicate if a ScanData is for a scan for all channels" into...
Mitchell Wills [Mon, 12 Sep 2016 18:18:02 +0000 (18:18 +0000)]
Merge "Add a flag to indicate if a ScanData is for a scan for all channels" into nyc-mr1-dev

7 years agoMerge "Remove background for button bar for watch devices." into cw-f-dev
TreeHugger Robot [Mon, 12 Sep 2016 16:59:05 +0000 (16:59 +0000)]
Merge "Remove background for button bar for watch devices." into cw-f-dev

7 years agoMerge "Mark 'candidates_style' as not translatable" into nyc-mr1-dev
Mark Renouf [Mon, 12 Sep 2016 13:52:40 +0000 (13:52 +0000)]
Merge "Mark 'candidates_style' as not translatable" into nyc-mr1-dev

7 years agoMerge changes I40f73526,Ia08900c5 into nyc-mr1-dev
Lorenzo Colitti [Mon, 12 Sep 2016 13:38:27 +0000 (13:38 +0000)]
Merge changes I40f73526,Ia08900c5 into nyc-mr1-dev
am: d6feb60383

Change-Id: Iecaf65d45151f6c084ea33e8180dc27781d97cf8

7 years agoAdd a background NetworkRequest type for mobile data always on.
Lorenzo Colitti [Mon, 12 Sep 2016 13:38:23 +0000 (13:38 +0000)]
Add a background NetworkRequest type for mobile data always on.
am: 3d4a10617c

Change-Id: I489fea5d8ae635be5cdbe79b2f891efd72d9b941

7 years agoRematch requests first and listens second.
Lorenzo Colitti [Mon, 12 Sep 2016 13:36:16 +0000 (13:36 +0000)]
Rematch requests first and listens second.
am: 72bbf4829d

Change-Id: Iea6044081c632be4fc95d3db41e1f80f5b24558e

7 years agoMerge changes I40f73526,Ia08900c5 into nyc-mr1-dev
Lorenzo Colitti [Mon, 12 Sep 2016 13:30:19 +0000 (13:30 +0000)]
Merge changes I40f73526,Ia08900c5 into nyc-mr1-dev

* changes:
  Add a background NetworkRequest type for mobile data always on.
  Rematch requests first and listens second.

7 years agoMerge "Better IPv4 multicast coverage in ApfTest" into nyc-mr1-dev
Hugo Benichi [Mon, 12 Sep 2016 03:35:56 +0000 (03:35 +0000)]
Merge "Better IPv4 multicast coverage in ApfTest" into nyc-mr1-dev
am: 6708b64797

Change-Id: I7ad873b7b124e13eade7ba56d2f042bb4a8309b5

7 years agoBetter IPv4 multicast coverage in ApfTest
Hugo Benichi [Mon, 12 Sep 2016 03:35:50 +0000 (03:35 +0000)]
Better IPv4 multicast coverage in ApfTest
am: 961ca49fd6

Change-Id: I3a39484b463c6902b3fb3a05303c5b97d60b89fd

7 years agoMerge "Better IPv4 multicast coverage in ApfTest" into nyc-mr1-dev
Hugo Benichi [Mon, 12 Sep 2016 03:29:13 +0000 (03:29 +0000)]
Merge "Better IPv4 multicast coverage in ApfTest" into nyc-mr1-dev

7 years agoMerge "Support telecom related operations for watch back button usage." into cw-f-dev
Bryce Lee [Sun, 11 Sep 2016 01:07:08 +0000 (01:07 +0000)]
Merge "Support telecom related operations for watch back button usage." into cw-f-dev

7 years agoMerge "Disable selecting the default audio route when a BT route is avaiable" into...
Eric Laurent [Sat, 10 Sep 2016 01:50:09 +0000 (01:50 +0000)]
Merge "Disable selecting the default audio route when a BT route is avaiable" into nyc-mr1-dev
am: 38ce20dd0d

Change-Id: If020060f9900d2762378791111b1c0b8337717da

7 years agoDisable selecting the default audio route when a BT route is avaiable
Sungsoo [Sat, 10 Sep 2016 01:44:26 +0000 (01:44 +0000)]
Disable selecting the default audio route when a BT route is avaiable
am: 0d33113196

Change-Id: I5ce37239efc8a48f8b14927ca3cc9289f88b84ce

7 years agoMerge "AudioService: remove deprecated forcing of A2DP off" into nyc-mr1-dev
Eric Laurent [Sat, 10 Sep 2016 01:43:20 +0000 (01:43 +0000)]
Merge "AudioService: remove deprecated forcing of A2DP off" into nyc-mr1-dev
am: 2839d2ec04

Change-Id: I91b59e87f57d215906c9f94da1eb6517e280eaed

7 years agoAudioService: remove deprecated forcing of A2DP off
Eric Laurent [Sat, 10 Sep 2016 01:41:46 +0000 (01:41 +0000)]
AudioService: remove deprecated forcing of A2DP off
am: 0234587b11

Change-Id: I06ce26972f2165020da42a81518913a8e3097cb3

7 years agoRemove background for button bar for watch devices.
Michael Kwan [Sat, 10 Sep 2016 01:37:24 +0000 (18:37 -0700)]
Remove background for button bar for watch devices.

Bug: 31222864
Change-Id: Idbe73478f3cff45ed502853ffa1e426d475dbf3e

7 years agoMerge "Disable selecting the default audio route when a BT route is avaiable" into...
Eric Laurent [Sat, 10 Sep 2016 01:36:46 +0000 (01:36 +0000)]
Merge "Disable selecting the default audio route when a BT route is avaiable" into nyc-mr1-dev

7 years agoMerge "AudioService: remove deprecated forcing of A2DP off" into nyc-mr1-dev
Eric Laurent [Sat, 10 Sep 2016 01:36:46 +0000 (01:36 +0000)]
Merge "AudioService: remove deprecated forcing of A2DP off" into nyc-mr1-dev

7 years agoMerge "Enable Bluetooth by default" into nyc-mr1-dev
Andre Eisenbach [Sat, 10 Sep 2016 01:33:15 +0000 (01:33 +0000)]
Merge "Enable Bluetooth by default" into nyc-mr1-dev
am: 07a015e249

Change-Id: Ib745fd0fe33e0d2366aa0861a702fb51425c4a11

7 years agoEnable Bluetooth by default
Andre Eisenbach [Sat, 10 Sep 2016 01:33:13 +0000 (01:33 +0000)]
Enable Bluetooth by default
am: 8c18431be8

Change-Id: Iebcaf699361494d92c59935f96c6e859fba96003

7 years agoMerge "Enable Bluetooth by default" into nyc-mr1-dev
TreeHugger Robot [Sat, 10 Sep 2016 01:28:58 +0000 (01:28 +0000)]
Merge "Enable Bluetooth by default" into nyc-mr1-dev

7 years agoDO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change...
Sungsoo [Sat, 10 Sep 2016 01:02:01 +0000 (01:02 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 1bdd10a953 am: b336cce830 am: d07324fe85  -s ours am: f495cf6944  -s ours am: 9f37a8900e am: 40d3c1a7f0 am: 2ddc2956fd  -s ours am: deeb0e5246 am: 8ec076623b am: 89e328770d am: d98163c7a6  -s ours am: 054d2931a0 am: 2e0df412a4
am: d668f00c9e

Change-Id: Ic3e78e8cd397e93279cd84c7f9a866bd070cf9f9

7 years agoDO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change...
Sungsoo [Sat, 10 Sep 2016 00:55:29 +0000 (00:55 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 1bdd10a953 am: b336cce830 am: d07324fe85  -s ours am: f495cf6944  -s ours am: 9f37a8900e am: 40d3c1a7f0 am: 2ddc2956fd  -s ours am: deeb0e5246 am: 8ec076623b am: 89e328770d am: d98163c7a6  -s ours am: 054d2931a0
am: 2e0df412a4

Change-Id: I6624b51ec3f8efdd8d818d7a48719dd5f7395c8d

7 years agoMerge "[DO NOT MERGE] Don't show account access request UI until app launched." into...
Svetoslav Ganov [Sat, 10 Sep 2016 00:54:47 +0000 (00:54 +0000)]
Merge "[DO NOT MERGE] Don't show account access request UI until app launched." into nyc-mr1-dev
am: 32ce3c8797

Change-Id: I1336acb5c30dce5ebadc774695d09abe4dedad08

7 years ago[DO NOT MERGE] Don't show account access request UI until app launched.
Svet Ganov [Sat, 10 Sep 2016 00:54:43 +0000 (00:54 +0000)]
[DO NOT MERGE] Don't show account access request UI until app launched.
am: d63cde7ba4

Change-Id: I06a6b98c9c4a1cd67ed155d42cf4fe5149015675