Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,811 Commits 3 Branches 0 Tags
439d71837e2cdce8256fd989bb3dd98c3856fbf0
Commit Graph

253811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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

Change-Id: I52c0fc44767f3b1102a8830e9e7910bf6d0db993
 2016-10-18 23:09:58 +00:00
Hemal Patel
8068fdca0c Docs: Fixed a broken link am: 9a641b6989 
am: 40aaf53920

Change-Id: I4888353281c101f92da0ce438e64531739c332be
 2016-10-18 23:08:56 +00:00
Hemal Patel
2a2c0fb96a Merge "Docs: Fixed a broken link" into nyc-dev 
am: b361f519dc

Change-Id: I715603d2fe5f7d21b93c663dc7109d4ee5abaf74
 2016-10-18 23:01:56 +00:00
Hemal Patel
40aaf53920 Docs: Fixed a broken link 
am: 9a641b6989

Change-Id: If8e166a3cb36d158fd428e314b90cb265cf2256c
 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
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

Change-Id: I80bb9d7fb4e9a00abab35af04f64f21f9c8675e9
 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

Change-Id: I1faab603c76031b48b4fa6560c67fae4e3247e31
 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

Change-Id: I1c5b083fa5dfdb6c7b1333829c917f2075dc66ce
 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  -s ours

Change-Id: I2903eae7d1334282e9f2fdb04a7970e1bc423c02
 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

Change-Id: Ibffc1f2ab709556898c1b391b28614175677d430
 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

Change-Id: I7a7dd7b99934dbd0e0150ca2b89e8458f6133fde
 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

Change-Id: Iaea2cf175368efe32934a14d5717fe2069c1ce99
 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

Change-Id: Iae5fe5b1b113ee2b395d0784f3223ab5f7089cd9
 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  -s ours

Change-Id: I9a3ed1ceeb98c70c0dc49ad3278f05f194cdd385
 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

Change-Id: I7aba59c53b9fbeb6d58d139d730cdb13af78d6bb
 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

Change-Id: I2210d4a29a515e3ff6b653d03051e213b209d7c6
 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  -s ours

Change-Id: I57497969a54d7491db6ba7e585ea95e363d2f6dd
 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

Change-Id: I5a0930994d7fcd0e130d8127d2107effcd29d02d
 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

Change-Id: I8abecc3855c2dd92fbf25717bd56481dd1ee37ea
 2016-10-18 18:07:19 +00:00
Sungsoo
8c94179f51 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

Change-Id: I39976fd7bf943dd9b4e38c084270c977cf0511ca
 2016-10-18 18:00:54 +00:00
Sungsoo
78cc05eebe 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

Change-Id: Ie8e3cfffd550c15b8d43d59539962d07934e76a3
 2016-10-18 18:00:45 +00:00
Sungsoo
ef874e34b9 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a -s ours am: 8be090868e am: 69febedd6d 
am: a1f70f7056

Change-Id: I9ac60876e36d651e3aec597d4d6a396041877e98
 2016-10-18 17:56:13 +00:00
Sungsoo
6e6bb933ae DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6 am: e31a44b710 am: 802632d4a8 -s ours 
am: 6eea6bbb5a

Change-Id: If9505274f0a5e0cf42909d450320e30a19766265
 2016-10-18 17:55:56 +00:00
Sungsoo
583a7017ce 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

Change-Id: Id4fd3422c443d5e7363d3ff27b2ba0eeb532f1dd
 2016-10-18 17:54:57 +00:00
Sungsoo
6eea6bbb5a DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6 am: e31a44b710 
am: 802632d4a8  -s ours

Change-Id: Ic5bcd58df094c76a640197bc0e39f007617911b3
 2016-10-18 17:48:04 +00:00
Sungsoo
a1f70f7056 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a -s ours am: 8be090868e 
am: 69febedd6d

Change-Id: Id1c70a1131d860d027fed915088918232899f026
 2016-10-18 17:47:59 +00:00
Sungsoo
ec44540d42 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184 -s ours 
am: 21c4e6d532  -s ours

Change-Id: Ibf02e62ee13accd5d204c44faeb6aa8c05afb709
 2016-10-18 17:47:58 +00:00
Sungsoo
25cbc1b7ec DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours am: 02cd808ab8 am: 8e2451759d -s ours 
am: 9cf942973d

Change-Id: Ice1c96b49f7350a41cf35779f0f1fb06f6ff0c77
 2016-10-18 17:47:56 +00:00
Adrian Roos
b7e4e10618 Separate ambient display triggers 
Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.

Bug: 32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work
 2016-10-18 10:43:44 -07:00
Sungsoo
b6f40a84fa ExifInterfaceTest: Catch IOException am: c9ed3b8a5b 
am: a4ec9714b3

Change-Id: I32a0cd6b1a58a697f108f37e0f036e55c9df9e17
 2016-10-18 17:42:01 +00:00
Sungsoo
21c4e6d532 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e 
am: 9a15881184  -s ours

Change-Id: I67ba2d8b8d3c3f32fca417303ee422482acc40d8
 2016-10-18 17:41:55 +00:00
Sungsoo
9cf942973d DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours am: 02cd808ab8 
am: 8e2451759d  -s ours

Change-Id: Id0d69d1bddcf0d6059b53bd3a4b2b55df493899c
 2016-10-18 17:41:49 +00:00
Sungsoo
802632d4a8 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6 
am: e31a44b710

Change-Id: I6d56c9db2085bf7b14a3a82184ce0efe77479871
 2016-10-18 17:41:48 +00:00
Sungsoo
69febedd6d DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a -s ours 
am: 8be090868e

Change-Id: I9e9954d2d058b6552d4d9900df51a4050a90c1fe
 2016-10-18 17:41:45 +00:00
Sungsoo
9a15881184 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba 
am: a5affb045e

Change-Id: I4bb4440c019839073b4fcf6df54d726a02286680
 2016-10-18 17:35:23 +00:00
Sungsoo
8be090868e DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d 
am: 41b775b40a  -s ours

Change-Id: I6ce63b74988fb4f87565be611a47c2f4a28cbc9b
 2016-10-18 17:35:22 +00:00