Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,086 Commits 3 Branches 0 Tags
6df90df83c80c89be7bcde2d7b130de22caef930
Commit Graph

251086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sungsoo Lim
6df90df83c Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev 
am: c60f995ae9

Change-Id: I91f906df707b351e082ba5444208ef24fb076534
 2016-09-09 22:46:53 +00:00
Sungsoo
9a420bb0f6 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change 
am: 56ea7b4901

Change-Id: Iebcfced541a569bd441f45ff126075c2e87401c9
 2016-09-09 22:46:46 +00:00
Sungsoo Lim
c60f995ae9 Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev 2016-09-09 22:39:22 +00:00
Fyodor Kupolov
05918fd123 Merge "Fixed a bug with incorrect handling of onUnlockUser" into nyc-dr1-dev 2016-09-09 21:36:03 +00:00
Vladislav Kaznacheev
b0666c61b1 Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev 
am: 148ccbb082

Change-Id: I0933f7f9f2180462b173fc2ca0ef23bfe464b1b5
 2016-09-09 18:42:42 +00:00
Vladislav Kaznacheev
fa05df640f Update JavaDoc for DragEvent.getLocalState 
am: 048f3bfaf0

Change-Id: I72bec54ac999ebce5779062ddc5effd1bb4d61ce
 2016-09-09 18:42:34 +00:00
TreeHugger Robot
148ccbb082 Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev 2016-09-09 18:34:59 +00:00
Fyodor Kupolov
0f57cce644 Fixed a bug with incorrect handling of onUnlockUser 
userId should be passed as arg1 instead of obj.

Bug: 31321500
Change-Id: I11e8c146d83773c73ec6bb5f5cfac566759b7bcc
 2016-09-09 10:36:30 -07:00
Narayan Kamath
2e8b25701a Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc am: e9295560cf 
am: 19ebec6d36

Change-Id: Idf28988f014023f04bda3d3ce77a37fc26863469
 2016-09-09 10:52:43 +00:00
Narayan Kamath
19ebec6d36 Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc 
am: e9295560cf

Change-Id: Ib64b8f7e777a5779ef7b057cb55bf1b8148e2fa5
 2016-09-09 10:44:54 +00:00
Narayan Kamath
d1697846ba Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 am: 8f0cc3dd13 am: 8cb6b9335c am: eb972e5d9d 
am: 7aba7234e1

Change-Id: I8c33caec1a869caa4ea3d1b7e2cfcb3a9a6787ea
 2016-09-09 10:44:45 +00:00
Narayan Kamath
7aba7234e1 Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 am: 8f0cc3dd13 am: 8cb6b9335c 
am: eb972e5d9d

Change-Id: I8030e2b745fe08b238fd9da5b518729fda05174e
 2016-09-09 10:39:40 +00:00
Narayan Kamath
e9295560cf Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 
am: bd6a29cddc

Change-Id: I78f74e5d3f0e0b82afe4d5f48f2541a881189aa1
 2016-09-09 10:39:29 +00:00
Narayan Kamath
eb972e5d9d Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 am: 8f0cc3dd13 
am: 8cb6b9335c

Change-Id: If2f8fbef801cd61834ac50a7e1a254ed21b95cc2
 2016-09-09 10:33:43 +00:00
Narayan Kamath
bd6a29cddc Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e 
am: 24ffc9ab47

Change-Id: I78adbdbbf8ffddfee3cd8b1407415cdf3a4d1b1f
 2016-09-09 10:33:40 +00:00
Narayan Kamath
24ffc9ab47 Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b 
am: e59073096e

Change-Id: Ifb7972c30d70a0fbc4ffdae100aac2d77ca445ca
 2016-09-09 10:28:52 +00:00
Narayan Kamath
8cb6b9335c Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 
am: 8f0cc3dd13

Change-Id: Ida08d48da51f9f49dc70a916fa379cf89a4d33c0
 2016-09-09 10:28:46 +00:00
Narayan Kamath
8f0cc3dd13 Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours 
am: 646ee94421

Change-Id: I62f6556e630707274daa4ee0a4a57c77f5329bbc
 2016-09-09 10:21:48 +00:00
Narayan Kamath
e59073096e Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev 
am: 00e808b06b

Change-Id: I14939b5bf04ba47229e663b2ffc50543c5c6bc9a
 2016-09-09 10:18:19 +00:00
Narayan Kamath
646ee94421 Backport changes to whitelist sockets opened by the zygote. 
am: 82c6e6267e  -s ours

Change-Id: Ib35b2567f19aff39d285794951cf9b8cb8d74ef1
 2016-09-09 10:15:11 +00:00
Narayan Kamath
00e808b06b Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev 2016-09-09 10:05:46 +00:00
Cheryl Potter
300f7438d8 Merge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev 
am: 8a7947b0d6

Change-Id: I98277a55a0699b995bd71b93bcc68e914b14a576
 2016-09-09 01:24:04 +00:00
Cheryl Potter
6b82489573 docs: Define card data for GPU Debugger b/31318053 
am: 9af802df0f

Change-Id: Iccbf477340c50283660c0eed32decd4587e56154
 2016-09-09 01:23:57 +00:00
Cheryl Potter
8a7947b0d6 Merge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev 2016-09-09 01:15:54 +00:00
Vladislav Kaznacheev
048f3bfaf0 Update JavaDoc for DragEvent.getLocalState 
Explicitly state that "local state" is local to the window
which has started the drag operation.

