Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
1ed0010f95 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: I1a22c2863405a477628807c835ef618a83519def
 2016-09-08 09:16:14 +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
7b5514fd2b Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours am: 6fa8339792 am: c6ced086d1 am: 4474da7b7c 
am: 5556367bc1

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

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

Change-Id: I5ca638d1b740f08841cbfe9b2da4ae697009ab8e
 2016-09-08 08:49:39 +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
Sungsoo
2ee53c82cc 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: I915f56b00ec9422b53591ac5534e070a1d6798e6
 2016-09-08 07:57:56 +00:00
Narayan Kamath
4407f375a0 Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev 
am: 15ab539368

Change-Id: I38d078326cae81c96e240b8a6c03f4a1289e94ea
 2016-09-08 07:47:20 +00:00
Narayan Kamath
94e09df49b Backport changes to whitelist sockets opened by the zygote. 
am: a1252ccbdb

Change-Id: I9f784675eae1aa7879848d397bb03226012e3d26
 2016-09-08 07:41:43 +00:00
Narayan Kamath
15ab539368 Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev 2016-09-08 07:30:46 +00:00
Sungsoo
659275dc30 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: I915f56b00ec9422b53591ac5534e070a1d6798e6
 2016-09-08 07:11:04 +00:00
Sungsoo
aebe2347a7 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: I915f56b00ec9422b53591ac5534e070a1d6798e6
 2016-09-08 07:10:26 +00:00
Sungsoo
1bdd10a953 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: I915f56b00ec9422b53591ac5534e070a1d6798e6
 2016-09-08 16:04:44 +09:00
liulvping
bf76ee74c7 fix NullPointerException in RegisteredServicesCache 
https://code.google.com/p/android/issues/detail?id=221932

Change-Id: I67c0b799d10f4b9c8fa0779069d23cc49916b395
Signed-off-by: liulvping <liulvping@xiaomi.com>
 2016-09-08 01:20:34 +00:00
Andrew Solovay
31dc8fdccf Merge "docs: Added item to Support Library revision history" into nyc-dev 
am: bdbed7857b

Change-Id: I7779d2bf4a1677330debd37740bcfba8b85b1b90
 2016-09-07 23:53:26 +00:00
Andrew Solovay
ea55012efd docs: Added item to Support Library revision history 
am: 89e77eb55c

Change-Id: I0dc851f894ea806de74029a117760c7f49013052
 2016-09-07 23:53:12 +00:00
Scott Main
a4afe006b1 Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev 
am: 9635756473

Change-Id: I23b309642a1c7585031ea2853fa7e99bddffb83a
 2016-09-07 23:46:09 +00:00
smain@google.com
4c3f1ada4f revisions to the Building Your First app class with feedback from mpawlan (thank you!) 
am: 14f51a724e

Change-Id: Ia4f3094843947f7e0b92bb4430265ff884a05a9c
 2016-09-07 23:46:05 +00:00
TreeHugger Robot
bdbed7857b Merge "docs: Added item to Support Library revision history" into nyc-dev 2016-09-07 23:45:39 +00:00
Scott Main
9635756473 Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev 2016-09-07 23:39:52 +00:00
Mark Lu
9bf1f1e766 Merge "docs: fix grammar mistake in TextureView" into nyc-dev 
am: 2b05f12911

Change-Id: I4317e54d15d3c0125f83a9d6b4e28f40823f15b0
 2016-09-07 23:29:37 +00:00
Mark Lu
4ff96480b3 docs: fix grammar mistake in TextureView 
am: e8691d19cb

Change-Id: I06b70cf94595bbb1b3903b1d17d201ac86f169a0
 2016-09-07 23:29:26 +00:00
Mark Lu
2b05f12911 Merge "docs: fix grammar mistake in TextureView" into nyc-dev 2016-09-07 23:24:11 +00:00
Andrew Solovay
f53968061c docs: Fixing links to moved Fragments guide, + redirect 
The Fragments API guide was moved, but apparently a redirect was
never set up. Also, there are a few links to the old location in
the Javadocs.

Staged the revised Javadocs (see first comment for stage location).
Not going to stage the redirects file since it would trash another,
bigger CL that deals with the redirects file, but it's pretty
straightforward.

bug: 30559011
Change-Id: Ibd65f85c1ebb9789c1d40614fe11fe4ffda97e58
 2016-09-07 15:42:35 -07:00
Robin Lee
3485e31072 Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev 
am: fb2cdce7c2

Change-Id: Ib97afbd6e74bc4b35cd6a5014815c3f801078413
 2016-09-07 22:15:27 +00:00
Robin Lee
2450fb3d59 DO NOT MERGE Stop work challenge freeform bypass 
am: 0737c2b4c2

Change-Id: Ib613296306978c0bfbf1ea6e1dcdb7a72b867a55
 2016-09-07 22:15:22 +00:00
TreeHugger Robot
fb2cdce7c2 Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev 2016-09-07 22:07:21 +00:00
Andrew Solovay
89e77eb55c docs: Added item to Support Library revision history 
See first comment for doc stage location.

bug: 30622244
Change-Id: I7cfdf2107d57d72565bcc4cc503242741f2452ff
 2016-09-07 15:00:33 -07:00
Roshan Pius
4898225abc Merge "WifiManager: Remove unused methods" am: efb7bec56a 
am: 718c90daf1

Change-Id: I8f2ead6f404dd3bdb1106d22f2fde756daef4cc8
 2016-09-07 21:57:25 +00:00
Roshan Pius
718c90daf1 Merge "WifiManager: Remove unused methods" 
am: efb7bec56a

Change-Id: I68d2ee571f04136a7c4babbdfa097d5449cc5ac3
 2016-09-07 21:51:18 +00:00
Treehugger Robot
efb7bec56a Merge "WifiManager: Remove unused methods" 2016-09-07 21:43:20 +00:00
smain@google.com
14f51a724e revisions to the Building Your First app class with feedback from mpawlan (thank you!) 
stage: https://android-dot-devsite.googleplex.com/training/basics/firstapp/creating-project.html

Change-Id: I40ce201553226fa36477e54b82721bc6cc85b88b
 2016-09-07 21:09:27 +00:00
Alan Viverette
8bb074c737 Merge "Support library 24.2.0 API diff" into nyc-dev 
am: 9d25bf73a4

Change-Id: I52810f4fc94086fd23b00bd381c82c71ee5fbfd7
 2016-09-07 20:58:34 +00:00
Alan Viverette
f1a9168e91 Support library 24.2.0 API diff 
am: ae3fecc1a9

Change-Id: Id53c9b41740e22ee7d14f6d037de63b000a7baff
 2016-09-07 20:58:27 +00:00
Alan Viverette
9d25bf73a4 Merge "Support library 24.2.0 API diff" into nyc-dev 2016-09-07 20:54:07 +00:00