OSDN Git Service
Paulo Casanova [Fri, 7 Oct 2016 11:00:26 +0000 (12:00 +0100)]
Added JNI interface for aapt2.
Test: None (tests will be made on the Android Studio Tools project)
Change-Id: I8e0ba8634500df7a8d19e0b381f46c3cd4652f5b
Hugo Benichi [Wed, 19 Oct 2016 07:13:35 +0000 (07:13 +0000)]
Merge "Add IP conn metrics to dumpsys and bug reports"
Hugo Benichi [Wed, 19 Oct 2016 04:48:40 +0000 (13:48 +0900)]
Add IP conn metrics to dumpsys and bug reports
Test: manually created a bug report and inspected content.
Change-Id: I3119db2a25c895264eae409f1dda9fc756cd244e
TreeHugger Robot [Wed, 19 Oct 2016 04:32:06 +0000 (04:32 +0000)]
Merge "fix wrong trace from IpConnectivityMetrics"
Salvador Martinez [Wed, 19 Oct 2016 03:36:09 +0000 (03:36 +0000)]
Merge "added metrics constant to proto"
Svetoslav Ganov [Wed, 19 Oct 2016 02:03:16 +0000 (02:03 +0000)]
Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev am:
d48bd27f0e am:
6a2ada0a0a
am:
f5d0bbe94a -s ours
Change-Id: I5e7a93c0149f06b5f62e20dc66f8e2873bdadb61
Svetoslav Ganov [Wed, 19 Oct 2016 02:02:19 +0000 (02:02 +0000)]
[DO NOT MERGE] Catch a missed case when adding a toast am:
5c90c5e32e am:
a9aa78b1fd
am:
6c693aa777 -s ours
Change-Id: I9655800f21529872b77c282b0b2ea159b65d5cfd
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
TreeHugger Robot [Wed, 19 Oct 2016 01:50:21 +0000 (01:50 +0000)]
Merge "Un-hide ROTATION_ANIMATION_SEAMLESS."
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
Chris Thornton [Wed, 19 Oct 2016 01:42:01 +0000 (01:42 +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
am:
1ff7f78266
Change-Id: Iae8f6d22b7f6b2d81d7aebb5d22e360a41b9ede0
Chris Thornton [Wed, 19 Oct 2016 01:40:52 +0000 (01:40 +0000)]
Only purge sound models that violate the new primary key constraint if they don't contain identical data. am:
d5ff116403 am:
519b7837bb
am:
a7f3f1aa91
Change-Id: I5a376cac47bd279ed13116213b2a78ddcdae8eb2
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
Svetoslav Ganov [Wed, 19 Oct 2016 01:04:51 +0000 (01:04 +0000)]
Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev am:
76043cf69f am:
b3a8fc9835
am:
7952934a1a
Change-Id: Ia20abb4984537a70e066f67a12ef55626a473813
Svet Ganov [Wed, 19 Oct 2016 01:03:55 +0000 (01:03 +0000)]
Validate input for ContentService#setIsSyncable am:
96b9c75cec am:
ba7bd1fe06
am:
792fef2716
Change-Id: I222d335e4b3ca153e1caaa0f3006268d4d5fa6b9
Keun-young Park [Wed, 19 Oct 2016 00:52:30 +0000 (17:52 -0700)]
fix wrong trace from IpConnectivityMetrics
- should use only traceEnd() after traceBeginAndSlog
bug:
32256110
Test: manual log check
Change-Id: If7dcceacd316450990402a1a20877ceb8c85a098
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
Jordan Liu [Wed, 19 Oct 2016 00:40:41 +0000 (00:40 +0000)]
Merge "Add key for sms_convert_destination_number"
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:39:08 +0000 (23:39 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev am:
b361f519dc am:
2a2c0fb96a am:
b841c2d845 am:
6fe03a8529
am:
889aad4625
Change-Id: Ic2a580203dd3a2cf1a6702b3c6c900ea1ae16831
Hemal Patel [Tue, 18 Oct 2016 23:37:49 +0000 (23:37 +0000)]
Docs: Fixed a broken link am:
9a641b6989 am:
40aaf53920 am:
8068fdca0c am:
c9f68a8be3
am:
acaeb09715
Change-Id: I85d667af5fd5fe01501c5f72b6e5419cdd27fc1d
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
Adam Lesinski [Tue, 18 Oct 2016 23:17:12 +0000 (23:17 +0000)]
Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev am:
0858d08a88 am:
93e4720813
am:
c31b8c95ad
Change-Id: I552e9467d11d648e00c337dc711ad56fbab9dd27
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
Adam Lesinski [Tue, 18 Oct 2016 23:16:13 +0000 (23:16 +0000)]
Fix regression with defaultDisplay adjustments am:
f02523bf4b am:
be75a58447
am:
cc903f425a
Change-Id: Id954c20f9d014cf26a4177f350f8941e6324adf3
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
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
Adrian Roos [Tue, 18 Oct 2016 22:48:17 +0000 (22:48 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev am:
52af7e0759 am:
f07199a9b1
am:
4fbbfc3088
Change-Id: I16a0e700a5d904b738bead605249fafbf92530bc
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:27:20 +0000 (22:27 +0000)]
Separate ambient display triggers am:
b7e4e10618 am:
59116440e7
am:
102aa8b6f1
Change-Id: I39cb0337ed295e370ea7ba4cc298ba3fdf1339c8
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:52:55 +0000 (21:52 +0000)]
Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev am:
964874e444 am:
d0560f097a
am:
731e3b6b20
Change-Id: I08629ae41d9d54fcfe1daaf21f29a995094f2b18
Fan Zhang [Tue, 18 Oct 2016 21:51:59 +0000 (21:51 +0000)]
Catch NPE on network state and fall back to empty summary. am:
6acb76621d am:
d856752ee7
am:
383fd2e9b6
Change-Id: Id4d56142abdcb8a99677db016beaf5708d40ba45
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
Brad Ebinger [Tue, 18 Oct 2016 21:44:08 +0000 (21:44 +0000)]
Merge "Add support for new SessionManager and EventManager tests" am:
42598f4a96 am:
cedb97bfb6
am:
80cb63df92
Change-Id: I6b322a5242e52b37de9cf3a43e25e0c4d6d33eed
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 21:02:15 +0000 (21:02 +0000)]
Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev am:
212a6f264f am:
f851c07b85
am:
0efc2ed89b
Change-Id: Id3e67455e448a5786d2102085f0543c223c169e7
Adam Lesinski [Tue, 18 Oct 2016 21:01:14 +0000 (21:01 +0000)]
Fix race with Asset destruction and printing allocation stats am:
2582465bb4 am:
882f8168b0
am:
08a870cd6d
Change-Id: I0ffc2b8268d376a45618f2b33fbb964b788ffbea
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
Adrian Roos [Tue, 18 Oct 2016 20:29:53 +0000 (20:29 +0000)]
Merge "ImageWallpaper: forget wallpaper in background"
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
John Reck [Tue, 18 Oct 2016 20:27:37 +0000 (20:27 +0000)]
Merge "Fix pause/resume timing"
Sungsoo [Tue, 18 Oct 2016 20:21:43 +0000 (20:21 +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
am:
9e844d9a80 -s ours
Change-Id: Ifebe6ce5119121f36d76b2b44f20c1f2c0d1f0f1
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:20:35 +0000 (20:20 +0000)]
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 am:
195a80e3ff am:
1962e0e940
am:
4202549ca1 -s ours
Change-Id: I622ce938fe48af38103caf721a4073183dd23f81
Sungsoo [Tue, 18 Oct 2016 20:19:51 +0000 (20:19 +0000)]
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 am:
2b9cb55632 am:
c92abdeac8
am:
b49d9df30e -s ours
Change-Id: Ia442b247ea1a00856f7315522d239c8cd890df09
Andy Hung [Tue, 18 Oct 2016 20:18:57 +0000 (20:18 +0000)]
Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev am:
8e7b934850 am:
76bd5dfdf5
am:
5b80bb2e68
Change-Id: Ib44e6c1bae259d94d88337b2bd41301d08d1527b
Andy Hung [Tue, 18 Oct 2016 20:18:05 +0000 (20:18 +0000)]
resolve merge conflicts of
ffe502b to cw-f-dev am:
3dd656c624
am:
c6e0d5f125
Change-Id: I80b908142bb4dbd2af8c9f3627ecfd5e3df1963c
Jordan Liu [Mon, 3 Oct 2016 19:28:27 +0000 (12:28 -0700)]
Add key for sms_convert_destination_number
Add the CarrierConfig key
KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL
and remove the old configs. Note that this value no longer needs to be a
string-array, as CarrierConfigManager handles gid.
Bug:
29873049
Change-Id: I3edbcf5329177f6b370d08a09318c35c55e5e052
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
Sungsoo [Tue, 18 Oct 2016 20:14:08 +0000 (20:14 +0000)]
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 am:
195a80e3ff
am:
1962e0e940
Change-Id: I8817af944903f5a4a3ecdf1a777034213cede1b5
Adam Lesinski [Tue, 18 Oct 2016 19:58:27 +0000 (12:58 -0700)]
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
Sungsoo [Tue, 18 Oct 2016 20:13:09 +0000 (20:13 +0000)]
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 am:
2b9cb55632
am:
c92abdeac8
Change-Id: Ib5602cf0cef9d7d8ada75b0776d28cbe2fb6512b
Andy Hung [Tue, 18 Oct 2016 20:12:09 +0000 (20:12 +0000)]
Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev am:
8e7b934850
am:
76bd5dfdf5
Change-Id: I9d27d401f7df88b914387e5b50c025b75899be62
Andy Hung [Tue, 18 Oct 2016 20:11:21 +0000 (20:11 +0000)]
resolve merge conflicts of
ffe502b to cw-f-dev
am:
3dd656c624
Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2
Sungsoo [Tue, 18 Oct 2016 20:07:57 +0000 (20:07 +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
Change-Id: I75cf94578e061a8216da4ee97707b7128c107114
Sungsoo [Tue, 18 Oct 2016 20:06:45 +0000 (20:06 +0000)]
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
am:
195a80e3ff
Change-Id: Ib4b74e316a6ee7602e4800cfe405c1a539645c2b
Sungsoo [Tue, 18 Oct 2016 20:05:44 +0000 (20:05 +0000)]
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
am:
2b9cb55632
Change-Id: I37bd28917a2532c01839be892cb49ff3fc51c394
TreeHugger Robot [Tue, 18 Oct 2016 20:04:52 +0000 (20:04 +0000)]
Merge "Upgrade resize mode setting for home activities when restoring task"
Andy Hung [Tue, 18 Oct 2016 20:04:48 +0000 (20:04 +0000)]
Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev
am:
8e7b934850
Change-Id: I91225b8b4b24f9580ce8599462913b81ee932f6f
Andy Hung [Tue, 18 Oct 2016 18:55:04 +0000 (11:55 -0700)]
resolve merge conflicts of
ffe502b to cw-f-dev
Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1
Sungsoo [Tue, 18 Oct 2016 18:39:48 +0000 (18:39 +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
Change-Id: I80bb9d7fb4e9a00abab35af04f64f21f9c8675e9
Sungsoo [Tue, 18 Oct 2016 18:33:13 +0000 (18:33 +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
Change-Id: I1faab603c76031b48b4fa6560c67fae4e3247e31
Sungsoo [Tue, 18 Oct 2016 18:32:55 +0000 (18:32 +0000)]
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 am:
5f6d0c2c81 am:
cbec33614a
am:
f420816b25 -s ours
Change-Id: Ic819a694aec65c0a1dd57f2ce4bd2e545f69511f
Sungsoo [Tue, 18 Oct 2016 18:26:41 +0000 (18:26 +0000)]
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
Change-Id: I1c5b083fa5dfdb6c7b1333829c917f2075dc66ce
Sungsoo [Tue, 18 Oct 2016 18:26:35 +0000 (18:26 +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
Change-Id: I2903eae7d1334282e9f2fdb04a7970e1bc423c02
Sungsoo [Tue, 18 Oct 2016 18:20:34 +0000 (18:20 +0000)]
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 am:
5f6d0c2c81
am:
cbec33614a
Change-Id: I8eea4fe42e6dae0303e9a63eacfb3821d72e8271
OSDN Git Service
