OSDN Git Service
Andreas Huber [Wed, 19 Oct 2016 19:45:54 +0000 (19:45 +0000)]
Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on" am:
2202b164d8
am:
abfd527d09
Change-Id: I53a55b6278c1b59bef454b880d540dbd46684af7
Christopher Wiley [Wed, 19 Oct 2016 19:39:13 +0000 (19:39 +0000)]
Merge "Use this.isUp() inside InterfaceConfiguration" am:
239df3cc5a
am:
c6e72b30c7
Change-Id: I21739e50ed2111afdb073299f96e8cd22788034c
Andreas Huber [Wed, 19 Oct 2016 19:39:03 +0000 (19:39 +0000)]
Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"
am:
2202b164d8
Change-Id: I43bec2c6d3e6e4201f7a50981f428ef00f384684
Winson [Wed, 19 Oct 2016 19:36:37 +0000 (19:36 +0000)]
Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev am:
5f4169b5ea
am:
be0eded075
Change-Id: I590f576ac9e4d2e8e01702c965f69f8ef1ed5c0b
Winson [Wed, 19 Oct 2016 19:35:25 +0000 (19:35 +0000)]
Skip getting transforms for ignored tasks. am:
448c0adb78
am:
cfdbd7b2e2
Change-Id: I19181f3c3ffff3da30b864290a0ba45571bbb47f
Andrii Kulian [Wed, 19 Oct 2016 19:34:21 +0000 (19:34 +0000)]
Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev am:
6e4f6ecbab
am:
618b3cb6fa
Change-Id: I3c47a26f5f10bd271277a974b81697913f612762
Andrii Kulian [Wed, 19 Oct 2016 19:33:17 +0000 (19:33 +0000)]
DO NOT MERGE -- Use focused activity value when moving task back am:
da3b648b64
am:
39be2e91ca
Change-Id: I43b583256b5975ca1206c9474bd64ee56e2419b0
Christopher Wiley [Wed, 19 Oct 2016 19:31:57 +0000 (19:31 +0000)]
Merge "Use this.isUp() inside InterfaceConfiguration"
am:
239df3cc5a
Change-Id: Id6f064d7a74e41d757de2499653671fc830d217b
Andreas Huber [Wed, 19 Oct 2016 19:30:28 +0000 (19:30 +0000)]
Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"
Winson [Wed, 19 Oct 2016 19:18:31 +0000 (19:18 +0000)]
Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev
am:
5f4169b5ea
Change-Id: I98a6d30d26fd00d09e670d22663617ccd0c5ca62
Winson [Wed, 19 Oct 2016 19:18:26 +0000 (19:18 +0000)]
Skip getting transforms for ignored tasks.
am:
448c0adb78
Change-Id: Ie929c699ee466b1298acab07eefa68006a92cdb1
Andrii Kulian [Wed, 19 Oct 2016 19:16:52 +0000 (19:16 +0000)]
Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev
am:
6e4f6ecbab
Change-Id: I56995f1b7239f4b3bb1a81c46891af04016561f0
Andrii Kulian [Wed, 19 Oct 2016 19:16:50 +0000 (19:16 +0000)]
DO NOT MERGE -- Use focused activity value when moving task back
am:
da3b648b64
Change-Id: Ib706755c056ed27050375a675169f7df3f5f141a
Treehugger Robot [Wed, 19 Oct 2016 19:15:30 +0000 (19:15 +0000)]
Merge "Use this.isUp() inside InterfaceConfiguration"
TreeHugger Robot [Wed, 19 Oct 2016 18:45:22 +0000 (18:45 +0000)]
Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev
Andrii Kulian [Wed, 19 Oct 2016 18:31:33 +0000 (18:31 +0000)]
Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev
Dan Yu [Wed, 19 Oct 2016 18:27:36 +0000 (18:27 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am:
dc69de5ac6 am:
3aa0ff2de7 am:
8233c03d1e am:
0346fee93c
am:
a2ffd6e04c
Change-Id: Ida63ff86031842a5ebe7eec32ba183cdd1f42496
Daniel Yu [Wed, 19 Oct 2016 18:15:17 +0000 (18:15 +0000)]
docs: Updating TIF docs for new TIF Companion library. am:
e0810402fb am:
f8a8260c0d am:
9ce21dc769 am:
f45beedf6c
am:
3d74d9933c
Change-Id: I199d261d2dfa7d2b92f0dbe6fe7cbc2cbd8c3d64
Yang Ni [Wed, 19 Oct 2016 18:14:07 +0000 (18:14 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev am:
6aee6e9ca8 am:
4a9883cdf8 am:
02addb0b41
am:
c7c49fbe14
Change-Id: I7a07aa97830cf198f62c13f5d6fbd78b2ef210b8
Yang Ni [Wed, 19 Oct 2016 18:13:01 +0000 (18:13 +0000)]
Updated API reference doc for Single-Source RS am:
51f1e93be7 am:
246b0bcc9a am:
93f0442cbd
am:
29ce2a91c9
Change-Id: If8d347e881d7260e9a762c9f588ad535c05ee8dd
Dan Yu [Wed, 19 Oct 2016 18:12:16 +0000 (18:12 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am:
dc69de5ac6 am:
3aa0ff2de7 am:
8233c03d1e
am:
0346fee93c
Change-Id: I1997e8e14e5d0ddfbf60ea08797b57d107393411
Dan Yu [Wed, 19 Oct 2016 18:05:37 +0000 (18:05 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am:
dc69de5ac6 am:
3aa0ff2de7
am:
8233c03d1e
Change-Id: If0291ee0b6df1c0fb81785b490cdf716ba9cc8b7
Daniel Yu [Wed, 19 Oct 2016 18:05:18 +0000 (18:05 +0000)]
docs: Updating TIF docs for new TIF Companion library. am:
e0810402fb am:
f8a8260c0d am:
9ce21dc769
am:
f45beedf6c
Change-Id: I2895221a6675da5909d4dbb1186321018189e10d
Yang Ni [Wed, 19 Oct 2016 17:59:16 +0000 (17:59 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev am:
6aee6e9ca8 am:
4a9883cdf8
am:
02addb0b41
Change-Id: I7f934cb65171862b1ef5f0e1c41c5c1916b99529
Yang Ni [Wed, 19 Oct 2016 17:58:16 +0000 (17:58 +0000)]
Updated API reference doc for Single-Source RS am:
51f1e93be7 am:
246b0bcc9a
am:
93f0442cbd
Change-Id: I9d26975a2ce8c0c9efa187cb1c90207f73b3c42a
Daniel Yu [Wed, 19 Oct 2016 17:57:11 +0000 (17:57 +0000)]
docs: Updating TIF docs for new TIF Companion library. am:
e0810402fb am:
f8a8260c0d
am:
9ce21dc769
Change-Id: I1066a9122bab7f3fe620bd23f17adc36559133a4
Yang Ni [Wed, 19 Oct 2016 17:52:39 +0000 (17:52 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev am:
6aee6e9ca8
am:
4a9883cdf8
Change-Id: I1a4378d4ec4c5b2e720d81d90d72c5b7fedce261
Dan Yu [Wed, 19 Oct 2016 17:52:35 +0000 (17:52 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am:
dc69de5ac6
am:
3aa0ff2de7
Change-Id: If9e2b5d23f40a5d48906b81f818a2e9b5e8bb24a
Daniel Yu [Wed, 19 Oct 2016 17:51:36 +0000 (17:51 +0000)]
docs: Updating TIF docs for new TIF Companion library. am:
e0810402fb
am:
f8a8260c0d
Change-Id: Ida18c6b46ccff01cb6299b1774fbcc724f54712a
Yang Ni [Wed, 19 Oct 2016 17:51:32 +0000 (17:51 +0000)]
Updated API reference doc for Single-Source RS am:
51f1e93be7
am:
246b0bcc9a
Change-Id: I572709a23a33f0a17ad754221c27a042f9c44f2e
Andrew Solovay [Wed, 19 Oct 2016 17:47:40 +0000 (17:47 +0000)]
Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev am:
439d71837e
am:
f31f36c305
Change-Id: I0735ce31db3435e47e0610955ff345968f877932
Andrew Solovay [Wed, 19 Oct 2016 17:46:35 +0000 (17:46 +0000)]
docs: Updating the samples "what's new" for API 7.1 am:
c86db22b2f
am:
630b6320eb
Change-Id: I124e27242de6de31e6d7d33b4fc93dcb12804caf
Dan Yu [Wed, 19 Oct 2016 17:44:48 +0000 (17:44 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs
am:
dc69de5ac6
Change-Id: I3f49c5fbd2dc9f298cdf0cdd8acc5f49188319d4
Daniel Yu [Wed, 19 Oct 2016 17:44:46 +0000 (17:44 +0000)]
docs: Updating TIF docs for new TIF Companion library.
am:
e0810402fb
Change-Id: Ic44c96963d1dd172f07f6564a084ca731bf49762
Yang Ni [Wed, 19 Oct 2016 17:37:43 +0000 (17:37 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev
am:
6aee6e9ca8
Change-Id: I86ae7b92e3c6bb2202375a990f0203630afa5744
Yang Ni [Wed, 19 Oct 2016 17:37:39 +0000 (17:37 +0000)]
Updated API reference doc for Single-Source RS
am:
51f1e93be7
Change-Id: Ie8c820ea2d55b16f66afd53034b69d4c770d17e0
Andrew Solovay [Wed, 19 Oct 2016 17:36:48 +0000 (17:36 +0000)]
Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev
am:
439d71837e
Change-Id: I33ca9cc9e7176df2916c70619c007260d035afdf
Andrew Solovay [Wed, 19 Oct 2016 17:36:46 +0000 (17:36 +0000)]
docs: Updating the samples "what's new" for API 7.1
am:
c86db22b2f
Change-Id: Ic7feef22e3337445f8dccfcb237783a40dd59099
Dan Yu [Wed, 19 Oct 2016 17:30:42 +0000 (17:30 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs
Yang Ni [Wed, 19 Oct 2016 17:25:55 +0000 (17:25 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev
Andrew Solovay [Wed, 19 Oct 2016 17:06:43 +0000 (17:06 +0000)]
Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev
Winson [Wed, 19 Oct 2016 16:53:59 +0000 (09:53 -0700)]
Skip getting transforms for ignored tasks.
- If the stack does not contain the existing ignored task view on
relayout, then we should not try and get the transform for it
since it will be skipped.
Bug:
32001762
Change-Id: I23182c76ac41b036c25edf92374622191e9d4ce3
Marie Janssen [Wed, 19 Oct 2016 16:49:23 +0000 (16:49 +0000)]
Bluetooth: More logging of bluetooth service state am:
9fa2491850
am:
d8e027b5a4
Change-Id: Ifaa9bad48234a6035b49a6a05484d91df31c5727
Marie Janssen [Wed, 19 Oct 2016 16:43:09 +0000 (16:43 +0000)]
Bluetooth: More logging of bluetooth service state
am:
9fa2491850
Change-Id: Idd26922caf3c1a0fb77d2091ac86bfe3a1d1c62a
Marie Janssen [Tue, 18 Oct 2016 17:04:24 +0000 (10:04 -0700)]
Bluetooth: More logging of bluetooth service state
Bug:
32140251
Bug:
32140271
Bug:
32060415
Change-Id: I50faa184551748023ea5a573646a75293f553d16
Jason Monk [Wed, 19 Oct 2016 15:23:40 +0000 (15:23 +0000)]
Merge "Hide QS customizer correctly" am:
03e4eb32fe
am:
fb56958223
Change-Id: I62095e8b8c5bea7627e59cf166abce1cfa4ce2f1
Jason Monk [Wed, 19 Oct 2016 15:15:43 +0000 (15:15 +0000)]
Merge "Hide QS customizer correctly"
am:
03e4eb32fe
Change-Id: I8c1998de76beee26b703781a6f883e9efd24bde3
Jason Monk [Wed, 19 Oct 2016 15:05:41 +0000 (15:05 +0000)]
Merge "Hide QS customizer correctly"
Svetoslav Ganov [Wed, 19 Oct 2016 01:56:18 +0000 (01:56 +0000)]
Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev am:
d48bd27f0e
am:
6a2ada0a0a
Change-Id: I3fa265e516b958f23e916fcf6fd702707cd1969f
Svetoslav Ganov [Wed, 19 Oct 2016 01:55:18 +0000 (01:55 +0000)]
[DO NOT MERGE] Catch a missed case when adding a toast am:
5c90c5e32e
am:
a9aa78b1fd
Change-Id: Iba49fa7331a183fe14cd87583a8614552f33aadd
Svetoslav Ganov [Wed, 19 Oct 2016 01:47:51 +0000 (01:47 +0000)]
Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev
am:
d48bd27f0e
Change-Id: I9fbbbbe709dbf308fa4b2678ede416e68f59c057
Svetoslav Ganov [Wed, 19 Oct 2016 01:47:48 +0000 (01:47 +0000)]
[DO NOT MERGE] Catch a missed case when adding a toast
am:
5c90c5e32e
Change-Id: Ie9273caa0918a95a87c5bdb26ebc80ef2d4c22c0
Svetoslav Ganov [Wed, 19 Oct 2016 01:35:33 +0000 (01:35 +0000)]
Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev
Chris Thornton [Wed, 19 Oct 2016 01:34:48 +0000 (01:34 +0000)]
Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev am:
23655af585
am:
1696610b17
Change-Id: I8f0a9be6ed53a7e585f1c11752ee707372fa4764
Chris Thornton [Wed, 19 Oct 2016 01:33:45 +0000 (01:33 +0000)]
Only purge sound models that violate the new primary key constraint if they don't contain identical data. am:
d5ff116403
am:
519b7837bb
Change-Id: I7788e4a5a09ba918e4a142bebf797af4db3b8afe
Chris Thornton [Wed, 19 Oct 2016 01:26:48 +0000 (01:26 +0000)]
Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev
am:
23655af585
Change-Id: Idc6e7aeef68d16a13a707968ff3805a6d87b2bc3
Chris Thornton [Wed, 19 Oct 2016 01:26:45 +0000 (01:26 +0000)]
Only purge sound models that violate the new primary key constraint if they don't contain identical data.
am:
d5ff116403
Change-Id: I3e205134832a7abeb4d9d2aca3b7c5600fc22239
TreeHugger Robot [Wed, 19 Oct 2016 01:17:02 +0000 (01:17 +0000)]
Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev
Andrew Solovay [Tue, 18 Oct 2016 23:01:21 +0000 (16:01 -0700)]
docs: Updating the samples "what's new" for API 7.1
"What's new" page hadn't been updated since 6.0 (18 months ago).
Replacing the old "new" sample apps with the three new ones added
for 7.1.
Doc is staged to:
http://go/dods-stage/samples/new/
bug:
32212333
Change-Id: Ibb48bb531c0d519e50d940d443b461a215ed87d7
Svetoslav Ganov [Wed, 19 Oct 2016 00:57:08 +0000 (00:57 +0000)]
Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev am:
76043cf69f
am:
b3a8fc9835
Change-Id: I783cc8665433ac22ab0b4eb1da39e9714b009117
Svet Ganov [Wed, 19 Oct 2016 00:56:16 +0000 (00:56 +0000)]
Validate input for ContentService#setIsSyncable am:
96b9c75cec
am:
ba7bd1fe06
Change-Id: If0e95400a089804fac54ae946650a353b8d039ef
Svetoslav Ganov [Wed, 19 Oct 2016 00:42:58 +0000 (00:42 +0000)]
Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev
am:
76043cf69f
Change-Id: I89c6415c45320a1825bf2bca26ec64a9e308d46d
Svet Ganov [Wed, 19 Oct 2016 00:42:53 +0000 (00:42 +0000)]
Validate input for ContentService#setIsSyncable
am:
96b9c75cec
Change-Id: Ib39782e880a528be297d673134d7609e68ed313d
Svetoslav Ganov [Wed, 19 Oct 2016 00:32:58 +0000 (00:32 +0000)]
Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev
Hemal Patel [Tue, 18 Oct 2016 23:24:53 +0000 (23:24 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev am:
b361f519dc am:
2a2c0fb96a am:
b841c2d845
am:
6fe03a8529
Change-Id: I8274f3ed022f561b2aa4ecb13a5d78e30ce59fd5
Hemal Patel [Tue, 18 Oct 2016 23:23:38 +0000 (23:23 +0000)]
Docs: Fixed a broken link am:
9a641b6989 am:
40aaf53920 am:
8068fdca0c
am:
c9f68a8be3
Change-Id: I9636eef5a4cfeb8ab875aa15cbfaba20a1c80dcb
Hemal Patel [Tue, 18 Oct 2016 23:17:11 +0000 (23:17 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev am:
b361f519dc am:
2a2c0fb96a
am:
b841c2d845
Change-Id: I618a5f80027a2518dd1fb93697465adf011bf442
Hemal Patel [Tue, 18 Oct 2016 23:16:08 +0000 (23:16 +0000)]
Docs: Fixed a broken link am:
9a641b6989 am:
40aaf53920
am:
8068fdca0c
Change-Id: Ic6d2bbcb23051f22e8a10e7d7573dc34b000f9a5
Hemal Patel [Tue, 18 Oct 2016 23:09:58 +0000 (23:09 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev am:
b361f519dc
am:
2a2c0fb96a
Change-Id: I52c0fc44767f3b1102a8830e9e7910bf6d0db993
Hemal Patel [Tue, 18 Oct 2016 23:08:56 +0000 (23:08 +0000)]
Docs: Fixed a broken link am:
9a641b6989
am:
40aaf53920
Change-Id: I4888353281c101f92da0ce438e64531739c332be
Adam Lesinski [Tue, 18 Oct 2016 23:04:50 +0000 (23:04 +0000)]
Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev am:
0858d08a88
am:
93e4720813
Change-Id: I5270f2413ca90ac58c0917b48d9959bab81b1c4a
Adam Lesinski [Tue, 18 Oct 2016 23:03:51 +0000 (23:03 +0000)]
Fix regression with defaultDisplay adjustments am:
f02523bf4b
am:
be75a58447
Change-Id: I748eaefa1a99b9af5101177090cf906267620f0b
Andrii Kulian [Tue, 18 Oct 2016 20:54:38 +0000 (13:54 -0700)]
DO NOT MERGE -- Use focused activity value when moving task back
When task is moved back we need to adjust currently focused activity
and sent currently resumed record from ActivityStack. However if this
happens when device is locked, resumed activity record will be null.
Need to used currently focused record from service instead.
Bug:
32172829
Change-Id: I2de9bc4135663ab45af859f21e9e92562deb44d4
Hemal Patel [Tue, 18 Oct 2016 23:01:56 +0000 (23:01 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev
am:
b361f519dc
Change-Id: I715603d2fe5f7d21b93c663dc7109d4ee5abaf74
Hemal Patel [Tue, 18 Oct 2016 23:01:53 +0000 (23:01 +0000)]
Docs: Fixed a broken link
am:
9a641b6989
Change-Id: If8e166a3cb36d158fd428e314b90cb265cf2256c
Adam Lesinski [Tue, 18 Oct 2016 22:55:17 +0000 (22:55 +0000)]
Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev
am:
0858d08a88
Change-Id: Idc8f2c1685c11d301d9fb4323a21e6d14c4ae594
Adam Lesinski [Tue, 18 Oct 2016 22:55:14 +0000 (22:55 +0000)]
Fix regression with defaultDisplay adjustments
am:
f02523bf4b
Change-Id: I7e96a95bcb75ee0b286e73024f62391cc1b759dd
Hemal Patel [Tue, 18 Oct 2016 22:54:35 +0000 (22:54 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev
TreeHugger Robot [Tue, 18 Oct 2016 22:46:22 +0000 (22:46 +0000)]
Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev
Adrian Roos [Tue, 18 Oct 2016 22:41:45 +0000 (22:41 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev am:
52af7e0759
am:
f07199a9b1
Change-Id: I2bb40f0548ac493ad2810dc54041951fc44ae474
Chris Thornton [Tue, 18 Oct 2016 22:27:00 +0000 (15:27 -0700)]
Only purge sound models that violate the new primary key constraint if
they don't contain identical data.
Bug:
32174118
Change-Id: Ied5e4e852337e5f819c7ded53dd941d79087ce73
Adrian Roos [Tue, 18 Oct 2016 22:19:43 +0000 (22:19 +0000)]
Separate ambient display triggers am:
b7e4e10618
am:
59116440e7
Change-Id: I588f5541c73ae356b255ffa6b1e23c1fbcd1693e
Adrian Roos [Tue, 18 Oct 2016 22:12:53 +0000 (22:12 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
am:
52af7e0759
Change-Id: I61ccb55ed8d4226fa46fdad8dd7845dfae3bc2a3
Adrian Roos [Tue, 18 Oct 2016 22:07:03 +0000 (22:07 +0000)]
Separate ambient display triggers
am:
b7e4e10618
Change-Id: I575f96338cffa0f6e8adb1b9ff300dbd322398dc
Adrian Roos [Tue, 18 Oct 2016 22:00:04 +0000 (22:00 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
Fan Zhang [Tue, 18 Oct 2016 21:45:30 +0000 (21:45 +0000)]
Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev am:
964874e444
am:
d0560f097a
Change-Id: I0793226266472697b2ef68419706cd38952efa6f
Fan Zhang [Tue, 18 Oct 2016 21:44:31 +0000 (21:44 +0000)]
Catch NPE on network state and fall back to empty summary. am:
6acb76621d
am:
d856752ee7
Change-Id: Id1f17b2d60627110c1c7a3ae9aac3a7496f534f1
Fan Zhang [Tue, 18 Oct 2016 21:37:35 +0000 (21:37 +0000)]
Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev
am:
964874e444
Change-Id: I86e665b3aee0d01dcbec3040e51efeb60b8f2f0e
Brad Ebinger [Tue, 18 Oct 2016 21:37:35 +0000 (21:37 +0000)]
Merge "Add support for new SessionManager and EventManager tests" am:
42598f4a96
am:
cedb97bfb6
Change-Id: I8f24b19fadecea0cea945ba96bd885b6e8030b06
Fan Zhang [Tue, 18 Oct 2016 21:37:30 +0000 (21:37 +0000)]
Catch NPE on network state and fall back to empty summary.
am:
6acb76621d
Change-Id: I208a614e1a29c0d0e523d712ea184ee87fc04254
Brad Ebinger [Tue, 18 Oct 2016 21:30:57 +0000 (21:30 +0000)]
Merge "Add support for new SessionManager and EventManager tests"
am:
42598f4a96
Change-Id: I9c629074ca39dfb06bd6b16217ba5e59a9e0a004
TreeHugger Robot [Tue, 18 Oct 2016 21:27:44 +0000 (21:27 +0000)]
Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev
Brad Ebinger [Tue, 18 Oct 2016 21:22:18 +0000 (21:22 +0000)]
Merge "Add support for new SessionManager and EventManager tests"
Adam Lesinski [Tue, 18 Oct 2016 20:55:01 +0000 (20:55 +0000)]
Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev am:
212a6f264f
am:
f851c07b85
Change-Id: Ia157a60515b3130fa8a77886c27c55bb5cb85a25
Adam Lesinski [Tue, 18 Oct 2016 20:53:59 +0000 (20:53 +0000)]
Fix race with Asset destruction and printing allocation stats am:
2582465bb4
am:
882f8168b0
Change-Id: I613fabdaad38be88ff9c4527e100e33a87f9d601
Adam Lesinski [Tue, 18 Oct 2016 20:40:54 +0000 (20:40 +0000)]
Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev
am:
212a6f264f
Change-Id: I2f092b325c8b5333dc8435cf7b41a652d6c8b2be
Adam Lesinski [Tue, 18 Oct 2016 20:40:50 +0000 (20:40 +0000)]
Fix race with Asset destruction and printing allocation stats
am:
2582465bb4
Change-Id: I1dbb7609fa4d770e513e6f628e4c598600607383
TreeHugger Robot [Tue, 18 Oct 2016 20:29:37 +0000 (20:29 +0000)]
Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev
Svetoslav Ganov [Tue, 18 Oct 2016 01:41:48 +0000 (18:41 -0700)]
[DO NOT MERGE] Catch a missed case when adding a toast
We allow a single toast window per UID. It is possible that
the UID had another toast window that is going away and this
CL adds a missed check for when a window is scheduled to be
removed.
bug:
31340854
Change-Id: I0621516019542c85fe7121f7fe61659e4d4eb672
Sungsoo [Tue, 18 Oct 2016 20:15:17 +0000 (20:15 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42 am:
583a7017ce -s ours am:
8c94179f51 am:
336791758a am:
43222cec43 am:
e7adcdd082 -s ours am:
ac12204cd3 am:
f134b88684 am:
c23c9dd730
am:
51497a9403
Change-Id: I4b46f957553adb310eb9cfa3e0a38ecf90793bf0