Commit Graph

277189 Commits

Author SHA1 Message Date
Ta-wei Yen
68d03b23bb Merge "Add getNetworkSpecifier() and getCarrierConfig()" 2017-01-17 19:38:27 +00:00
Randy Pan
cdad7f334b Merge "Keep WIFI_FEATURE defines in sync with HAL" 2017-01-17 18:10:02 +00:00
Treehugger Robot
751e3af81e Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a" 2017-01-17 17:55:18 +00:00
Tobias Thierer
a2343a7e78 Merge "API: Update java.util.Date to OpenJDK8u60" 2017-01-17 10:41:36 +00:00
Treehugger Robot
cf59ff79c5 Merge "Delete dead code." 2017-01-17 05:44:58 +00:00
Treehugger Robot
5511f7cfc2 Merge "Move tests added in n-mr2 into new aosp location." 2017-01-17 04:49:08 +00:00
Treehugger Robot
f9a28d7ba4 Merge "Start of UpstreamNetworkMonitor unittests" 2017-01-17 04:38:22 +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
3b2fe9f7b9 Merge "RecoverySystem: Fix the issue in installPackage()." 2017-01-16 18:19:25 +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
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
Treehugger Robot
8df5bd1028 Merge "Extract UpstreamNetworkMonitor to its own file" 2017-01-16 05:36:06 +00:00
Treehugger Robot
37727596cc Merge "ConnectivityServiceTest: some fixes in CallbackInfo" 2017-01-16 04:52:45 +00:00
Erik Kline
9bba340fd4 Extract UpstreamNetworkMonitor to its own file
Test: as follows:
    - built (bullhead)
    - flashed
    - booted
    - runtest framworks-net passes
Bug: 32163131

Change-Id: I87ff041e008e45065c9722de8130df53684fb2a9
2017-01-16 12:10:18 +09:00
Hugo Benichi
4e1619f034 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
2017-01-16 11:15:04 +09:00
Yifan Hong
fe4d257887 Merge "BBinder -> BHwBinder." 2017-01-14 00:49:23 +00:00
Ta-wei Yen
eca691efcb Add getNetworkSpecifier() and getCarrierConfig()
This allows making network request and getting carrier config on a
specfic SIM.

Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Merged-In: Id52688d73b74bc55ee2da71a22454957fdd7b57b
Change-Id: Iebe2d883e193afdde13303d76014dfd7f4fb06dd
2017-01-13 23:53:51 +00:00
Randy Pan
438643b151 Keep WIFI_FEATURE defines in sync with HAL
Bug: 33673826
Test: build
Change-Id: Ifec7b28ef7b08a478d889d40d13b45f3a60a7e07
2017-01-13 14:59:30 -08:00
Tobias Thierer
26e2c852e5 API: Update java.util.Date to OpenJDK8u60
Test: make update-api
Change-Id: I116e13977427e714c6dbe4a843687220fd18a043
2017-01-13 21:53:40 +00:00
Tao Bao
9f7a0acd2d RecoverySystem: Fix the issue in installPackage().
Commit 794c8b0b3f 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
2017-01-13 09:59:38 -08:00
Martijn Coenen
14fae06b60 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
2017-01-13 14:17:12 +01:00
Joachim Sauer
0938b22c0a Merge "Add java.time APIs." 2017-01-13 10:18:20 +00:00
Treehugger Robot
caf62d305e Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" 2017-01-13 07:03:17 +00:00
Erik Kline
fdd4111ef6 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
2017-01-13 14:09:57 +09:00
Chen Xu
4533b1ccdd Merge "Default Carrier app for traffic mitigation" 2017-01-13 02:22:38 +00:00
fionaxu
a21a87b7a4 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
2017-01-12 15:50:18 -08:00
Robert Greenwalt
082b118641 Merge "Add support for FDN contact dial" 2017-01-12 23:07:00 +00:00
Yifan Hong
b072d4d9d9 BBinder -> BHwBinder.
Test: mma
Test: croot && make

Bug: 33554989
Change-Id: I76ec5cd29fc510ba5b518f59dd83a38ad6675418
2017-01-12 14:43:41 -08:00
Andre Eisenbach
0b9a18d21e Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" 2017-01-12 15:58:37 +00:00
Andre Eisenbach
8b4838e5e3 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 77fe44ffb6.

Change-Id: Ia079bb2fcc91bb5979a3840ab50b9d9ddda1cf24
2017-01-12 15:57:29 +00:00
Mark Salyzyn
2225a0640b Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" 2017-01-12 15:18:26 +00:00
Treehugger Robot
c0d71fa38a Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" 2017-01-12 11:20:06 +00:00
Treehugger Robot
f9f5cf9d9b Merge "Simplify UpstreamNetworkMonitor callback handling" 2017-01-12 10:18:24 +00:00
Treehugger Robot
34ed84d4eb Merge "Use new read(Embedded)Buffer APIs." 2017-01-12 10:17:40 +00:00
Przemyslaw Szczepaniak
fb864ff0f9 Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d
java.util.regex named group capture support.

Test: vogar OldMatcherTest
Bug: 19717812
Change-Id: I525489bc26083b22bb2ce670d614f6d6e6eeaa29
2017-01-12 09:40:47 +00:00
Treehugger Robot
691ebe5366 Merge "Expose WifiManager#connect and ActionListener as @SystemApi" 2017-01-12 07:15:06 +00:00
Stephen Chen
58ddbd76bb 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
2017-01-11 21:51:36 -08:00
Treehugger Robot
d00478e9ad Merge "Remove libservicestestsjni" 2017-01-12 04:50:57 +00:00
Erik Kline
452b4b7218 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
2017-01-12 13:43:00 +09:00
Colin Cross
3bc99892e6 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 e399468b88)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065
2017-01-12 03:24:57 +00:00
Treehugger Robot
d8384b5c15 Merge "BpBase -> BpHwBase" 2017-01-12 01:50:58 +00:00
Mark Salyzyn
96bf5985d5 Replace cutils/log.h and log/logger.h with android/log.h or log/log.h
(part deux)

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I7417936c4d3666608fccfe51a312c90ecefba2fb
2017-01-11 15:30:30 -08:00
Etan Cohen
dfe8f5dc13 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" 2017-01-11 22:59:25 +00:00
Treehugger Robot
b5488ec3b3 Merge "Move getActiveScorerPackage() to the score service." 2017-01-11 19:40:45 +00:00
Etan Cohen
6a4b323f08 [AWARE] Unhide Wi-Fi Aware API (baseline)
Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).

Bug: 30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933
2017-01-11 11:13:26 -08:00