drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
293,677 Commits 1 Branch 0 Tags
Commit Graph

293677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
93e4720813 Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev 
am: 0858d08a88

Change-Id: Idc8f2c1685c11d301d9fb4323a21e6d14c4ae594
 2016-10-18 22:55:17 +00:00
Adam Lesinski
be75a58447 Fix regression with defaultDisplay adjustments 
am: f02523bf4b

Change-Id: I7e96a95bcb75ee0b286e73024f62391cc1b759dd
 2016-10-18 22:55:14 +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
Adrian Roos
674a3c33b2 Merge "Separate ambient display triggers" into nyc-mr1-dev am: 52af7e0759 am: f07199a9b1 
am: 4fbbfc3088

Change-Id: I16a0e700a5d904b738bead605249fafbf92530bc
 2016-10-18 22:48:17 +00:00
TreeHugger Robot
0858d08a88 Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev 2016-10-18 22:46:24 +00:00
Adrian Roos
4fbbfc3088 Merge "Separate ambient display triggers" into nyc-mr1-dev am: 52af7e0759 
am: f07199a9b1

Change-Id: I2bb40f0548ac493ad2810dc54041951fc44ae474
 2016-10-18 22:41:45 +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
3d374af378 Separate ambient display triggers am: b7e4e10618 am: 59116440e7 
am: 102aa8b6f1

Change-Id: I39cb0337ed295e370ea7ba4cc298ba3fdf1339c8
 2016-10-18 22:27:20 +00:00
Adrian Roos
102aa8b6f1 Separate ambient display triggers am: b7e4e10618 
am: 59116440e7

Change-Id: I588f5541c73ae356b255ffa6b1e23c1fbcd1693e
 2016-10-18 22:19:43 +00:00
Adrian Roos
f07199a9b1 Merge "Separate ambient display triggers" into nyc-mr1-dev 
am: 52af7e0759

Change-Id: I61ccb55ed8d4226fa46fdad8dd7845dfae3bc2a3
 2016-10-18 22:12:53 +00:00
Adrian Roos
59116440e7 Separate ambient display triggers 
am: b7e4e10618

Change-Id: I575f96338cffa0f6e8adb1b9ff300dbd322398dc
 2016-10-18 22:07:03 +00:00
Adrian Roos
52af7e0759 Merge "Separate ambient display triggers" into nyc-mr1-dev 2016-10-18 22:00:06 +00:00
Fan Zhang
87cfd129f4 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
 2016-10-18 21:52:55 +00:00
Fan Zhang
81d0f33017 Catch NPE on network state and fall back to empty summary. am: 6acb76621d am: d856752ee7 
am: 383fd2e9b6

Change-Id: Id4d56142abdcb8a99677db016beaf5708d40ba45
 2016-10-18 21:51:59 +00:00
Fan Zhang
731e3b6b20 Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev am: 964874e444 
am: d0560f097a

Change-Id: I0793226266472697b2ef68419706cd38952efa6f
 2016-10-18 21:45:30 +00:00
Fan Zhang
383fd2e9b6 Catch NPE on network state and fall back to empty summary. am: 6acb76621d 
am: d856752ee7

Change-Id: Id1f17b2d60627110c1c7a3ae9aac3a7496f534f1
 2016-10-18 21:44:31 +00:00
Brad Ebinger
88f2c1af85 Merge "Add support for new SessionManager and EventManager tests" am: 42598f4a96 am: cedb97bfb6 
am: 80cb63df92

Change-Id: I6b322a5242e52b37de9cf3a43e25e0c4d6d33eed
 2016-10-18 21:44:08 +00:00
Fan Zhang
d0560f097a Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev 
am: 964874e444

Change-Id: I86e665b3aee0d01dcbec3040e51efeb60b8f2f0e
 2016-10-18 21:37:35 +00:00
Brad Ebinger
80cb63df92 Merge "Add support for new SessionManager and EventManager tests" am: 42598f4a96 
am: cedb97bfb6

Change-Id: I8f24b19fadecea0cea945ba96bd885b6e8030b06
 2016-10-18 21:37:35 +00:00
Fan Zhang
d856752ee7 Catch NPE on network state and fall back to empty summary. 
am: 6acb76621d

