Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
281,561 Commits 3 Branches 0 Tags
bc5fd9934776ba261710411bf5e06e2e27ff52ea
Commit Graph

281561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Przemyslaw Szczepaniak
bc5fd99347 Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a" am: 751e3af81e am: 6b9cd13b05 
am: cc1074f6f4

Change-Id: I5a592a38d054665cfb4fe5f21bbf938556d42251
 2017-01-17 19:06:26 +00:00
Przemyslaw Szczepaniak
cc1074f6f4 Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a" am: 751e3af81e 
am: 6b9cd13b05

Change-Id: Id77f008ca75d2570eb34d84950e24bac4e447df8
 2017-01-17 18:46:25 +00:00
Przemyslaw Szczepaniak
6b9cd13b05 Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a" 
am: 751e3af81e

Change-Id: I6c0ebb09325ab2f37469c9d4a5408f812380efc1
 2017-01-17 18:26:57 +00:00
Treehugger Robot
751e3af81e Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a" 2017-01-17 17:55:18 +00:00
Tobias Thierer
191806932e Merge "API: Update java.util.Date to OpenJDK8u60" am: a2343a7e78 am: d8d1d9682d 
am: d6be4be618

Change-Id: Iebadb6be0a880ede9033f0cd03a4a53c7695dcb7
 2017-01-17 11:36:58 +00:00
Tobias Thierer
d6be4be618 Merge "API: Update java.util.Date to OpenJDK8u60" am: a2343a7e78 
am: d8d1d9682d

Change-Id: I04b50fee184ba129d986832bfadbee8325f9c56f
 2017-01-17 11:21:01 +00:00
Tobias Thierer
d8d1d9682d Merge "API: Update java.util.Date to OpenJDK8u60" 
am: a2343a7e78

Change-Id: Ic56a141a6ffad9c0080ac3d942d2b669f8ca37d5
 2017-01-17 11:05:24 +00:00
Tobias Thierer
a2343a7e78 Merge "API: Update java.util.Date to OpenJDK8u60" 2017-01-17 10:41:36 +00:00
Lorenzo Colitti
bb79257dbf Merge "Delete dead code." am: cf59ff79c5 am: d305a7c894 
am: 8cf7169564

Change-Id: Ia662fd845fcfb4ade631d8aacf6bcff3c92a1543
 2017-01-17 06:08:28 +00:00
Lorenzo Colitti
8cf7169564 Merge "Delete dead code." am: cf59ff79c5 
am: d305a7c894

Change-Id: Icdb4d429fcdf4060feab8a25cf67b3a230a35eb7
 2017-01-17 06:02:30 +00:00
Lorenzo Colitti
d305a7c894 Merge "Delete dead code." 
am: cf59ff79c5

Change-Id: Ifbb591a7bbed9c2a8f83fe321c3d12f08e096fe3
 2017-01-17 05:55:50 +00:00
Treehugger Robot
cf59ff79c5 Merge "Delete dead code." 2017-01-17 05:44:58 +00:00
Erik Kline
b4f96a3172 Merge "Move tests added in n-mr2 into new aosp location." am: 5511f7cfc2 am: ac6e0cc770 
am: b1d4313777

Change-Id: I62688cacb486f55bb48ea55b14e4e3416493ea30
 2017-01-17 05:20:52 +00:00
Erik Kline
545049be25 Move tests added in n-mr2 into new aosp location. am: e446acf954 am: 88f3295464 
am: 4e9ffd6e91

Change-Id: I3b4f9303c5d4495e4b8556b1db6d5cad5543a10c
 2017-01-17 05:19:56 +00:00
Erik Kline
b1d4313777 Merge "Move tests added in n-mr2 into new aosp location." am: 5511f7cfc2 
am: ac6e0cc770

Change-Id: I9f6c96c47ae63e4f812427317592e9994b1d72fd
 2017-01-17 05:09:33 +00:00
Erik Kline
4e9ffd6e91 Move tests added in n-mr2 into new aosp location. am: e446acf954 
am: 88f3295464

Change-Id: Iaf574661aa658df1285f69bfad62285bd531206a
 2017-01-17 05:08:24 +00:00
Erik Kline
ac6e0cc770 Merge "Move tests added in n-mr2 into new aosp location." 
am: 5511f7cfc2