Bug: 31372686
Change-Id: Idbea7586c4e74097362067fa90390b97744181bb
 2016-09-08 16:37:23 -07:00
Andrew Solovay
6cff52dbae Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev 
am: de40f9d677

Change-Id: Ib6be573fb963eda1d032c55eb9da4878d7374533
 2016-09-08 17:43:45 +00:00
Andrew Solovay
37b32a5d31 docs: Fixing links to moved Fragments guide, + redirect 
am: f53968061c

Change-Id: Ic29b29244d2919bcd5eb5b72daeaa8a78dc71e2d
 2016-09-08 17:43:40 +00:00
Andrew Solovay
de40f9d677 Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev 2016-09-08 17:36:49 +00:00
Narayan Kamath
f04f3892fb Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a am: 177ee386b9 
am: b126d7c7c5

Change-Id: Ibd4f7188bf500886e53d4b714e5c7de1ad5b10c0
 2016-09-08 09:16:24 +00:00
Narayan Kamath
b126d7c7c5 Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a 
am: 177ee386b9

Change-Id: Ic7a1d8c1ba996024b02915e431f2b7aacc306225
 2016-09-08 09:05:08 +00:00
Narayan Kamath
7f78990260 Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours am: 6fa8339792 am: c6ced086d1 am: 4474da7b7c 
am: 5556367bc1

Change-Id: I5db1d9538c274cf6d5e9a001ba7d38056f3928eb
 2016-09-08 08:57:48 +00:00
Narayan Kamath
c83ca7267a Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520 
am: 45d7b8dd2a

Change-Id: I66a02ec7bac220d515fc623dbcd0688b72db37fb
 2016-09-08 08:57:46 +00:00
Narayan Kamath
beade90fe3 Backport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992fdb0 am: 67c4adb5c1 -s ours 
am: bf16d345a6

Change-Id: Iedb9a7c7428cd8a5dc5aabaf9f1f88d96c8f022a
 2016-09-08 08:49:59 +00:00
Narayan Kamath
5556367bc1 Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours am: 6fa8339792 am: c6ced086d1 
am: 4474da7b7c

Change-Id: Ie14b0e7887bd2da5c986b077f4563bbc306c88be
 2016-09-08 08:48:39 +00:00
Narayan Kamath
45d7b8dd2a Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 
am: 7a0c7ab520

Change-Id: I0ed385ab13ca461c1b77226d3be3cf788a09d3d6
 2016-09-08 08:48:31 +00:00
Narayan Kamath
177ee386b9 Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 
am: 71e6a6f12a

Change-Id: Ib162897a1428ab8c025a414eb0a3872327274f7a
 2016-09-08 08:45:47 +00:00
Narayan Kamath
bf16d345a6 Backport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992fdb0 
am: 67c4adb5c1  -s ours

Change-Id: I2af50f6d32be035f491df4a0b83489ba7da186e7
 2016-09-08 08:44:31 +00:00
Narayan Kamath
71e6a6f12a Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 
am: 447d3798f1

Change-Id: I323c669ed44e10f9e3a91271f47800754da5d389
 2016-09-08 08:40:03 +00:00
Narayan Kamath
4474da7b7c Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours am: 6fa8339792 
am: c6ced086d1

Change-Id: Ie3699efd33fe53acfd0dff64cbb18e4792a65bf3
 2016-09-08 08:39:07 +00:00
Narayan Kamath
7a0c7ab520 Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 
am: 47b88a15f6

Change-Id: Id267e22508824d569f54068291304584b3343b9a
 2016-09-08 08:35:04 +00:00
Narayan Kamath
67c4adb5c1 Backport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 
am: 49d992fdb0

Change-Id: I0560d831235bd7ba3ea764b23e64b4e08110d7e5
 2016-09-08 08:34:58 +00:00
Narayan Kamath
c6ced086d1 Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours 
am: 6fa8339792

Change-Id: Id7ad55a251a26782815005218dc186b53e74cfca
 2016-09-08 08:33:40 +00:00
Narayan Kamath
447d3798f1 Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev 
am: 014016cf32

Change-Id: Ic0cf8b5cc2accaad552b82eaadce359e21e5e624
 2016-09-08 08:30:41 +00:00
Narayan Kamath
47b88a15f6 Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev 
am: 459810b9b7

Change-Id: I867a7c97c8363ede1b04e4ea8a75045d36d9d58d
 2016-09-08 08:24:54 +00:00
Narayan Kamath
49d992fdb0 Backport changes to whitelist sockets opened by the zygote. 
am: 41ca1bce01

Change-Id: Id08676457fa3fa022d607e5de754f49b9c396261
 2016-09-08 08:24:47 +00:00
Narayan Kamath
6fa8339792 Backport changes to whitelist sockets opened by the zygote. 
am: 0f6a0e1560  -s ours

Change-Id: I2cdd131b750b4d04672149dcf7a90d2d566dd621
 2016-09-08 08:23:49 +00:00
Narayan Kamath
459810b9b7 Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev 2016-09-08 08:20:58 +00:00
Narayan Kamath
014016cf32 Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev 2016-09-08 08:12:20 +00:00
Sungsoo
56ea7b4901 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change 
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.

Bug: 30936376
Change-Id: I115a42601c774062485974042464abb0d65c35e9
(cherry picked from commit a8f9a075b1)
 2016-09-08 08:01:13 +00:00
Narayan Kamath
d18881d4f8 Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev 
am: 15ab539368

Change-Id: I88c0fde563218de25fb0fa9a6bd29abf0df44212
 2016-09-08 07:47:24 +00:00