TreeHugger Robot
5f4169b5ea
Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev
2016-10-19 18:45:26 +00:00
Andrii Kulian
6e4f6ecbab
Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev
2016-10-19 18:31:37 +00:00
Dan Yu
0346fee93c
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 am: 3aa0ff2de7
...
am: 8233c03d1e
2016-10-19 18:05:37 +00:00
Daniel Yu
f45beedf6c
docs: Updating TIF docs for new TIF Companion library. am: e0810402fb am: f8a8260c0d
...
am: 9ce21dc769
2016-10-19 17:57:11 +00:00
Yang Ni
02addb0b41
Merge "Updated API reference doc for Single-Source RS" into nyc-dev am: 6aee6e9ca8
...
am: 4a9883cdf8
2016-10-19 17:52:39 +00:00
Dan Yu
8233c03d1e
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6
...
am: 3aa0ff2de7
2016-10-19 17:52:35 +00:00
Daniel Yu
9ce21dc769
docs: Updating TIF docs for new TIF Companion library. am: e0810402fb
...
am: f8a8260c0d
2016-10-19 17:51:36 +00:00
Yang Ni
93f0442cbd
Updated API reference doc for Single-Source RS am: 51f1e93be7
...
am: 246b0bcc9a
2016-10-19 17:51:32 +00:00
Dan Yu
3aa0ff2de7
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs
...
am: dc69de5ac6
2016-10-19 17:44:48 +00:00
Daniel Yu
f8a8260c0d
docs: Updating TIF docs for new TIF Companion library.
...
am: e0810402fb
2016-10-19 17:44:46 +00:00
Yang Ni
4a9883cdf8
Merge "Updated API reference doc for Single-Source RS" into nyc-dev
...
am: 6aee6e9ca8
2016-10-19 17:37:43 +00:00
Yang Ni
246b0bcc9a
Updated API reference doc for Single-Source RS
...
am: 51f1e93be7
2016-10-19 17:37:39 +00:00
Dan Yu
dc69de5ac6
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs
2016-10-19 17:30:46 +00:00
Yang Ni
6aee6e9ca8
Merge "Updated API reference doc for Single-Source RS" into nyc-dev
2016-10-19 17:26:00 +00:00
Andrew Solovay
439d71837e
Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev
2016-10-19 17:06:47 +00:00
Winson
448c0adb78
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
2016-10-19 09:53:59 -07:00
Marie Janssen
9fa2491850
Bluetooth: More logging of bluetooth service state
...
Bug: 32140251
Bug: 32140271
Bug: 32060415
Change-Id: I50faa184551748023ea5a573646a75293f553d16
2016-10-19 16:28:31 +00:00
Svetoslav Ganov
d48bd27f0e
Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev
2016-10-19 01:35:37 +00:00
TreeHugger Robot
23655af585
Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev
2016-10-19 01:17:05 +00:00
Andrew Solovay
c86db22b2f
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
2016-10-19 01:16:18 +00:00
Svetoslav Ganov
76043cf69f
Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev
2016-10-19 00:33:02 +00:00
Hemal Patel
b841c2d845
Merge "Docs: Fixed a broken link" into nyc-dev am: b361f519dc
...
am: 2a2c0fb96a
2016-10-18 23:09:58 +00:00
Hemal Patel
8068fdca0c
Docs: Fixed a broken link am: 9a641b6989
...
am: 40aaf53920
2016-10-18 23:08:56 +00:00
Andrii Kulian
da3b648b64
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
2016-10-18 23:03:39 +00:00
Hemal Patel
2a2c0fb96a
Merge "Docs: Fixed a broken link" into nyc-dev
...
am: b361f519dc
2016-10-18 23:01:56 +00:00
Hemal Patel
40aaf53920
Docs: Fixed a broken link
...
am: 9a641b6989
2016-10-18 23:01:53 +00:00
Hemal Patel
b361f519dc
Merge "Docs: Fixed a broken link" into nyc-dev
2016-10-18 22:54:39 +00:00
Kevin Hufnagle
68d699d100
docs: Updated ShortcutManager and ShortcutInfo class references.
...
Bug: 32074598
Change-Id: I168d49a8542b411a074dc6e9120b0f08f72a829a
2016-10-18 15:53:09 -07:00
TreeHugger Robot
0858d08a88
Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev
2016-10-18 22:46:24 +00:00
Chris Thornton
d5ff116403
Only purge sound models that violate the new primary key constraint if
...
they don't contain identical data.
Bug: 32174118
Change-Id: Ied5e4e852337e5f819c7ded53dd941d79087ce73
2016-10-18 15:36:27 -07:00
Adrian Roos
52af7e0759
Merge "Separate ambient display triggers" into nyc-mr1-dev
2016-10-18 22:00:06 +00:00
TreeHugger Robot
964874e444
Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev
2016-10-18 21:27:47 +00:00
TreeHugger Robot
212a6f264f
Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev
2016-10-18 20:29:40 +00:00
Svetoslav Ganov
5c90c5e32e
[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
2016-10-18 13:21:27 -07:00
Adam Lesinski
f02523bf4b
Fix regression with defaultDisplay adjustments
...
ag/1542219 introduced a regression where if the display was the default
display, the configuration would still be adjusted as if it were
a non-default display. This fixes that logic to only adjust the
configuration if the display is non-default.
Bug:32133693
Test: cts-tradefed run cts --module CtsServicesHostTestCases --test android.server.cts.ActivityManagerAppConfigurationTests#testConfigurationUpdatesWhenRotatingToSideFromDocked
Change-Id: Ib2fda8c1651609efa9d20b3e2dace8a122864916
2016-10-18 20:13:57 +00:00
Sungsoo
c23c9dd730
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
2016-10-18 18:39:48 +00:00
Sungsoo
f134b88684
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
2016-10-18 18:33:13 +00:00
Sungsoo
195a80e3ff
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours am: 02cd808ab8 am: 8e2451759d -s ours am: 9cf942973d am: 25cbc1b7ec am: 78cc05eebe am: a787a575b1 -s ours am: 88a5b7e919
...
am: 1342dca30f
2016-10-18 18:26:41 +00:00
Sungsoo
ac12204cd3
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
2016-10-18 18:26:35 +00:00
Sungsoo
1342dca30f
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours am: 02cd808ab8 am: 8e2451759d -s ours am: 9cf942973d am: 25cbc1b7ec am: 78cc05eebe am: a787a575b1 -s ours
...
am: 88a5b7e919
2016-10-18 18:20:27 +00:00
Sungsoo
2b9cb55632
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a -s ours am: 8be090868e am: 69febedd6d am: a1f70f7056 am: ef874e34b9 -s ours am: c4b72e5f1d
...
am: 7fd5f3d2a3
2016-10-18 18:20:17 +00:00
Sungsoo
e7adcdd082
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
2016-10-18 18:20:01 +00:00
Andy Hung
8e7b934850
Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev
2016-10-18 18:15:03 +00:00
Sungsoo
7fd5f3d2a3
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a -s ours am: 8be090868e am: 69febedd6d am: a1f70f7056 am: ef874e34b9 -s ours
...
am: c4b72e5f1d
2016-10-18 18:14:10 +00:00
Sungsoo
88a5b7e919
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours am: 02cd808ab8 am: 8e2451759d -s ours am: 9cf942973d am: 25cbc1b7ec am: 78cc05eebe
...
am: a787a575b1
2016-10-18 18:14:03 +00:00
Sungsoo
43222cec43
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
2016-10-18 18:13:55 +00:00
Sungsoo
5f6d0c2c81
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6 am: e31a44b710 am: 802632d4a8 -s ours am: 6eea6bbb5a
...
am: 6e6bb933ae
2016-10-18 18:07:43 +00:00
Sungsoo
c4b72e5f1d
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a -s ours am: 8be090868e am: 69febedd6d am: a1f70f7056
...
am: ef874e34b9
2016-10-18 18:07:24 +00:00
Sungsoo
a787a575b1
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours am: 02cd808ab8 am: 8e2451759d -s ours am: 9cf942973d am: 25cbc1b7ec
...
am: 78cc05eebe
2016-10-18 18:07:22 +00:00
Sungsoo
336791758a
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
2016-10-18 18:07:19 +00:00
