OSDN Git Service
Andreas Gampe [Tue, 13 Sep 2016 16:46:36 +0000 (16:46 +0000)]
Installer: Support delete_odex command
am:
e5fedb9576
Change-Id: Ia8258183d1646c583047df8dc386da1d291d930b
Hugo Benichi [Tue, 13 Sep 2016 16:41:17 +0000 (16:41 +0000)]
Merge "ApfFilter: take into account IPv4 subnet prefix" into nyc-mr1-dev
am:
886a45acfe
Change-Id: I55ec11c16cd9a209d5b25669870feba6d2f53246
Hugo Benichi [Tue, 13 Sep 2016 16:41:15 +0000 (16:41 +0000)]
ApfFilter: take into account IPv4 subnet prefix
am:
7d21eaedad
Change-Id: Ic814d031550c9261c431885ff3602ab4c7c2d3f4
TreeHugger Robot [Tue, 13 Sep 2016 16:28:24 +0000 (16:28 +0000)]
Merge "ApfFilter: take into account IPv4 subnet prefix" into nyc-mr1-dev
Geoffrey Pitsch [Tue, 13 Sep 2016 16:27:16 +0000 (16:27 +0000)]
Merge "Support multichannel sounds in bootanim" into nyc-mr1-dev
am:
5b1702e554
Change-Id: I978fbf7171c05a7ebf1d149fb763f5ba6dfdccee
Geoffrey Pitsch [Tue, 13 Sep 2016 16:27:14 +0000 (16:27 +0000)]
Support multichannel sounds in bootanim
am:
db90897b5f
Change-Id: Ied6b429e05d5d77c76e9bbf34a7f13104be8bb8e
Geoffrey Pitsch [Tue, 13 Sep 2016 16:21:19 +0000 (16:21 +0000)]
Merge "Support multichannel sounds in bootanim" into nyc-mr1-dev
Lorenzo Colitti [Tue, 13 Sep 2016 16:17:06 +0000 (16:17 +0000)]
Merge "Add a NET_CAPABILITY_FOREGROUND capability." into nyc-mr1-dev
am:
17a01a907e
Change-Id: I444b0f1143f3a389b469475ec639433720dd1443
Lorenzo Colitti [Tue, 13 Sep 2016 16:17:03 +0000 (16:17 +0000)]
Add a NET_CAPABILITY_FOREGROUND capability.
am:
f0e9a33435
Change-Id: If6ebd0023998d713f885db208fa9fe1c7b334478
Lorenzo Colitti [Tue, 13 Sep 2016 16:09:04 +0000 (16:09 +0000)]
Merge "Add a NET_CAPABILITY_FOREGROUND capability." into nyc-mr1-dev
Geoffrey Pitsch [Tue, 13 Sep 2016 15:47:59 +0000 (15:47 +0000)]
Merge "Prevent notifyScreenshotError() from calling twice" into nyc-mr1-dev
am:
221330f9f9
Change-Id: Ib4c0be9e07b58a7eab54ee1b6d1f52ea178042c1
Geoffrey Pitsch [Tue, 13 Sep 2016 15:47:56 +0000 (15:47 +0000)]
Prevent notifyScreenshotError() from calling twice
am:
b2d6ed3cd1
Change-Id: I754d4fbdcce050a0944894685167c973aef7ec53
Geoffrey Pitsch [Tue, 13 Sep 2016 15:39:41 +0000 (15:39 +0000)]
Merge "Prevent notifyScreenshotError() from calling twice" into nyc-mr1-dev
Bill Yi [Tue, 13 Sep 2016 08:40:12 +0000 (08:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
e0ca918e23 -s ours
Change-Id: Ia0ae00e094a88603c74725e0a1edcd0231a6bd43
Bill Yi [Tue, 13 Sep 2016 08:40:09 +0000 (08:40 +0000)]
Import translations. DO NOT MERGE
am:
e879add49c -s ours
Change-Id: I8c5af12bae892726168f267c7f711027633ae2fc
Bill Yi [Tue, 13 Sep 2016 08:40:04 +0000 (08:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
ae8a460985 -s ours
Change-Id: I914bbe3cac87fbefda22f47059ce58d19981835d
Bill Yi [Tue, 13 Sep 2016 08:40:01 +0000 (08:40 +0000)]
Import translations. DO NOT MERGE
am:
b60dfc2ac1 -s ours
Change-Id: I18af3b384ccc59db6abd463956037f6c5ba7c97f
TreeHugger Robot [Tue, 13 Sep 2016 08:36:00 +0000 (08:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 13 Sep 2016 08:35:32 +0000 (08:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 13 Sep 2016 08:34:36 +0000 (08:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 13 Sep 2016 08:32:27 +0000 (08:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Joe Fernandez [Tue, 13 Sep 2016 06:10:30 +0000 (06:10 +0000)]
Merge "docs: September 2016 Dashboard update" into nyc-dev am:
691e49b47c am:
953099ad8a
am:
16bf502278
Change-Id: Ie4abc497bec95713bbf64b5413960f275c2948ec
Joe Fernandez [Tue, 13 Sep 2016 06:10:28 +0000 (06:10 +0000)]
docs: September 2016 Dashboard update am:
639fd11067 am:
a775866de1
am:
b25727b0dc
Change-Id: I417962d3b5658d4c3f22af3313b16001bec8fee9
Kevin Hufnagle [Tue, 13 Sep 2016 06:10:25 +0000 (06:10 +0000)]
Merge "docs: Added note about permission/feature changes with network/GPS." into nyc-dev am:
5251c874cc am:
e60e4cb1ca
am:
cb67204170
Change-Id: Ie74f92f61fe56e58cbef078cb7b7b2d22791d52f
Kevin Hufnagle [Tue, 13 Sep 2016 06:10:23 +0000 (06:10 +0000)]
docs: Added note about permission/feature changes with network/GPS. am:
0090727d95 am:
46ba93917e
am:
de9c94d7fb
Change-Id: I927ffa41687bf1978ad1af6b452b72c34c8b35fc
Joe Fernandez [Tue, 13 Sep 2016 06:05:44 +0000 (06:05 +0000)]
Merge "docs: September 2016 Dashboard update" into nyc-dev am:
691e49b47c
am:
953099ad8a
Change-Id: I65e0cebad994f3c45e0e2450b608e39c8be744f9
Joe Fernandez [Tue, 13 Sep 2016 06:05:40 +0000 (06:05 +0000)]
docs: September 2016 Dashboard update am:
639fd11067
am:
a775866de1
Change-Id: I60f3f3ce921114e29b3344f55a7cff59ce265f68
Kevin Hufnagle [Tue, 13 Sep 2016 06:05:37 +0000 (06:05 +0000)]
Merge "docs: Added note about permission/feature changes with network/GPS." into nyc-dev am:
5251c874cc
am:
e60e4cb1ca
Change-Id: I7f044f259c1a4530d97b6aef658daf02bc38ef46
Kevin Hufnagle [Tue, 13 Sep 2016 06:05:35 +0000 (06:05 +0000)]
docs: Added note about permission/feature changes with network/GPS. am:
0090727d95
am:
46ba93917e
Change-Id: I52e75d056595dd0c5e5a31651884db64749133ac
Joe Fernandez [Tue, 13 Sep 2016 05:58:01 +0000 (05:58 +0000)]
Merge "docs: September 2016 Dashboard update" into nyc-dev
am:
691e49b47c
Change-Id: I2be68e001ccb681f483079ff4c99852b4d8666ad
Joe Fernandez [Tue, 13 Sep 2016 05:57:55 +0000 (05:57 +0000)]
docs: September 2016 Dashboard update
am:
639fd11067
Change-Id: Icd4933353757e4ff40ee2dda1e8cbd2197455029
Kevin Hufnagle [Tue, 13 Sep 2016 05:57:43 +0000 (05:57 +0000)]
Merge "docs: Added note about permission/feature changes with network/GPS." into nyc-dev
am:
5251c874cc
Change-Id: I942e60605deb353f5adbed27a93edfd048af1f05
Kevin Hufnagle [Tue, 13 Sep 2016 05:57:38 +0000 (05:57 +0000)]
docs: Added note about permission/feature changes with network/GPS.
am:
0090727d95
Change-Id: I5dcb85abc91bdba70cc0c966146dfcafe91aa897
TreeHugger Robot [Tue, 13 Sep 2016 05:52:19 +0000 (05:52 +0000)]
Merge "docs: September 2016 Dashboard update" into nyc-dev
Kevin Hufnagle [Tue, 13 Sep 2016 05:49:28 +0000 (05:49 +0000)]
Merge "docs: Added note about permission/feature changes with network/GPS." into nyc-dev
Joe Fernandez [Tue, 13 Sep 2016 04:32:47 +0000 (21:32 -0700)]
docs: September 2016 Dashboard update
Change-Id: I55b5e4d64ec6ff3275a616169fe159b2dfd6c91f
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
Hugo Benichi [Tue, 13 Sep 2016 03:54:13 +0000 (03:54 +0000)]
ApfFilter: more precise IPv4 broadcast filter
am:
0dc1d31470
Change-Id: If30f5966bcd8d1a343a49979b3ac0f70e4faedb6
Bill Yi [Tue, 13 Sep 2016 03:52:37 +0000 (20:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01291d5d8896be638e0f655c0e6c40ac7e4b89f6
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 13 Sep 2016 03:47:34 +0000 (03:47 +0000)]
Merge "ApfFilter: more precise IPv4 broadcast filter" into nyc-mr1-dev
Bill Yi [Tue, 13 Sep 2016 03:44:19 +0000 (20:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2372e02f4e3c9d422cc5e24cbff6358d6b27a5f4
Auto-generated-cl: translation import
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
Erik Kline [Tue, 13 Sep 2016 03:33:39 +0000 (03:33 +0000)]
Have WakeupMessage call Handler#dispatchMessage()
am:
a457ebbda6
Change-Id: I57ef0f980e4b63735affee6127fffe454e44756f
TreeHugger Robot [Tue, 13 Sep 2016 03:25:36 +0000 (03:25 +0000)]
Merge "Have WakeupMessage call Handler#dispatchMessage()" into nyc-mr1-dev
Lorenzo Colitti [Mon, 18 Jul 2016 09:40:42 +0000 (18:40 +0900)]
Add a NET_CAPABILITY_FOREGROUND capability.
Bug:
23113288
Change-Id: I90cb9ffb5751f0d9ec822933f37680c401e49966
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
Selim Cinek [Tue, 13 Sep 2016 02:08:52 +0000 (02:08 +0000)]
Escalate HeadsUp when dreaming starts
am:
994153944e
Change-Id: I3b5c8589278bf0f8bbf53f21dc6ae242a6682fff
Selim Cinek [Tue, 13 Sep 2016 02:06:52 +0000 (02:06 +0000)]
Overflow number supports RTL layout
am:
09b7dea5b7
Change-Id: Id8fbc4a333ba259bc469a405e7faafa2da30b468
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
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
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
Hugo Benichi [Fri, 2 Sep 2016 05:00:29 +0000 (14:00 +0900)]
ApfFilter: take into account IPv4 subnet prefix
When IPv4 is provisioned on an interface with Apf capabilities,
ApfFilter will only keep track of the raw ipv4 address, with no
information about the subnet or prefix length.
This patch adds the missing prefix length information to ApfFilter. This
allows to calculate the subnet broadcast ipv4 address for more
precise ipv4 broadcast filtering when the multicast lock is not held.
Bug:
30231088
Change-Id: Iebaec040703647c4ced30bb585be173e97a1fae5
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Bill Yi [Mon, 12 Sep 2016 22:09:55 +0000 (15:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icf7ecb9e568e77f8a8c8142a6601115b2b29ea37
Auto-generated-cl: translation import
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
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
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
Alan Viverette [Mon, 12 Sep 2016 22:08:43 +0000 (22:08 +0000)]
Cancel pending selection before filtering input
am:
57fe701ddf
Change-Id: I54c33948716e7b37976c65b0f822d626a518b03a
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
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
Bill Yi [Mon, 12 Sep 2016 22:01:38 +0000 (15:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82ec2ecb268da08cf4c84393f8c5768bcc2fc0be
Auto-generated-cl: translation import
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
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
TreeHugger Robot [Mon, 12 Sep 2016 21:57:11 +0000 (21:57 +0000)]
Merge "Cancel pending selection before filtering input" into nyc-mr1-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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