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

13435 Commits

Author SHA1 Message Date
Tobias Thierer
900471ab11 Revert "Revert "Track libcore update of Map classes to jdk8u60"" 
am: 7f5095ddfe

Change-Id: I815b5c9b5620fb1fc9f18dd6b0bb0d185c114410
 2016-08-17 17:54:08 +00:00
Tobias Thierer
7f5095ddfe Revert "Revert "Track libcore update of Map classes to jdk8u60"" 
Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.

This reverts commit 7783213611.

Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
 2016-08-17 17:11:01 +00:00
Tobias Thierer
8fc0ac9b39 Merge "Track libcore update of Map classes to jdk8u60." am: ec6a323da2 
am: 17fea8b967

Change-Id: I2b6df8da3c87ec2232b60380cd91c0b4aab7025b
 2016-08-17 17:03:44 +00:00
Tobias Thierer
17fea8b967 Merge "Track libcore update of Map classes to jdk8u60." 
am: ec6a323da2

Change-Id: I6af9d2929d07cc60be8485de344d335c1bf5cf33
 2016-08-17 16:54:30 +00:00
Tobias Thierer
5efe2b7515 Revert "Track libcore update of Map classes to jdk8u60" 
am: 7783213611

Change-Id: I10e2130939778adf5fb51fc89404bfb9fc82ce0f
 2016-08-17 16:54:08 +00:00
Tobias Thierer
eb4eeb5323 Track libcore update of Map classes to jdk8u60 
am: fb2ade3dca

Change-Id: I4ddb3bc3c7428467f8bde073e3ebc7e6b04d899c
 2016-08-17 16:54:05 +00:00
Tobias Thierer
7783213611 Revert "Track libcore update of Map classes to jdk8u60" 
May have broken stage-aosp-master since the CL from aosp-master was for
some reason only merged to mirror-aosp-master but no further.

Bug: 30911913

This reverts commit fb2ade3dca.

Change-Id: I696d2b0636708fc6c73a53cd3cae36fa5bd0f173
 2016-08-17 14:59:28 +00:00
Tobias Thierer
fb2ade3dca Track libcore update of Map classes to jdk8u60 
This adds the api/test-current.txt changes corresponding to
http://r.android.com/238640

This CL requires base CLs, which will get merged from aosp-master,
in order to build.

Change-Id: I0aa2e9c4c7b3b6af79c9885e7e0fdde8880e71c8
 2016-08-17 11:06:27 +01:00
Tobias Thierer
9d332f2dc8 Track libcore update of Map classes to jdk8u60. 
Note that these additions are simply artifacts of the API generation
processes. These map methods were previously implemented by superclasses.

Test: make update-api

Change-Id: Ib03ca6afb438f2d7597abd0794cdebed2083bc17
 2016-08-16 14:16:41 +01:00
Jakub Pawlowski
747711ce9b Add LE Secure Connection data parsing (1/4) 
Bug: 30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
 2016-08-11 22:18:19 +00:00
Yi Kong
d5e8edfe1d Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7 
am: 19df48b93b

Change-Id: I7fba48c95191b4a53acff70e89d59e30d3eb8e90
 2016-08-09 18:07:29 +00:00
Yi Kong
19df48b93b Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7 
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
(cherry picked from commit f646aa14cd)
 2016-08-09 18:57:16 +01:00
Yi Kong
f646aa14cd Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7 
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
 2016-08-09 16:43:32 +00:00
Tobias Thierer
22aa35d510 Merge "APIs for ProcessBuilder.Redirect" am: e49469aed1 
am: c548ff23bd

Change-Id: I97d741f344ee59e8f493f0ac8d0b41a63adc9c14
 2016-08-05 12:51:50 +00:00
Tobias Thierer
c548ff23bd Merge "APIs for ProcessBuilder.Redirect" 
am: e49469aed1

Change-Id: I6c479a84044cfd8df084a3c9707f7aaaf09546fa
 2016-08-05 12:44:48 +00:00
