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

251054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Narayan Kamath
abd5b05190 Backport changes to whitelist sockets opened by the zygote. 
am: a1252ccbdb

Change-Id: Idd41ba2068102de067a66080da0563cf75b1e433
 2016-09-08 07:41:44 +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
Andrew Solovay
139ded758a Merge "docs: Added item to Support Library revision history" into nyc-dev 
am: bdbed7857b

Change-Id: I9f7fe6847bb36d197174869ba6224d3db1581c0e
 2016-09-08 00:04:52 +00:00
Andrew Solovay
e63f82734e docs: Added item to Support Library revision history 
am: 89e77eb55c

Change-Id: Ia649f9e8f28697014153a2f29762426303292aa2
 2016-09-08 00:04:48 +00:00
Scott Main
16fe510e03 Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev 
am: 9635756473

Change-Id: Ieae6cd0439d75e8858a16b44393fd248ddffcaa3
 2016-09-07 23:51:47 +00:00
smain@google.com
78622206ce revisions to the Building Your First app class with feedback from mpawlan (thank you!) 
am: 14f51a724e

Change-Id: I1a0d719e4aac12155cf0889069b8efd10084fe67
 2016-09-07 23:51:44 +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
4e61df6258 Merge "docs: fix grammar mistake in TextureView" into nyc-dev 
am: 2b05f12911

Change-Id: Ia4944106365d6c6c85b3cf2dc47250b160a5424b
 2016-09-07 23:29:27 +00:00
Mark Lu
c657eed270 docs: fix grammar mistake in TextureView 
am: e8691d19cb

Change-Id: I857deef5cf08c9cdaf0d6e8e99449e688bec5ba5
 2016-09-07 23:29:20 +00:00
Mark Lu
2b05f12911 Merge "docs: fix grammar mistake in TextureView" into nyc-dev 2016-09-07 23:24:11 +00:00
Robin Lee
a28de3b8c5 Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev 
am: fb2cdce7c2

Change-Id: I50be838e9f0f9e794389f6d24a5e699d7f163caf
 2016-09-07 22:15:30 +00:00
Robin Lee
ec5ceae174 DO NOT MERGE Stop work challenge freeform bypass 
am: 0737c2b4c2

Change-Id: Ia76391f710e42e9634010bd211a0370230b318e3
 2016-09-07 22:15:28 +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
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
75136ac15b Merge "Support library 24.2.0 API diff" into nyc-dev 
am: 9d25bf73a4

Change-Id: I0f691281d86562c96ed0768efb69d6df77d29456
 2016-09-07 20:59:53 +00:00
Alan Viverette
56477c1fcb Support library 24.2.0 API diff 
am: ae3fecc1a9

Change-Id: Ie9a007ad44ae0293ef4c4138888da0e78d61b322
 2016-09-07 20:59:49 +00:00
Alan Viverette
9d25bf73a4 Merge "Support library 24.2.0 API diff" into nyc-dev 2016-09-07 20:54:07 +00:00
Narayan Kamath
a2112ae2a0 Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc -s ours am: 9802fcfa2b am: 2acf9f7e3c am: 36b90a1934 am: 5febcdd210 am: ebcc7aeda9 
am: f52b30cf8d

Change-Id: I99751b55fb10e0fcd2703d59d8925744a73bcfd0
 2016-09-07 20:36:47 +00:00
Narayan Kamath
f52b30cf8d Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc -s ours am: 9802fcfa2b am: 2acf9f7e3c am: 36b90a1934 am: 5febcdd210 
am: ebcc7aeda9

Change-Id: Ie2e2292bbb8c6d274109d64f7dd3ed00fca0ba0f
 2016-09-07 20:32:17 +00:00
Andrew Solovay
733e368097 Merge "docs: Fixing redirect file" into nyc-dev 
am: 33831c02b5

Change-Id: I22a2c26b77c0ce27499ee1a9ba3567e6c337cf02
 2016-09-07 20:25:45 +00:00
Andrew Solovay
7771476630 docs: Fixing redirect file 
am: 5bf2ea6670

Change-Id: I8d1ea69862b543eb13c96398d967979e2040914a
 2016-09-07 20:25:43 +00:00
Narayan Kamath
ebcc7aeda9 Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc -s ours am: 9802fcfa2b am: 2acf9f7e3c am: 36b90a1934 
am: 5febcdd210

Change-Id: Ib7e40acc4682e4198dcaab78c57de02acfe89c94
 2016-09-07 20:23:28 +00:00
TreeHugger Robot
33831c02b5 Merge "docs: Fixing redirect file" into nyc-dev 2016-09-07 20:19:09 +00:00
Narayan Kamath
5febcdd210 Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc -s ours am: 9802fcfa2b am: 2acf9f7e3c 
am: 36b90a1934

Change-Id: Iec55904ecb004d3bf89bf3a065e5811afae798d6
 2016-09-07 20:17:02 +00:00
Narayan Kamath
36b90a1934 Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc -s ours am: 9802fcfa2b 
am: 2acf9f7e3c

Change-Id: Ideae7875e299ec0292054aad85fe8aa92b6aba9b
 2016-09-07 20:12:43 +00:00
Narayan Kamath
2acf9f7e3c Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc -s ours 
am: 9802fcfa2b

Change-Id: Iabeefa7d07d78002c124ce62dc210111b83a99b7
 2016-09-07 20:07:58 +00:00
Narayan Kamath
9802fcfa2b Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 
am: 9a409265fc  -s ours

Change-Id: Idf4dcc5ab7e8b0510848cbd2f220fe7a8e4b3e04
 2016-09-07 20:01:56 +00:00