Change-Id: I30161c31529fc0c5254353f4329cbd5165fcbd82
 2017-01-17 05:01:52 +00:00
Erik Kline
88f3295464 Move tests added in n-mr2 into new aosp location. 
am: e446acf954

Change-Id: I69c76aaf4c8d03ce4b33d9c16c47f2c83141e255
 2017-01-17 05:01:49 +00:00
Erik Kline
abeb9205fe Merge "Start of UpstreamNetworkMonitor unittests" am: f9a28d7ba4 am: 4bb6f5a418 
am: 5eba88cf44

Change-Id: I67c8df63d390ac77e626286a34e82b3bbc82c29e
 2017-01-17 04:56:55 +00:00
Erik Kline
5eba88cf44 Merge "Start of UpstreamNetworkMonitor unittests" am: f9a28d7ba4 
am: 4bb6f5a418

Change-Id: I6a9106fd4fef85451104593ab8c37d4539cb9223
 2017-01-17 04:51:48 +00:00
Treehugger Robot
5511f7cfc2 Merge "Move tests added in n-mr2 into new aosp location." 2017-01-17 04:49:08 +00:00
Erik Kline
4bb6f5a418 Merge "Start of UpstreamNetworkMonitor unittests" 
am: f9a28d7ba4

Change-Id: I2dade79427530a04c8e222e4ab2bf26e79ddd578
 2017-01-17 04:46:17 +00:00
Treehugger Robot
f9a28d7ba4 Merge "Start of UpstreamNetworkMonitor unittests" 2017-01-17 04:38:22 +00:00
Lorenzo Colitti
59d48b7310 Merge "Enable mobile data always on." am: 6e4fe6b37f am: fcfa8c02ad 
am: cb44b8d85a

Change-Id: Iaf4f84f53be65800c95a4f1b456a0d2d142c8c87
 2017-01-17 04:36:21 +00:00
Lorenzo Colitti
cb44b8d85a Merge "Enable mobile data always on." am: 6e4fe6b37f 
am: fcfa8c02ad

Change-Id: Ie2b6887021585a2e7246d66603dadc8d0fa1bd94
 2017-01-17 04:31:00 +00:00
Lorenzo Colitti
fcfa8c02ad Merge "Enable mobile data always on." 
am: 6e4fe6b37f

Change-Id: I9758da5105b9a8eac66aaaf9e4a1658685a6a3f7
 2017-01-17 04:25:44 +00:00
Treehugger Robot
6e4fe6b37f Merge "Enable mobile data always on." 2017-01-17 04:15:34 +00:00
Erik Kline
885a9098cf Start of UpstreamNetworkMonitor unittests 
Test only the ConnectivityManager request and callback registering
and releasing.  Testing behaviour triggered by activating these
callbacks will be in a separate change.

Test: runtest frameworks-net
Bug: 32163131
Change-Id: Ibfe66bbe2e61d81e8f13ac3b98e000d0d4534efa
 2017-01-17 11:08:29 +09:00
Lorenzo Colitti
5d6bf6d2b1 Enable mobile data always on. 
Test: has been on in fishfood several months.
Bug: 23113288
Change-Id: I73ba432f619d28dab78e2d865d56aa7e7c5a67f9
 2017-01-17 11:07:50 +09:00
Tao Bao
448716eec1 Merge "RecoverySystem: Fix the issue in installPackage()." am: 3b2fe9f7b9 am: 6bb3a9e6df 
am: 5c610492c8

Change-Id: Ic9fa3bb8c7d4c04fa6e55b600cd7cccc9b186db1
 2017-01-16 18:36:43 +00:00
Tao Bao
5c610492c8 Merge "RecoverySystem: Fix the issue in installPackage()." am: 3b2fe9f7b9 
am: 6bb3a9e6df

Change-Id: I9919e1a37853290dc052a21267cea57ae2a0aacf
 2017-01-16 18:32:22 +00:00
Tao Bao
6bb3a9e6df Merge "RecoverySystem: Fix the issue in installPackage()." 
am: 3b2fe9f7b9

Change-Id: I2ac84a2204b78e422d33095a3637e379031eec04
 2017-01-16 18:27:39 +00:00
Hisanobu Watanabe
d521b10c5f Merge "VPN reconnection fails after manually disabling VPN" am: ba17ea752b am: 92d16f70d7 
am: f9c48fad75