Tobias Thierer
95b759e178 Update api/test-current.txt for ProcessBuilder API 
am: 6af44aeea0

Change-Id: I0009f3d758af696aca14851f53459c6a332beb47
 2016-08-05 12:44:35 +00:00
Tobias Thierer
6af44aeea0 Update api/test-current.txt for ProcessBuilder API 
Test: make update-api docs

Bug: 27464570
Change-Id: Iee1fec0efb241ba091494467ab3632675c1d07d4
 2016-08-05 12:37:21 +00:00
Tobias Thierer
e49469aed1 Merge "APIs for ProcessBuilder.Redirect" 2016-08-05 12:36:35 +00:00
Przemyslaw Szczepaniak
7116e5d2d3 Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82 
am: 49929ccf46

Change-Id: Ie9d2d41124395588fa58dc0f97447a9e77094609
 2016-08-05 10:32:39 +00:00
Przemyslaw Szczepaniak
c57b96bf11 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" am: 50f3429d14 
am: 622e170338

Change-Id: Ia1fde043f68030d5676c39f9eda632061ef09eab
 2016-08-05 09:51:59 +00:00
Przemyslaw Szczepaniak
622e170338 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" 
am: 50f3429d14

Change-Id: I2fdd89afd9cfc0cc36be2664dee559e7b0977c6d
 2016-08-05 09:44:55 +00:00
Przemyslaw Szczepaniak
50f3429d14 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" 2016-08-05 09:36:41 +00:00
Przemyslaw Szczepaniak
49929ccf46 Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82 
Version with test-current.txt

Bug: 28666126
Change-Id: I3677508ff00c381c88fe9c767ec7037493b574f8
 2016-08-05 09:33:51 +00:00
Przemyslaw Szczepaniak
c7788d528c Missing test-current.txt for libcore change ea47d5d712edcaef726a3e12065729be21699afe 
am: 82957239fe

Change-Id: Ic29f6cd27e4f84dc5afb49360ffd2235ab25aa71
 2016-08-04 12:08:22 +00:00
Przemyslaw Szczepaniak
82957239fe Missing test-current.txt for libcore change ea47d5d712edcaef726a3e12065729be21699afe 
Change-Id: I691a53f92bc1cfe0a9c6d5ad9d7d3d259ce0aabb
Test: make -j 32 update-api
Bug: 30402085
 2016-08-04 11:56:09 +00:00
Tobias Thierer
c150ad3357 Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" am: f1d119ccd3 
am: 97b24c2f6a

Change-Id: I33dad5406389705ca2daa9baa75c1c7b42df046e
 2016-08-04 11:06:54 +00:00
Tobias Thierer
97b24c2f6a Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" 
am: f1d119ccd3

Change-Id: I90e74c457475f16edd20369bb8c024896c9e241c
 2016-08-04 11:00:03 +00:00
Tobias Thierer
4122b913f3 Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value) 
Test: "make" succeeds.

Bug: 30402085
Change-Id: I4bc4b5dcfab04ac756578c2fae7a337e74587b66
 2016-08-03 18:16:14 +01:00
Przemyslaw Szczepaniak
bc7820ec76 Track libcore change 0e393b4d628541e84e31210342f4103315c07e23 
Bug: 28666126
Change-Id: Ib63e14c5c72fd3a13f09a90358cb137e318a3653
 2016-08-02 12:01:07 +00:00
Sergio Giro
ea917e5206 api: destroy() and isDestroyed() methods are now default in Destroyable 
am: 8261d1e042

Change-Id: I0f377bfb1f091e642091859fbb045ccfe63ba0e5
 2016-07-27 12:20:12 +00:00
Sergio Giro
8261d1e042 api: destroy() and isDestroyed() methods are now default in Destroyable 
Change-Id: Ia5afcec8b627794bba7c69ca6245330b60aef5e9
Test: make droid docs and check-ojluni-files
Bug: 29631070
 2016-07-27 12:12:06 +00:00
Sergio Giro
9ab5255ebb Merge \\"api: destroy() and isDestroyed() methods are now default in Destroyable\\" am: 877d6e75e6 
am: 91e11c95f2