Change-Id: I208a614e1a29c0d0e523d712ea184ee87fc04254
 2016-10-18 21:37:30 +00:00
Brad Ebinger
cedb97bfb6 Merge "Add support for new SessionManager and EventManager tests" 
am: 42598f4a96

Change-Id: I9c629074ca39dfb06bd6b16217ba5e59a9e0a004
 2016-10-18 21:30:57 +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
Brad Ebinger
42598f4a96 Merge "Add support for new SessionManager and EventManager tests" 2016-10-18 21:22:19 +00:00
Adam Lesinski
e9a49855d4 Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev am: 212a6f264f am: f851c07b85 
am: 0efc2ed89b

Change-Id: Id3e67455e448a5786d2102085f0543c223c169e7
 2016-10-18 21:02:15 +00:00
Adam Lesinski
49b85d670d Fix race with Asset destruction and printing allocation stats am: 2582465bb4 am: 882f8168b0 
am: 08a870cd6d

Change-Id: I0ffc2b8268d376a45618f2b33fbb964b788ffbea
 2016-10-18 21:01:14 +00:00
Adam Lesinski
0efc2ed89b Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev am: 212a6f264f 
am: f851c07b85

Change-Id: Ia157a60515b3130fa8a77886c27c55bb5cb85a25
 2016-10-18 20:55:01 +00:00
Adam Lesinski
08a870cd6d Fix race with Asset destruction and printing allocation stats am: 2582465bb4 
am: 882f8168b0

Change-Id: I613fabdaad38be88ff9c4527e100e33a87f9d601
 2016-10-18 20:53:59 +00:00
Adam Lesinski
f851c07b85 Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev 
am: 212a6f264f

Change-Id: I2f092b325c8b5333dc8435cf7b41a652d6c8b2be
 2016-10-18 20:40:54 +00:00
Adam Lesinski
882f8168b0 Fix race with Asset destruction and printing allocation stats 
am: 2582465bb4

Change-Id: I1dbb7609fa4d770e513e6f628e4c598600607383
 2016-10-18 20:40:50 +00:00
Adrian Roos
d2a18cf75d Merge "ImageWallpaper: forget wallpaper in background" 2016-10-18 20:29:57 +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
John Reck
60bf972d48 Merge "Fix pause/resume timing" 2016-10-18 20:27:41 +00:00
Sungsoo
68fbb5e1c9 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
 2016-10-18 20:21:43 +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
Sungsoo
31be9d42af 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
 2016-10-18 20:20:35 +00:00
Sungsoo
be057aaea3 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
 2016-10-18 20:19:51 +00:00
Andy Hung
2b9a746ca5 Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev am: 8e7b934850 am: 76bd5dfdf5 
am: 5b80bb2e68

Change-Id: Ib44e6c1bae259d94d88337b2bd41301d08d1527b
 2016-10-18 20:18:57 +00:00
Andy Hung
0564ec9d68 resolve merge conflicts of ffe502b to cw-f-dev am: 3dd656c624 
am: c6e0d5f125

Change-Id: I80b908142bb4dbd2af8c9f3627ecfd5e3df1963c
 2016-10-18 20:18:05 +00:00
Jordan Liu
5ac6f5c95d 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
 2016-10-18 13:15:18 -07:00
Sungsoo
9e844d9a80 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
 2016-10-18 20:15:17 +00:00
Sungsoo
4202549ca1 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
 2016-10-18 20:14:08 +00: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
b49d9df30e 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
 2016-10-18 20:13:09 +00:00
Andy Hung
5b80bb2e68 Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev am: 8e7b934850 
am: 76bd5dfdf5

Change-Id: I9d27d401f7df88b914387e5b50c025b75899be62
 2016-10-18 20:12:09 +00:00
Andy Hung
c6e0d5f125 resolve merge conflicts of ffe502b to cw-f-dev 
am: 3dd656c624

Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2
 2016-10-18 20:11:21 +00:00
Sungsoo
51497a9403 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
 2016-10-18 20:07:57 +00:00
Sungsoo
1962e0e940 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
 2016-10-18 20:06:45 +00:00
Sungsoo
c92abdeac8 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
 2016-10-18 20:05:44 +00:00
TreeHugger Robot
1262a92ac2 Merge "Upgrade resize mode setting for home activities when restoring task" 2016-10-18 20:04:55 +00:00