OSDN Git Service
Erik Kline [Tue, 17 Jan 2017 04:51:48 +0000 (04:51 +0000)]
Merge "Start of UpstreamNetworkMonitor unittests" am:
f9a28d7ba4
am:
4bb6f5a418
Change-Id: I6a9106fd4fef85451104593ab8c37d4539cb9223
Erik Kline [Tue, 17 Jan 2017 04:46:17 +0000 (04:46 +0000)]
Merge "Start of UpstreamNetworkMonitor unittests"
am:
f9a28d7ba4
Change-Id: I2dade79427530a04c8e222e4ab2bf26e79ddd578
Treehugger Robot [Tue, 17 Jan 2017 04:38:21 +0000 (04:38 +0000)]
Merge "Start of UpstreamNetworkMonitor unittests"
Lorenzo Colitti [Tue, 17 Jan 2017 04:31:00 +0000 (04:31 +0000)]
Merge "Enable mobile data always on." am:
6e4fe6b37f
am:
fcfa8c02ad
Change-Id: Ie2b6887021585a2e7246d66603dadc8d0fa1bd94
Lorenzo Colitti [Tue, 17 Jan 2017 04:25:44 +0000 (04:25 +0000)]
Merge "Enable mobile data always on."
am:
6e4fe6b37f
Change-Id: I9758da5105b9a8eac66aaaf9e4a1658685a6a3f7
Treehugger Robot [Tue, 17 Jan 2017 04:15:33 +0000 (04:15 +0000)]
Merge "Enable mobile data always on."
Erik Kline [Mon, 16 Jan 2017 07:27:22 +0000 (16:27 +0900)]
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
Lorenzo Colitti [Tue, 17 Jan 2017 02:07:10 +0000 (11:07 +0900)]
Enable mobile data always on.
Test: has been on in fishfood several months.
Bug:
23113288
Change-Id: I73ba432f619d28dab78e2d865d56aa7e7c5a67f9
Tao Bao [Mon, 16 Jan 2017 18:32:22 +0000 (18:32 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()." am:
3b2fe9f7b9
am:
6bb3a9e6df
Change-Id: I9919e1a37853290dc052a21267cea57ae2a0aacf
Tao Bao [Mon, 16 Jan 2017 18:27:39 +0000 (18:27 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()."
am:
3b2fe9f7b9
Change-Id: I2ac84a2204b78e422d33095a3637e379031eec04
Tao Bao [Mon, 16 Jan 2017 18:19:25 +0000 (18:19 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()."
Hisanobu Watanabe [Mon, 16 Jan 2017 18:11:33 +0000 (18:11 +0000)]
Merge "VPN reconnection fails after manually disabling VPN" am:
ba17ea752b
am:
92d16f70d7
Change-Id: I505d89ecfd486c1a1105bb2fe847d891ed540b6d
Polina Bondarenko [Mon, 16 Jan 2017 18:02:32 +0000 (18:02 +0000)]
Merge "Make TelephonyManager.getImei a system APIs." am:
dc61ad0ad8
am:
e2b306e30e
Change-Id: Ida4807876ce741a211189e41e92383404b6a3a3c
Hisanobu Watanabe [Mon, 16 Jan 2017 17:59:55 +0000 (17:59 +0000)]
Merge "VPN reconnection fails after manually disabling VPN"
am:
ba17ea752b
Change-Id: I8ff02f8d1fe4989cb92949ab85aade598c8cff00
Polina Bondarenko [Mon, 16 Jan 2017 17:57:04 +0000 (17:57 +0000)]
Merge "Make TelephonyManager.getImei a system APIs."
am:
dc61ad0ad8
Change-Id: Iaffe54fdf263eaf1cc248ceb0dad9b8787861475
Treehugger Robot [Mon, 16 Jan 2017 17:51:04 +0000 (17:51 +0000)]
Merge "VPN reconnection fails after manually disabling VPN"
Treehugger Robot [Mon, 16 Jan 2017 17:49:58 +0000 (17:49 +0000)]
Merge "Make TelephonyManager.getImei a system APIs."
Martijn Coenen [Mon, 16 Jan 2017 15:01:31 +0000 (15:01 +0000)]
Merge "Add nullable parameter to readEmbeddedBuffer." am:
c5e5442acd
am:
b529858c0b
Change-Id: I4a04a1e766551d0c15e3b4c14226363c97daf032
Martijn Coenen [Mon, 16 Jan 2017 14:56:57 +0000 (14:56 +0000)]
Merge "Add nullable parameter to readEmbeddedBuffer."
am:
c5e5442acd
Change-Id: Ic5d73aba5da7bd74522a46d710465ebb67030d01
Martijn Coenen [Mon, 16 Jan 2017 14:48:09 +0000 (14:48 +0000)]
Merge "Add nullable parameter to readEmbeddedBuffer."
Erik Kline [Mon, 16 Jan 2017 05:51:03 +0000 (05:51 +0000)]
Merge "Extract UpstreamNetworkMonitor to its own file" am:
8df5bd1028
am:
c498f6301e
Change-Id: I79421b04547c0ac3ea39d7222e21597668bddd49
Erik Kline [Mon, 16 Jan 2017 05:47:06 +0000 (05:47 +0000)]
Merge "Extract UpstreamNetworkMonitor to its own file"
am:
8df5bd1028
Change-Id: I7973c74952efb1abe9309eedfdf829af39467463
Treehugger Robot [Mon, 16 Jan 2017 05:36:05 +0000 (05:36 +0000)]
Merge "Extract UpstreamNetworkMonitor to its own file"
Hugo Benichi [Mon, 16 Jan 2017 05:04:39 +0000 (05:04 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am:
37727596cc
am:
036ab4d193
Change-Id: I839ed526e802b88bbed490b611f90d829b952f26
Hugo Benichi [Mon, 16 Jan 2017 05:00:30 +0000 (05:00 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
am:
37727596cc
Change-Id: I636b7b0ef210aaa3e130e1c1a162a35cdc099295
Treehugger Robot [Mon, 16 Jan 2017 04:52:44 +0000 (04:52 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
Erik Kline [Fri, 13 Jan 2017 07:46:52 +0000 (16:46 +0900)]
Extract UpstreamNetworkMonitor to its own file
Test: as follows:
- built (bullhead)
- flashed
- booted
- runtest framworks-net passes
Bug:
32163131
Change-Id: I87ff041e008e45065c9722de8130df53684fb2a9
Hugo Benichi [Tue, 20 Dec 2016 08:05:06 +0000 (17:05 +0900)]
ConnectivityServiceTest: some fixes in CallbackInfo
- CallbackInfo becomes a static class so that it can be instantiated
and looked at more easily than before.
- CallbackInfo gains hashCode() because it has equals().
- effectively final field are qualified final
- fixes bug when polling the next callback: poll() on a LinkedBlockingQueue
returns null when timing out, which was not failing the test cleanly.
Test: ConnectivityServiceTest passes
Bug:
32561414
Change-Id: I64d382a35fe83f21bded98e6906c1ec70a8f1085
Wei Liu [Sat, 14 Jan 2017 03:58:32 +0000 (03:58 +0000)]
Merge "Add WearCellularMediatorService to the system server." into cw-f-dev
am:
7a6c54128a
Change-Id: I5f905ec5bdd73d75bc84021125b4db5383ddfde1
Wei Liu [Sat, 14 Jan 2017 03:51:58 +0000 (03:51 +0000)]
Add WearCellularMediatorService to the system server.
am:
d741f3de81
Change-Id: I6f3f0e2ea19f995f81816689c80b0bc865cc991e
TreeHugger Robot [Sat, 14 Jan 2017 03:46:06 +0000 (03:46 +0000)]
Merge "Add WearCellularMediatorService to the system server." into cw-f-dev
Wei Liu [Tue, 13 Dec 2016 23:44:55 +0000 (15:44 -0800)]
Add WearCellularMediatorService to the system server.
Bug:
33589216
Change-Id: Icfee08b27c03567ed45e136fc407b51c768515c2
Yifan Hong [Sat, 14 Jan 2017 01:00:31 +0000 (01:00 +0000)]
Merge "BBinder -> BHwBinder." am:
fe4d257887
am:
051b14106f
Change-Id: I148771849faf22aabdcd3861e867913408d84c11
Yifan Hong [Sat, 14 Jan 2017 00:55:55 +0000 (00:55 +0000)]
Merge "BBinder -> BHwBinder."
am:
fe4d257887
Change-Id: Iefe63e614d5c90f33d807aba8fac3f2095972ae8
Yifan Hong [Sat, 14 Jan 2017 00:49:22 +0000 (00:49 +0000)]
Merge "BBinder -> BHwBinder."
Tao Bao [Fri, 13 Jan 2017 17:45:14 +0000 (09:45 -0800)]
RecoverySystem: Fix the issue in installPackage().
Commit
794c8b0b3fe16051843c22232d58d6b184dde49b fixed the race condition
when requesting data wipes via uncrypt. We have similar issue with
RecoverySystem.installPackage(). It first requests to set up the BCB,
then triggers a reboot. These two steps should finish atomically.
This CL switches to calling
RecoverySystemService.rebootRecoveryWithCommand(), which guards the two
steps with synchronized blocks.
Bug:
34239871
Test: Having two apps: one calls RecoverySystem.cancelScheduledUpdate()
continuously, and the other calls RecoverySystem.installPackage()
just once. The install request should not be cancelled by the
other.
Change-Id: I5ec56fcaa70eae7c33e3cc8e6cfc7472b935ce4e
Andrew Scull [Fri, 13 Jan 2017 17:55:21 +0000 (17:55 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c
am:
b2db3761cd
Change-Id: I3d74f6406b76fbc6858a7359bc08f9b563426066
Andrew Scull [Fri, 13 Jan 2017 17:54:22 +0000 (17:54 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969
am:
3aac3ebee1
Change-Id: Idf677426c40799b17d08e0a8ac7dfafc2f2609b2
Andrew Scull [Fri, 13 Jan 2017 17:18:42 +0000 (17:18 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542
am:
66d66dd50c
Change-Id: Ic622d551181566585be89380e32658e963768cbf
Andrew Scull [Fri, 13 Jan 2017 17:17:49 +0000 (17:17 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev
am:
eb35ad9969
Change-Id: I4fd9ce4c79db5a10f28008c89205fc9c8ef2888f
Andrew Scull [Fri, 13 Jan 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473
am:
ea9463f542
Change-Id: I76b21c0ea4ab7394281ee8c82ed67179eb9ea966
Andrew Scull [Fri, 13 Jan 2017 15:28:36 +0000 (15:28 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
Andrew Scull [Fri, 13 Jan 2017 14:52:26 +0000 (14:52 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev
am:
97848fc473
Change-Id: I12d9a6d18654673e5912416550c64e81aab857f9
Martijn Coenen [Fri, 13 Jan 2017 10:08:51 +0000 (11:08 +0100)]
Add nullable parameter to readEmbeddedBuffer.
To support reading embedded buffers that can be
nullptr (currently only in empty hidl_vec).
Bug:
34255213
Test: hidl_test_java
Change-Id: I72028f580b7863b6bfeb31a5c0f43deed36dfd64
Andrew Scull [Fri, 13 Jan 2017 13:16:09 +0000 (13:16 +0000)]
resolve merge conflicts of
e4cefbf4fce4 to nyc-dr1-dev
Change-Id: Ib536a33ba381c28397320edd516d52727e5bdacc
Andrew Scull [Fri, 13 Jan 2017 12:18:42 +0000 (12:18 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev
Joachim Sauer [Fri, 13 Jan 2017 10:34:55 +0000 (10:34 +0000)]
Merge "Add java.time APIs." am:
0938b22c0a
am:
d05e19954b
Change-Id: I08e6eedff692aa2be86224ffb1869e7a57182db5
Joachim Sauer [Fri, 13 Jan 2017 10:27:05 +0000 (10:27 +0000)]
Merge "Add java.time APIs."
am:
0938b22c0a
Change-Id: Ie1169d1af12228ac63f43efdf7f18e7dcb705bee
Joachim Sauer [Fri, 13 Jan 2017 10:18:18 +0000 (10:18 +0000)]
Merge "Add java.time APIs."
Erik Kline [Fri, 13 Jan 2017 07:18:55 +0000 (07:18 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am:
caf62d305e
am:
a94e66868c
Change-Id: Ie4d1cf3ef1729fc92de6a209a66e2e1ad386fb32
Erik Kline [Fri, 13 Jan 2017 07:17:47 +0000 (07:17 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor am:
fdd4111ef6
am:
7340e272c3
Change-Id: Ie5065a8224e392dafc75e9f9cd9e07587e46b814
Erik Kline [Fri, 13 Jan 2017 07:11:47 +0000 (07:11 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor"
am:
caf62d305e
Change-Id: I8befc4b903289a21cfdcdaa16bbaeff7e9247892
Erik Kline [Fri, 13 Jan 2017 07:11:43 +0000 (07:11 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor
am:
fdd4111ef6
Change-Id: If452982fdc47cf0e655c7f079c1be3f535ec6c03
Treehugger Robot [Fri, 13 Jan 2017 07:03:16 +0000 (07:03 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor"
Erik Kline [Thu, 12 Jan 2017 08:02:51 +0000 (17:02 +0900)]
Move explicit mobile request handling into UpstreamNetworkMonitor
Also:
- some minor typo fixes
- some minor style fixes
- variable renames for clarity
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- regular (no DUN) wifi tethering to mobile works
- USB tethering with switching between mobile and wifi works
Bug:
32163131
Change-Id: I113536f24436f0b962f402f3b37386e29468dc0a
Chen Xu [Fri, 13 Jan 2017 02:33:24 +0000 (02:33 +0000)]
Merge "Default Carrier app for traffic mitigation" am:
4533b1ccdd
am:
1d0877f59e
Change-Id: I1df7d283d8339065d4418af562775c3aea56a707
Chen Xu [Fri, 13 Jan 2017 02:28:28 +0000 (02:28 +0000)]
Merge "Default Carrier app for traffic mitigation"
am:
4533b1ccdd
Change-Id: I999285660c3a53fb2da8f18ddde9042f611f4e96
Chen Xu [Fri, 13 Jan 2017 02:22:38 +0000 (02:22 +0000)]
Merge "Default Carrier app for traffic mitigation"
Philip P. Moltmann [Fri, 13 Jan 2017 01:17:30 +0000 (01:17 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc
am:
331a4bb8d4
Change-Id: I068dcbfcdaffff85379d422a9c53aafe7caa01c2
Philip P. Moltmann [Fri, 13 Jan 2017 01:16:23 +0000 (01:16 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5
am:
889a420a9e
Change-Id: If0849eedacedf9197e19616dc56edad2ca39f015
Philip P. Moltmann [Fri, 13 Jan 2017 01:10:01 +0000 (01:10 +0000)]
Do not write if apply() did not change the file.
am:
1f99f81bdc
Change-Id: I4dd94b4f862f6c3d5ada9961d75cc2f91886edf1
Philip P. Moltmann [Fri, 13 Jan 2017 01:09:03 +0000 (01:09 +0000)]
Only persist last Shared Preferences state
am:
d15c4f1da5
Change-Id: I6431d4b7d07064eec5013d01b5bda76b1ed35e14
Philip P. Moltmann [Wed, 14 Dec 2016 00:32:06 +0000 (16:32 -0800)]
Do not write if apply() did not change the file.
Bug:
33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
Philip P. Moltmann [Wed, 14 Dec 2016 00:23:21 +0000 (16:23 -0800)]
Only persist last Shared Preferences state
If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.
For commit() we need to make sure that we have at least persisted the
state of the commit.
Generation counts are 64 bit, hence they never overflow.
Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug:
33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
(cherry picked from commit
31d6889f4c89dd8498e2095f9d8a3c39fbd17c86)
fionaxu [Wed, 14 Dec 2016 01:15:11 +0000 (17:15 -0800)]
Default Carrier app for traffic mitigation
- have the basic function working, support traffic mitigation and
captive portal login
- support carrier customization, OEM could configure a list of carrier
actions to act upon certain signals
- unit test
Test: Manual test with live sim card & runtest --path
frameworks/base/packages/CarrierDefaultApp
Bug:
30958215
Change-Id: Ie99be3b95e8a1dd60fc51bef703836478fbde09d
Robert Greenwalt [Thu, 12 Jan 2017 23:16:20 +0000 (23:16 +0000)]
Merge "Add support for FDN contact dial" am:
082b118641
am:
24dea10375
Change-Id: I5091d35ff79eff952c57109ce120369c95309598
Robert Greenwalt [Thu, 12 Jan 2017 23:12:23 +0000 (23:12 +0000)]
Merge "Add support for FDN contact dial"
am:
082b118641
Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc
Robert Greenwalt [Thu, 12 Jan 2017 23:06:59 +0000 (23:06 +0000)]
Merge "Add support for FDN contact dial"
Yifan Hong [Thu, 12 Jan 2017 22:20:31 +0000 (14:20 -0800)]
BBinder -> BHwBinder.
Test: mma
Test: croot && make
Bug:
33554989
Change-Id: I76ec5cd29fc510ba5b518f59dd83a38ad6675418
Andre Eisenbach [Thu, 12 Jan 2017 16:44:42 +0000 (16:44 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am:
0b9a18d21e
am:
2d0ad3a9e7
Change-Id: I9ba589e7b46bf48374b30975ccc9fedb6d740b01
Andre Eisenbach [Thu, 12 Jan 2017 16:27:03 +0000 (16:27 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
am:
0b9a18d21e
Change-Id: I245966c53c49da6c0b95b73ec72754d85edcd627
Andrew Scull [Fri, 2 Dec 2016 16:08:09 +0000 (16:08 +0000)]
Don't save password metrics to disk.
On FBE devices, don't save the metrics to disk but compute them when the
password is first entered and only store them in RAM.
Merged-in:
5daf273b7e3272269c53eda20ce494d0e7a365b5
Bug:
32793550
Change-Id: Icee7f615167761177b224b342970a36c7d90f6ba
Andre Eisenbach [Thu, 12 Jan 2017 15:58:36 +0000 (15:58 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
Andre Eisenbach [Thu, 12 Jan 2017 15:56:39 +0000 (15:56 +0000)]
Revert "Don't offer the BT sharing option to the user if BT is disallowed."
Causes boot loop issue:
02-15 02:31:59.785 770 770 E System : Caused by: java.lang.IllegalArgumentException: Unknown component: com.android.bluetooth/com.android.bluetooth.opp.BluetoothOppLauncherActivity
02-15 02:31:59.785 770 770 E System : .at com.android.server.pm.PackageManagerService.setEnabledSetting(PackageManagerService.java:18500)
02-15 02:31:59.785 770 770 E System : .at com.android.server.pm.PackageManagerService.setComponentEnabledSetting(PackageManagerService.java:18461)
02-15 02:31:59.785 770 770 E System : .at android.app.ApplicationPackageManager.setComponentEnabledSetting(ApplicationPackageManager.java:2129)
02-15 02:31:59.785 770 770 E System : .at com.android.server.BluetoothManagerService.updateOppLauncherComponentState(BluetoothManagerService.java:2036)
This reverts commit
77fe44ffb6b5d40daf3b127cb36d5111b7618cc1.
Change-Id: Ia079bb2fcc91bb5979a3840ab50b9d9ddda1cf24
Mark Salyzyn [Thu, 12 Jan 2017 15:46:20 +0000 (15:46 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am:
2225a0640b
am:
d1740f0f5b
Change-Id: I78430cd21cf1186ccc2b48ee4ee8a9b07decde5e
Mark Salyzyn [Thu, 12 Jan 2017 15:32:50 +0000 (15:32 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
am:
2225a0640b
Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966
Mark Salyzyn [Thu, 12 Jan 2017 15:18:25 +0000 (15:18 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:33:15 +0000 (11:33 +0000)]
Merge "Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d" am:
c0d71fa38a
am:
3556fd53a2
Change-Id: Idd321bad02683a94425fb2b6302f3f7621b6844f
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:27:32 +0000 (11:27 +0000)]
Merge "Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d"
am:
c0d71fa38a
Change-Id: I43d1e2241bfcb1dde53390e21c94c44054375901
Treehugger Robot [Thu, 12 Jan 2017 11:20:05 +0000 (11:20 +0000)]
Erik Kline [Thu, 12 Jan 2017 10:33:24 +0000 (10:33 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am:
f9f5cf9d9b
am:
cbd3d8b356
Change-Id: I845443ae243429847e0a42b3be5bec6276a216c0
Martijn Coenen [Thu, 12 Jan 2017 10:31:35 +0000 (10:31 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am:
34ed84d4eb
am:
aa4d6f1be9
Change-Id: I5153b688467f4d06da701eaa34bfa19c7904e33d
Erik Kline [Thu, 12 Jan 2017 10:26:43 +0000 (10:26 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"
am:
f9f5cf9d9b
Change-Id: I642567d81b6b8908b2ef7afea8d15628330481f9
Martijn Coenen [Thu, 12 Jan 2017 10:25:01 +0000 (10:25 +0000)]
Merge "Use new read(Embedded)Buffer APIs."
am:
34ed84d4eb
Change-Id: Idaa3a3a2d874b10cb5f07e3cb606c822e7ddfd8b
Treehugger Robot [Thu, 12 Jan 2017 10:18:24 +0000 (10:18 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"
Treehugger Robot [Thu, 12 Jan 2017 10:17:38 +0000 (10:17 +0000)]
Merge "Use new read(Embedded)Buffer APIs."
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 09:40:47 +0000 (09:40 +0000)]
Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d
java.util.regex named group capture support.
Test: vogar OldMatcherTest
Bug:
19717812
Change-Id: I525489bc26083b22bb2ce670d614f6d6e6eeaa29
Stephen Chen [Thu, 12 Jan 2017 07:27:22 +0000 (07:27 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am:
691ebe5366
am:
0e7882f2ac
Change-Id: I7408b253a7acc4aaf22dc7748b1941576d5de4c7
Stephen Chen [Thu, 12 Jan 2017 07:21:49 +0000 (07:21 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
am:
691ebe5366
Change-Id: I114cbc6777130b440639b2f13e161d8d044f7185
Treehugger Robot [Thu, 12 Jan 2017 07:15:05 +0000 (07:15 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
Stephen Chen [Fri, 6 Jan 2017 23:34:28 +0000 (15:34 -0800)]
Expose WifiManager#connect and ActionListener as @SystemApi
This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.
Bug:
33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8
Colin Cross [Thu, 12 Jan 2017 05:05:41 +0000 (05:05 +0000)]
Merge "Remove libservicestestsjni" am:
d00478e9ad
am:
301c714b43
Change-Id: I08e2298e7dd1ba8729e6d4a03e3c940012bb5e12
Colin Cross [Thu, 12 Jan 2017 04:59:42 +0000 (04:59 +0000)]
Merge "Remove libservicestestsjni"
am:
d00478e9ad
Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c
Treehugger Robot [Thu, 12 Jan 2017 04:50:56 +0000 (04:50 +0000)]
Merge "Remove libservicestestsjni"
Erik Kline [Wed, 11 Jan 2017 08:34:50 +0000 (17:34 +0900)]
Simplify UpstreamNetworkMonitor callback handling
In the callback post a lamba to the target state machine's handler
that does the processing we need before sending a notification to
the state machine.
No semantic change, just a bit cleaner.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- tested basic wifi-to-mobile tethering (no DUN)
Bug:
32163131
Change-Id: I07e1b510c1ebaa5dffd42a3f16ba96e961cb58f1
Colin Cross [Wed, 11 Jan 2017 22:29:10 +0000 (14:29 -0800)]
Remove libservicestestsjni
frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.
Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
(cherry-picked from
e399468b88ae84a586f9d583251ee0a6a7e94a43)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065
Shijian Li [Thu, 12 Jan 2017 03:07:23 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now.
am:
5e7fc7ccc8
Change-Id: I327673625deafc5c18319ce1b61734a090b6a989
Yifan Hong [Thu, 12 Jan 2017 02:08:36 +0000 (02:08 +0000)]
Merge "BpBase -> BpHwBase" am:
d8384b5c15
am:
e0707f139d
Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e
Yifan Hong [Thu, 12 Jan 2017 01:58:33 +0000 (01:58 +0000)]
Merge "BpBase -> BpHwBase"
am:
d8384b5c15
Change-Id: I647e8ec4461e4d9c859144c123f278216111a2f4
Treehugger Robot [Thu, 12 Jan 2017 01:50:57 +0000 (01:50 +0000)]
Merge "BpBase -> BpHwBase"
OSDN Git Service