Change-Id: Ib7472ea12d6c59ec6ca36d0c17d63ab5d5193b77
 2016-07-27 11:46:25 +00:00
Sergio Giro
91e11c95f2 Merge \"api: destroy() and isDestroyed() methods are now default in Destroyable\" 
am: 877d6e75e6

Change-Id: I6ff9e93c43d5f9464ab29604b3aa5f93132ed74b
 2016-07-27 11:39:10 +00:00
Sergio Giro
877d6e75e6 Merge "api: destroy() and isDestroyed() methods are now default in Destroyable" 2016-07-27 11:30:55 +00:00
Tobias Thierer
5296a60e27 APIs for ProcessBuilder.Redirect 
This CL is required for the following libcore change:
Revert "Hide ProcessBuilder.Redirect and associated APIs."

Test: Checked that 'make' succeeds.

Bug: 27464570
Change-Id: I7719ab495863d3fc8cdd00fbe19ac40a37b5a6f2
 2016-07-26 15:30:44 +01:00
Shubham Ajmera
1487d5f409 Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a 
am: a0d7917c36

Change-Id: I728386e4a8a2c97c5cc8e2d3c1cac46c046057db
 2016-07-11 10:16:20 +00:00
Shubham Ajmera
18941cb53f Merge "Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a" 2016-07-11 10:08:40 +00:00
Shubham Ajmera
a0d7917c36 Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a 
(cherry-picked from commit 30cbe3b264)

Change-Id: I1264733705d58243e0ff4d001f3802ad48de0b09
 2016-07-11 10:06:11 +00:00
Sergio Giro
9e51eed091 api: destroy() and isDestroyed() methods are now default in Destroyable 
Test: make droid docs and check-ojluni-files
Bug: 29631070
Change-Id: I93015997fbb18a45ba438f6bfc5c6564f053da64
 2016-07-08 13:35:15 +01:00
Przemyslaw Szczepaniak
61bb0a9ef4 Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968 
am: 9ede567f7c

Change-Id: I8b12fdde8489c2c3882b5da08801599241a54048
 2016-07-05 09:09:09 +00:00
Przemyslaw Szczepaniak
8fbba5047f Merge \\"Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968\\" am: 326e55a3e2 
am: ce482360b9

Change-Id: I642efaa06e6b21791ba38944eee2078ba452683f
 2016-07-05 09:01:09 +00:00
Przemyslaw Szczepaniak
9ede567f7c Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968 
Version with test-current.txt

Bug: 28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
 2016-07-05 08:59:10 +00:00
Przemyslaw Szczepaniak
ce482360b9 Merge \"Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968\" 
am: 326e55a3e2

Change-Id: I404c9665d23664f137462c246ebc724128035555
 2016-07-05 08:54:24 +00:00
Przemyslaw Szczepaniak
326e55a3e2 Merge "Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968" 2016-07-05 08:42:05 +00:00
Przemyslaw Szczepaniak
bab82f1df8 Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b 
Bug: 27464570
Change-Id: I761cab7198f2608b8e76e9a5c775e3bcec44d781
 2016-07-04 16:35:28 +01:00
Shubham Ajmera
30cbe3b264 Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a 
Change-Id: If8e4308d6c43eae7e2661bc083dea657969b9254
 2016-06-30 13:44:38 +01:00
Dianne Hackborn
381f4eb9be Merge \"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev 
am: 205bc262ce

Change-Id: I910f4db4503ad20ecce46032691001d1f971bdbf
 2016-06-29 20:45:36 +00:00
Dianne Hackborn
1150b735c8 Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API 
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
 2016-06-29 11:49:01 -07:00
Przemyslaw Szczepaniak
f0db6e8d94 Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968 
Bug: 28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
 2016-06-29 17:41:01 +01:00
Yi Kong
79f65e5d67 Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage-aosp-master 
am: a725dbd6c7

Change-Id: I06af085c2dad7d63539f66b8049d14a73e49c7cc
 2016-06-24 16:55:38 +00:00