Change-Id: If2b80355bc3ebee6723a1f9b49bce1d267f0a085
 2017-01-16 18:22:27 +00:00
Tao Bao
3b2fe9f7b9 Merge "RecoverySystem: Fix the issue in installPackage()." 2017-01-16 18:19:25 +00:00
Hisanobu Watanabe
f9c48fad75 Merge "VPN reconnection fails after manually disabling VPN" am: ba17ea752b 
am: 92d16f70d7

Change-Id: I505d89ecfd486c1a1105bb2fe847d891ed540b6d
 2017-01-16 18:11:33 +00:00
Polina Bondarenko
55745eca73 Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8 am: e2b306e30e 
am: d4c48e911e

Change-Id: Iac1e5f257d6a8263c78af8d9199848244fe6d93c
 2017-01-16 18:10:40 +00:00
Polina Bondarenko
d4c48e911e Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8 
am: e2b306e30e

Change-Id: Ida4807876ce741a211189e41e92383404b6a3a3c
 2017-01-16 18:02:32 +00:00
Hisanobu Watanabe
92d16f70d7 Merge "VPN reconnection fails after manually disabling VPN" 
am: ba17ea752b

Change-Id: I8ff02f8d1fe4989cb92949ab85aade598c8cff00
 2017-01-16 17:59:55 +00:00
Polina Bondarenko
e2b306e30e Merge "Make TelephonyManager.getImei a system APIs." 
am: dc61ad0ad8

Change-Id: Iaffe54fdf263eaf1cc248ceb0dad9b8787861475
 2017-01-16 17:57:04 +00:00
Treehugger Robot
ba17ea752b Merge "VPN reconnection fails after manually disabling VPN" 2017-01-16 17:51:06 +00:00
Treehugger Robot
dc61ad0ad8 Merge "Make TelephonyManager.getImei a system APIs." 2017-01-16 17:49:59 +00:00
Przemyslaw Szczepaniak
2ad3ce4175 Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a 
Test: CtsLibcoreTestCases
Bug: 30964930
Change-Id: Ia3cacc2256c5fd84c97eb50d52ebf23d3181a8ba
 2017-01-16 17:21:17 +00:00
Martijn Coenen
098bbc455d Merge "Add nullable parameter to readEmbeddedBuffer." am: c5e5442acd am: b529858c0b 
am: 714c8596ad

Change-Id: I792c4ac6a20e4665b152a5ebea1227b549cca7ef
 2017-01-16 15:06:01 +00:00
Martijn Coenen
714c8596ad Merge "Add nullable parameter to readEmbeddedBuffer." am: c5e5442acd 
am: b529858c0b

Change-Id: I4a04a1e766551d0c15e3b4c14226363c97daf032
 2017-01-16 15:01:31 +00:00
Martijn Coenen
b529858c0b Merge "Add nullable parameter to readEmbeddedBuffer." 
am: c5e5442acd

Change-Id: Ic5d73aba5da7bd74522a46d710465ebb67030d01
 2017-01-16 14:56:57 +00:00
Martijn Coenen
c5e5442acd Merge "Add nullable parameter to readEmbeddedBuffer." 2017-01-16 14:48:11 +00:00
Erik Kline
e446acf954 Move tests added in n-mr2 into new aosp location. 
Test: runtest frameworks-net
Change-Id: I3ca0d7e01a3f31be05d4a1a72a95c7e37a0a567e
 2017-01-16 15:24:31 +09:00
Erik Kline
4c9f111a6d Merge "Extract UpstreamNetworkMonitor to its own file" am: 8df5bd1028 am: c498f6301e 
am: 55d1997d51

Change-Id: Id51d28940e7ba95ee3896404d58ec2972f0e2ba7
 2017-01-16 05:55:05 +00:00
Erik Kline
55d1997d51 Merge "Extract UpstreamNetworkMonitor to its own file" am: 8df5bd1028 
am: c498f6301e

Change-Id: I79421b04547c0ac3ea39d7222e21597668bddd49
 2017-01-16 05:51:03 +00:00
Erik Kline
c498f6301e Merge "Extract UpstreamNetworkMonitor to its own file" 
am: 8df5bd1028

Change-Id: I7973c74952efb1abe9309eedfdf829af39467463
 2017-01-16 05:47:06 +00:00