Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,484 Commits 3 Branches 0 Tags
fb19d8d7c142aae0aaa9782db145fee072071fbf
Commit Graph

277484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Karpinski
949a485e29 Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev 
am: a6b3caf58e

Change-Id: I9763e78b50a98dcf1139cdc299a8944e94c824d9
 2016-10-13 22:52:41 +00:00
Michal Karpinski
bc755da55c Don't expose default strong auth timeout as constant 
am: 6dbf67fc48

Change-Id: Iacbe9a2de7024e29e9c2c98594ebca828b855a43
 2016-10-13 22:52:38 +00:00
George Burgess IV
56f5f7b79b Fix a static-analyzer warning. 
frameworks/base/tools/aapt2/util/Files.cpp:81:21: warning: Null pointer
passed as an argument to a 'nonnull' parameter
     while ((entry = readdir(dir))) {

Bug: None.
Test: Warning no longer appears.
Change-Id: If242598405e995928378ce317a2e909654e1e985
 2016-10-13 15:52:34 -07:00
George Burgess IV
0c2774b16a Fix static-analyzer warning. 
frameworks/base/tools/aapt/Images.cpp:845:17: warning: Assigned value is
garbage or undefined
     row += bpp;

Bug: None.
Test: The warning is gone.
Change-Id: Idf4623d2510111a9188ed39922e109a8db225c76
 2016-10-13 15:51:04 -07:00
Sungsoo
f35358d876 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded am: d3f3729a17 am: 9d675aadf1 -s ours am: 3ab3eff7c1 am: 8d73b75c07 am: 790d332659 
am: 621d3bef8a

Change-Id: If80f808b31dc9d740d82109a9b8d17bcc2032fba
 2016-10-13 22:51:02 +00:00
Sungsoo
a123773c9c DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd am: 7598d6ac9f am: 30404396be am: d7475b491d -s ours am: 3069b72d76 
am: 1fa97872ec

Change-Id: Icd3b420b2a0821e621c5c471859fd8bce50c557f
 2016-10-13 22:49:46 +00:00
TreeHugger Robot
a6b3caf58e Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev 2016-10-13 22:47:30 +00:00
Sungsoo
1fa97872ec DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd am: 7598d6ac9f am: 30404396be am: d7475b491d -s ours 
am: 3069b72d76

Change-Id: If2814b43999d769e202447a5de4cff22af274b34
 2016-10-13 22:45:14 +00:00
Sungsoo
20b502a6b1 DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd am: 7598d6ac9f am: 30404396be am: d7475b491d -s ours 
am: 3069b72d76

Change-Id: I00f20cb01d07d6ef6ee76ebfa8e8ff6c34b0f7ee
 2016-10-13 22:45:05 +00:00
Sungsoo
3069b72d76 DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd am: 7598d6ac9f am: 30404396be 
am: d7475b491d  -s ours

Change-Id: I2b29c3d4e9675fcae86d4c9654d7e282fbc8c13d
 2016-10-13 22:40:33 +00:00
Sungsoo
621d3bef8a DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded am: d3f3729a17 am: 9d675aadf1 -s ours am: 3ab3eff7c1 am: 8d73b75c07 
am: 790d332659

Change-Id: I67639fbbcf420f9ab873225387f61254b53fcbca
 2016-10-13 22:40:27 +00:00
Sungsoo
3803f6903f DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 am: 7bb855a973 am: 68469a695e -s ours am: b4fdad2b8c am: 2dc905eb4d am: 4dabb1d8bb 
am: bdcd9b8a6d

Change-Id: Ifa785a9d5bd8e91812fe214a39b21294fe52bbac
 2016-10-13 22:39:43 +00:00
Sungsoo
772f71ca91 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours am: b576f816c5 am: db77b50424 am: 81fac8a618 
am: bf535cb5d9

Change-Id: I6f99206f7571493514aa9d7153925e6d44438dca
 2016-10-13 22:38:41 +00:00
Sungsoo
790d332659 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded am: d3f3729a17 am: 9d675aadf1 -s ours am: 3ab3eff7c1 
am: 8d73b75c07

Change-Id: I273132962ccfe12384787f2f5bb11dbab43aeee0
 2016-10-13 22:35:59 +00:00
Sungsoo
d7475b491d DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd am: 7598d6ac9f 
am: 30404396be

Change-Id: I31e6e3b5b6ab06e7c6025fb5be054a21d38c8477
 2016-10-13 22:35:56 +00:00
Sungsoo
bdcd9b8a6d DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 am: 7bb855a973 am: 68469a695e -s ours am: b4fdad2b8c am: 2dc905eb4d 
am: 4dabb1d8bb

Change-Id: I1c180bcfc9bdd8e09518f8ac33b371829657580a
 2016-10-13 22:33:57 +00:00
George Burgess IV
e8efec56f0 Fix static analyzer warnings. 
frameworks/base/libs/androidfw/ResourceTypes.cpp:742:46: warning: Result
of 'calloc' is converted to a pointer of type 'char16_t *', which is
incompatible with sizeof operand type 'char16_t **'
    mCache = (char16_t**)calloc(mHeader->stringCount,
        sizeof(char16_t**));

frameworks/base/libs/androidfw/ResourceTypes.cpp:4359:28: warning:
Potential leak of memory pointed to by 'set'
     return NO_MEMORY;

Bug: None
Test: Builds without the aforementioned warnings.
Change-Id: I1f84c1b9f4cba05f5cc7c3ae9fec1a07bc9cd8fe
 2016-10-13 15:32:33 -07:00
Sungsoo
8d73b75c07 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded am: d3f3729a17 am: 9d675aadf1 -s ours 
am: 3ab3eff7c1

Change-Id: I2f9a8960c77f3dfdb393c76f7d8d17647d617000
 2016-10-13 22:31:14 +00:00
Sungsoo
b25d26c40c DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded am: d3f3729a17 am: 9d675aadf1 -s ours 
am: 3ab3eff7c1

Change-Id: I6a4c376eb777e1efdf10444092d3a13145829a63
 2016-10-13 22:31:02 +00:00
Sungsoo
30404396be DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd 
am: 7598d6ac9f

Change-Id: I2402e57fc71128787e9b6895cb8f739b68703569
 2016-10-13 22:30:59 +00:00
Sungsoo
4dabb1d8bb DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 am: 7bb855a973 am: 68469a695e -s ours am: b4fdad2b8c 
am: 2dc905eb4d

Change-Id: I6703dc3e913257bfcccc48970744616dfac45871
 2016-10-13 22:29:29 +00:00
Sungsoo
bf535cb5d9 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours am: b576f816c5 am: db77b50424 
am: 81fac8a618

Change-Id: Id08e5d7ebfeabd632bcf5d19c97e82ad0031c16e
 2016-10-13 22:27:26 +00:00
Sungsoo
3ab3eff7c1 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded am: d3f3729a17 
am: 9d675aadf1  -s ours

Change-Id: Ie718673c80156edc6e205ba5e0e68ea785b1e20c
 2016-10-13 22:27:00 +00:00
Brad Ebinger
096d2829ed Add support for new SessionManager and EventManager tests 
Test: Ran new unit tests
Bug: 26571395
Change-Id: I6d14d7c05b8fdc8dc1319a81f0e41f7bcd989b85
 2016-10-13 15:26:58 -07:00
Sungsoo
7598d6ac9f DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours 
am: 279ebd7ffd

Change-Id: I7acd29458a3592cc7895521036d85950afba8e64
 2016-10-13 22:26:57 +00:00
Sungsoo
2dc905eb4d DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 am: 7bb855a973 am: 68469a695e -s ours 
am: b4fdad2b8c

Change-Id: Ic2dfe876cfa1fcf2f8b3480a6810eb4c54db8401
 2016-10-13 22:25:12 +00:00
Sungsoo
93b3e8e606 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 am: 7bb855a973 am: 68469a695e -s ours 
am: b4fdad2b8c

Change-Id: Id5aca99d2ebb1cd1dc10d490b6ed31c37377bbd0
 2016-10-13 22:24:57 +00:00
Sungsoo
81fac8a618 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours am: b576f816c5 
am: db77b50424

Change-Id: Id44780752d3feb22bfc3c10b35ffabcc601da1fa
 2016-10-13 22:22:59 +00:00
Sungsoo
279ebd7ffd DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 
am: 2179b54c9c  -s ours

Change-Id: I93f44a4deb665e4e5f8695fbc3b3e3a471260c28
 2016-10-13 22:22:53 +00:00
Sungsoo
9d675aadf1 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded 
am: d3f3729a17

Change-Id: I37bdd65d9b241234190f42b927ef4f1ba796490e
 2016-10-13 22:22:51 +00:00
Sungsoo Lim
73051d4cf3 Merge "ExifInterface: Provide backward compatibility" into nyc-dev am: e29077105e am: 9dd9c5a856 am: 5554e0ac16 
am: 19347eba88

Change-Id: Ie0bcf9d17172d804bf3c6912acceb933284ac99c
 2016-10-13 22:22:36 +00:00
Sungsoo
3fc6b8fd0f ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510 am: 36f64a2f0c 
am: b68d0855c4

Change-Id: I40df333d3b19911be333e5c466dfe01a3db4bd70
 2016-10-13 22:21:47 +00:00
Sungsoo
b4fdad2b8c DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 am: 7bb855a973 
am: 68469a695e  -s ours

Change-Id: I46494f3d01d4d3888c712d066a8a8658f7dd872d
 2016-10-13 22:20:35 +00:00
Sungsoo
db77b50424 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours 
am: b576f816c5

Change-Id: I8343fb9ee7f33ccbb6b9a0dfc143da95c18b6d08
 2016-10-13 22:18:44 +00:00
Sungsoo
2179b54c9c DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours 
am: a8d06257c1

Change-Id: I5f25f766a472bfddc32aa7ab7e506bc5e5d6854b
 2016-10-13 22:18:36 +00:00
Sungsoo
315b8b7bbc DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours 
am: b576f816c5

Change-Id: If2606f209804ec52155f6acb8e1d96f88ee2eb30
 2016-10-13 22:18:31 +00:00
Sungsoo
d3f3729a17 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f 
am: ad11872ded

Change-Id: Iaf3dd04a8ee9816d00aa932386adf0601ca43360
 2016-10-13 22:18:29 +00:00
Sungsoo
68469a695e DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 
am: 7bb855a973

Change-Id: I0a8abff7747224ab05012b908024bbfeda354f9c
 2016-10-13 22:16:57 +00:00
Sungsoo Lim
19347eba88 Merge "ExifInterface: Provide backward compatibility" into nyc-dev am: e29077105e am: 9dd9c5a856 
am: 5554e0ac16

Change-Id: Ie6b60e245d20b586ee4aeb4549d603c85d6457ee
 2016-10-13 22:13:01 +00:00
Sungsoo
b576f816c5 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc 
am: d6508621fc  -s ours

Change-Id: Ie77ff477549bbba05151fa3909ba5be26f91e05b
 2016-10-13 22:12:07 +00:00
Sungsoo
a8d06257c1 DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours 
am: 2a762996cb  -s ours

Change-Id: If32418debc774a2f78eae4cc2b3f5b77457bfa1c
 2016-10-13 22:12:03 +00:00
Sungsoo
7bb855a973 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 
am: 29273190f1

Change-Id: I8ebc69bc574bdeece4b3f79e36651dfb9965f7a2
 2016-10-13 22:11:59 +00:00
Sungsoo
ad11872ded DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours 
am: 03593fe78f

Change-Id: I4e8fb688d568354c7cd53efc170e7e0611862095
 2016-10-13 22:11:58 +00:00
Sungsoo
b68d0855c4 ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510 
am: 36f64a2f0c

Change-Id: Ibc82a2ddd80dff7d98880db0a179fbb1540ac6f8
 2016-10-13 22:11:58 +00:00
Sungsoo
d6508621fc DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca 
am: 016c5889bc

Change-Id: I03faa540856ba74aff431e287cecc5995b6037bd
 2016-10-13 22:07:20 +00:00
Sungsoo Lim
5554e0ac16 Merge "ExifInterface: Provide backward compatibility" into nyc-dev am: e29077105e 
am: 9dd9c5a856

Change-Id: I293992f615763762ee6d403a5548d873e4891271
 2016-10-13 22:06:46 +00:00
Sungsoo
29273190f1 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours 
am: 8b764f10c3

Change-Id: I8bfb9d9be23485f02d808df21c6ddfaed6d0d2b2
 2016-10-13 22:06:09 +00:00
Sungsoo
2a762996cb DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd 
am: 68aa33b9bf  -s ours

Change-Id: I7fe3d5dbcb7bd206233ce969840f5ed182913dd6
 2016-10-13 22:06:03 +00:00
Sungsoo
36f64a2f0c ExifInterface: Provide backward compatibility am: 2dbe166801 
am: bc813cd510

Change-Id: I0aa6d33baeec8dd991561d964bfce16915c0553d
 2016-10-13 22:06:01 +00:00
Sungsoo
03593fe78f DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 
am: 2816a5fa5e  -s ours

Change-Id: I51df5f3d8e79c31f6c299fdbeec3fbfb9d9a300e
 2016-10-13 22:06:00 +00:00