Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,432 Commits 3 Branches 0 Tags
fcfa8c02ad27dc8a45fb590d8317fb785ed8e979
Commit Graph

277432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
6bb3a9e6df Merge "RecoverySystem: Fix the issue in installPackage()." 
am: 3b2fe9f7b9

Change-Id: I2ac84a2204b78e422d33095a3637e379031eec04
 2017-01-16 18:27:39 +00:00
Tao Bao
3b2fe9f7b9 Merge "RecoverySystem: Fix the issue in installPackage()." 2017-01-16 18:19:25 +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
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
c498f6301e Merge "Extract UpstreamNetworkMonitor to its own file" 
am: 8df5bd1028

Change-Id: I7973c74952efb1abe9309eedfdf829af39467463
 2017-01-16 05:47:06 +00:00
Treehugger Robot
8df5bd1028 Merge "Extract UpstreamNetworkMonitor to its own file" 2017-01-16 05:36:06 +00:00
Hugo Benichi
036ab4d193 Merge "ConnectivityServiceTest: some fixes in CallbackInfo" 
am: 37727596cc

Change-Id: I636b7b0ef210aaa3e130e1c1a162a35cdc099295
 2017-01-16 05:00:30 +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
051b14106f Merge "BBinder -> BHwBinder." 
am: fe4d257887

Change-Id: Iefe63e614d5c90f33d807aba8fac3f2095972ae8
 2017-01-14 00:55:55 +00:00
Yifan Hong
fe4d257887 Merge "BBinder -> BHwBinder." 2017-01-14 00:49:23 +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
d05e19954b Merge "Add java.time APIs." 
am: 0938b22c0a

Change-Id: Ie1169d1af12228ac63f43efdf7f18e7dcb705bee
 2017-01-13 10:27:05 +00:00
Joachim Sauer
0938b22c0a Merge "Add java.time APIs." 2017-01-13 10:18:20 +00:00
Erik Kline
a94e66868c Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" 
am: caf62d305e

Change-Id: I8befc4b903289a21cfdcdaa16bbaeff7e9247892
 2017-01-13 07:11:47 +00:00
Erik Kline
7340e272c3 Move explicit mobile request handling into UpstreamNetworkMonitor 
am: fdd4111ef6

Change-Id: If452982fdc47cf0e655c7f079c1be3f535ec6c03
 2017-01-13 07:11:43 +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
1d0877f59e Merge "Default Carrier app for traffic mitigation" 
am: 4533b1ccdd

Change-Id: I999285660c3a53fb2da8f18ddde9042f611f4e96
 2017-01-13 02:28:28 +00: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
24dea10375 Merge "Add support for FDN contact dial" 
am: 082b118641

Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc
 2017-01-12 23:12:23 +00: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
2d0ad3a9e7 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" 
am: 0b9a18d21e

Change-Id: I245966c53c49da6c0b95b73ec72754d85edcd627
 2017-01-12 16:27:03 +00: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
d1740f0f5b Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" 
am: 2225a0640b

Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966
 2017-01-12 15:32:50 +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
Przemyslaw Szczepaniak
3556fd53a2 Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" 
am: c0d71fa38a

Change-Id: I43d1e2241bfcb1dde53390e21c94c44054375901
 2017-01-12 11:27:32 +00:00
Treehugger Robot
c0d71fa38a Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" 2017-01-12 11:20:06 +00:00
Erik Kline
cbd3d8b356 Merge "Simplify UpstreamNetworkMonitor callback handling" 
am: f9f5cf9d9b

Change-Id: I642567d81b6b8908b2ef7afea8d15628330481f9
 2017-01-12 10:26:43 +00:00
Martijn Coenen
aa4d6f1be9 Merge "Use new read(Embedded)Buffer APIs." 
am: 34ed84d4eb

Change-Id: Idaa3a3a2d874b10cb5f07e3cb606c822e7ddfd8b
 2017-01-12 10:25:01 +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
Stephen Chen
0e7882f2ac Merge "Expose WifiManager#connect and ActionListener as @SystemApi" 
am: 691ebe5366

Change-Id: I114cbc6777130b440639b2f13e161d8d044f7185
 2017-01-12 07:21:49 +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
Colin Cross
301c714b43 Merge "Remove libservicestestsjni" 
am: d00478e9ad

Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c
 2017-01-12 04:59:42 +00:00
Treehugger Robot
d00478e9ad Merge "Remove libservicestestsjni" 2017-01-12 04:50:57 +00:00