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

253771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cheryl Potter
4b22c41133 Merge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev 
am: 8a7947b0d6

Change-Id: Ief968a883a43b6f522c93560c9bd3580b781ae97
 2016-09-09 01:24:21 +00:00
Cheryl Potter
ea9e6f3da9 docs: Define card data for GPU Debugger b/31318053 
am: 9af802df0f

Change-Id: I54d88853da89bcaf5a1ea34cfaa80a7c34dd2776
 2016-09-09 01:24:10 +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
Andrew Solovay
14aae3f1b3 Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev 
am: de40f9d677

Change-Id: I2437311c5789f478ab847e8139d3b60ecdfa541f
 2016-09-08 17:43:40 +00:00
Andrew Solovay
1b1bef9fc8 docs: Fixing links to moved Fragments guide, + redirect 
am: f53968061c

Change-Id: I1aaf11fd83e4489f3a22df600e7edeb487749cf0
 2016-09-08 17:43:32 +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
Tobias Thierer
8cdc25b4b3 Merge "Add Base64 from OpenJDK 8u60" am: 63a07e80d6 
am: 24bd141ce0

Change-Id: I15b2aaaf8d6791d4a561fa935c7ab960ac22c4d8
 2016-09-08 13:26:11 +00:00
Tobias Thierer
24bd141ce0 Merge "Add Base64 from OpenJDK 8u60" 
am: 63a07e80d6

Change-Id: Ia7fd23891c93093003804adb48e9f584d225be7c
 2016-09-08 13:21:07 +00:00
Tobias Thierer
63a07e80d6 Merge "Add Base64 from OpenJDK 8u60" 2016-09-08 13:10:15 +00:00
Sergio Giro
fc0ee229bb Merge "java.security.Provider: port to jdk8u60 (second part)" am: 8445702920 
am: 81749ef47f

Change-Id: I6c3b6601f061ee644a9cbcc3f1bb2b8aefcd103d
 2016-09-08 12:32:42 +00:00
Paul Duffin
4f107811e2 Merge "Fix SuppressWarnings typo." am: 0bd7c54745 
am: a155f43794

Change-Id: If228867926149f7cad9b5a479beefc45cacfe7f2
 2016-09-08 12:32:31 +00:00
Sergio Giro
81749ef47f Merge "java.security.Provider: port to jdk8u60 (second part)" 
am: 8445702920

Change-Id: I54c53518876f9480b5ef13c4a730f700867b9057
 2016-09-08 12:27:35 +00:00
Paul Duffin
a155f43794 Merge "Fix SuppressWarnings typo." 
am: 0bd7c54745

Change-Id: I43a9bea860188f55292dcbeac38bf026d87fa634
 2016-09-08 12:27:27 +00:00
Sergio Giro
8445702920 Merge "java.security.Provider: port to jdk8u60 (second part)" 2016-09-08 12:18:43 +00:00
Paul Duffin
0bd7c54745 Merge "Fix SuppressWarnings typo." 2016-09-08 12:17:05 +00:00
Ian Rogers
e09ac05b35 Fix SuppressWarnings typo. 
As Error Prone states:
Suppressing "deprecated" is probably a typo for "deprecation"
Bug: 27723540

(cherry picked from commit a7f834f1ce)

Change-Id: I0c6a9fc0a160769955cccf97ec7decb1f2b9b8fb
 2016-09-08 13:11:37 +01:00
Yi Kong
541b91fe64 Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f" am: 3bc37e9cf7 
am: b2d6acaa2b

Change-Id: I756b0c2366737f22447ead5f26435ffb4b0425cb
 2016-09-08 10:12:54 +00:00
Yi Kong
b2d6acaa2b Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f" 
am: 3bc37e9cf7

Change-Id: Ia12afe847d012cbc55e5b043074e4e6c7864a52c
 2016-09-08 10:07:06 +00:00
Yi Kong
3bc37e9cf7 Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f" 2016-09-08 09:59:54 +00:00
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
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
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