Commit Graph

343483 Commits

Author SHA1 Message Date
Joseph Pirozzo
c9082cecb3 Merge "Bluetooth in band ring" 2018-01-12 22:11:50 +00:00
Hall Liu
d3cb6380a4 Merge "Use proper classloader when reading from parcel" 2018-01-12 20:56:36 +00:00
Treehugger Robot
6ca155f8c2 Merge "Minor LoadedApk refactoring." 2018-01-12 20:52:14 +00:00
Jeff Hamilton
caf728ea26 Minor LoadedApk refactoring.
- Rename varaibles holding LoadedApk to make the code easier to read.
- Move resource creation into LoadedApk, consolidating the logic.

(cherry picked from commit 7541ca4d1a)

Test: manual
Merged-In: I6bdc70482fbbb346ff694ada528ded18d3a63ef7
Change-Id: I6bdc70482fbbb346ff694ada528ded18d3a63ef7
2018-01-12 11:05:50 -08:00
Holly Jiuyu Sun
90b4e47d94 Merge "Add dependencies of EuiccCard." 2018-01-12 17:18:03 +00:00
Badhri Jagan Sridharan
22f4a681f9 Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" 2018-01-12 15:36:08 +00:00
Jerry Zhang
7ca5d3a334 DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager
Cherry-pick from 30b9adfad1

The screen unlocked functions save effort on setting
the usb config during each connection. These
functions persist between connections and between
boots. When the screen is unlocked and these
functions are set, the current functions will
be automatically set to the screen unlocked functions.

Also added svc command for this so it can be
used and tested while the UI is worked on.

Bug: 62876645
Test: svc usb setScreenUnlockedFunctions mtp
Test: Test functions with locking, unlocking, and
disconnecting, with no lockscreen, swipe, and pattern

Change-Id: Ia05e095917166d25398c4d310b02971e3a1bb12a
2018-01-12 15:35:43 +00:00
Treehugger Robot
f0561142f3 Merge "base: Convert libs/services/Android.mk into a blueprint" 2018-01-12 12:39:35 +00:00
Sami Kyostila
2bfba3afbf base: Convert libs/services/Android.mk into a blueprint
Convert libs/services/Android.mk into a blueprint module so it can be
linked by other blueprint modules.

Test: mmm frameworks/base
Change-Id: I7acf9aa084d262a5aba5a58e45d9647e15c6dffb
Merged-In: I7acf9aa084d262a5aba5a58e45d9647e15c6dffb
2018-01-12 11:13:22 +00:00
Chalard Jean
2fef505e1e Merge "Readability improvements to the Vpn class with no logic changes" 2018-01-12 05:11:29 +00:00
Hall Liu
aaf4b47e34 Use proper classloader when reading from parcel
Use the proper classloader when loading ImsStreamMediaProfile from a
parcel.

Bug: 71873453
Test: manual
Change-Id: Idf60f18b5d25b4c8eae225cb92a5391303c86d3b
2018-01-11 17:23:40 -08:00
Treehugger Robot
5edae415b0 Merge "Frameworks: Move SharedPreferencesImpl to tristate" 2018-01-11 23:52:46 +00:00
Jerry Zhang
68ad3d119c Merge "DO NOT MERGE: Add ScreenObserver" 2018-01-11 23:50:34 +00:00
Treehugger Robot
61fa313810 Merge "Add new config for number of physical SIM slots on the device." 2018-01-11 22:43:10 +00:00
Joseph Pirozzo
d2a9fc7abe Bluetooth in band ring
Prevent the telecom service from generating a ringer if there is already
a ringer generated by a phone connected over bluetooth headset client
service.

Bug: 65673832
Test: runtest telecom-unit -c
com.android.server.telecom.tests.RingerTest

Change-Id: I40710787cab0215f0456153a3557aa8cf1a50cdf
(cherry picked from commit 40ea5eea41)
2018-01-11 14:07:25 -08:00
Holly Jiuyu Sun
ec25ea1520 Merge "Add EuiccCardManager and EuiccCardController." 2018-01-11 20:44:33 +00:00
Treehugger Robot
ff9bc3a88c Merge "Make Bluetooth constants used by gmscore a system api" 2018-01-11 20:22:05 +00:00
Jerry Zhang
1b4b3c4e9b DO NOT MERGE: Add ScreenObserver
ScreenObserver allows system components to
monitor the screen lock state.

Bug: 68054513
Test: manual
Change-Id: I50f4690f68443f676d17e93efb1b7cb0857abd9e
2018-01-11 19:38:27 +00:00
Holly Jiuyu Sun
3d6b53c075 Add EuiccCardManager and EuiccCardController.
EuiccCardManager is in the same path with EuiccManager.
EuiccCardController is in the same path with EuiccController.
Use getAllProfiles() as an example interface.
The implementation of EuiccCard and its content will be added in a
follow up CL.
The new API is marked as @hide and TODO for @SystemApi.

Bug: 38206971
Test: test on phone
Change-Id: I153937c0f79bdd1a00b06b234a6e254a3f43072c
Merged-In: I153937c0f79bdd1a00b06b234a6e254a3f43072c
2018-01-11 10:30:43 -08:00
Badhri Jagan Sridharan
5e093d997a Merge "Overcome disconnect during oem override" 2018-01-11 17:53:11 +00:00
Treehugger Robot
08498c32f4 Merge changes I47ccfa99,I5db1de3e
* changes:
  Extract DNS setting logic into DnsManager class
  Add minimal test for setting DNS properties
2018-01-11 11:33:30 +00:00
Erik Kline
1742fe1309 Extract DNS setting logic into DnsManager class
In future, managing DNS-over-TLS hostname lookup and netd programming
can be encapsulated here.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 64133961
Change-Id: I47ccfa99c30c780524c45c4af605e720ccba34a0
2018-01-11 18:16:50 +09:00
Erik Kline
e89953b30f Add minimal test for setting DNS properties
Test: as follows
Change-Id: I5db1de3ee8e179edd56c93988b821242b81c2387
2018-01-11 18:16:20 +09:00
Treehugger Robot
639fe64ce0 Merge "Add checking permission at the setDataSaverModeEnabled()" 2018-01-11 05:52:59 +00:00
Treehugger Robot
4a352dd5e0 Merge "Move DhcpClient SM thread onto IpClient's SM thread" 2018-01-11 05:48:20 +00:00
Treehugger Robot
f9063b378b Merge "Add public ApnSetting in android.telephony." 2018-01-11 04:01:32 +00:00
Erik Kline
be83aebfeb Move DhcpClient SM thread onto IpClient's SM thread
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - basic wifi usage nominal
Bug: 62476366
Change-Id: I9a74e001bc86972e31b7e0898711628e65d9cf7a
2018-01-11 12:48:08 +09:00
Lorenzo Colitti
d6c3813c08 Merge "Move more core networking tests to framework/base/tests/net." 2018-01-11 03:09:40 +00:00
Treehugger Robot
6a91687bcd Merge "Refactor to InterfaceParams utility class" 2018-01-11 02:52:00 +00:00
Erik Kline
8bd00d5f7c Refactor to InterfaceParams utility class
NetworkInterface throws Exceptions every time you look at it askance.
Try to make something we instantiate fully, once, and pass it around.

Partial MacAddress-ification as well, for good measure.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - basic IPv6 tethering works
Bug: 32163131
Bug: 62476366
Change-Id: I16c145fddb4e76387370338d792a438eed886d7f
2018-01-11 09:47:40 +09:00
Badhri Jagan Sridharan
65a6237243 Overcome disconnect during oem override
Cherry-pick from 83a0d6fa57

While bootup, usb gets configured when the property triggers are
run. While in oemOverride, the current configuration is persisted
in sys.usb.<bootmode>.config. Do not reconfigure the stack if the
current configuration is same as the new configuration.

Bug: 64225494
Change-Id: Id35d110bf3fa8f58d05e14941716d4ad2b196f8d
2018-01-10 16:45:32 -08:00
Amit Mahajan
4c65254a0f Add new config for number of physical SIM slots on the device.
Test: Basic telephony sanity
Bug: 64131518
Merged-in: If393b144fd7280b11242caeb8bb4dc6a202f80ad
Change-Id: If393b144fd7280b11242caeb8bb4dc6a202f80ad
2018-01-10 15:54:10 -08:00
Holly Jiuyu Sun
47a7426ddd Add dependencies of EuiccCard.
Include EuiccNotification and EuiccRat.
Change EuiccRat to Parcelable.

Bug: 38206971
Test: unit test
Change-Id: Ifbe01e64b92ab0b042779487df4dd99159c5e3b8
2018-01-10 15:50:16 -08:00
Treehugger Robot
999d998fb0 Merge "Add API EuiccController#startOtaUpdatingIfNecessary" 2018-01-10 21:29:02 +00:00
Qingxi Li
8314fa72f2 Add API EuiccController#startOtaUpdatingIfNecessary
This function requests calling app has WRITE_EMBEDDED_SUBSCRIPTIONS
permission. It will check whether the OTA update needed to be done
first. If current eUICC OS isn't latest one and OTA needed to be
performed, it will update eUICC OS. When the OS update is started or
finished, a broadcast will be sent.

Bug: 37279356
Test: E2E
Merged-In: Iea86add4bdc01c79a8714af4b3a89735ba78ee74
Change-Id: Iea86add4bdc01c79a8714af4b3a89735ba78ee74
2018-01-10 12:01:13 -08:00
Treehugger Robot
54da93b981 Merge "Revert "Move zygote's seccomp setup to post-fork"" 2018-01-10 18:46:36 +00:00
Jack Yu
5e90553bcf Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity" 2018-01-10 18:39:53 +00:00
Jerry Zhang
90fddefd5e Merge "Revamp USB tethering startup flow." 2018-01-10 18:38:44 +00:00
Jerry Zhang
656a7bc06b Revamp USB tethering startup flow.
Modify usb tethering flow to no longer require
mUsbTetherRequested. The new simplified flow is:

1. Usb rndis function is set through UsbManager
2. Usb is configured with rndis enabled
3. We tether the USB interface
4. Usb is disconnected
5. We untether the USB interface

This allows USB tethering to be enabled through
either UsbManager or ConnectivityManager and aligns
the flow to be similar to other usb function services
such as MTP.

Bug: 62876645
Test: Enable and disable tethering through connectivity and with `svc
usb setFunction rndis`

Change-Id: Ica4203a499db177999302e099e28948b06ef2298
2018-01-10 18:38:33 +00:00
Treehugger Robot
d9b3322e88 Merge "Don't wait for Bluetooth when shutting down" 2018-01-10 18:19:03 +00:00
Myles Watson
da9a3d413b Don't wait for Bluetooth when shutting down
Bluetooth doesn't need to be shut down cleanly; shutting it down just
slows down the shutdown process.

Change-Id: I91fc9b26930a392f0c4462c76626a966051aea7b
Merged-In: Ic2ed89dd618806adc6646066ab0956dea4a94d8e
Bug: 70855323
Test: Boot, shut down, boot, shut down.
2018-01-10 18:15:51 +00:00
Victor Hsieh
fe6a51fcb5 Revert "Move zygote's seccomp setup to post-fork"
This reverts commit 6a4a339832.

Reason for revert: caused some SELinux error

Bug: 71768585
Change-Id: I0ef270ec6fed1d5d96b4257ec1a2dd6a55a816ed
Merged-In: Ic1b81e146b52b68445ba634de39657f199107da3
2018-01-10 17:22:55 +00:00
Jordan Liu
8098078edf Merge "Add precise disconnect cause in DisconnectCause" 2018-01-10 17:06:14 +00:00
Lorenzo Colitti
6fbb21a8dc Move more core networking tests to framework/base/tests/net.
Test: "runtest frameworks-net" passes except for already-failing IpConnectivityMetricsTest
Change-Id: I2a20d546089699ac67bc819f10a8fcd50c637ac4
2018-01-10 23:35:16 +09:00
Jack Yu
6cd44734b0 Added Cell identity for TD-SCDMA and a base class CellIdentity
Added CellIdentityTdscdma for TDS-CDMA cell identity. Also added
a base class for existing CellIdentityXxx so that the network
service can return specific RAT cell identity through the
network service callback API which takes generic cell identity
as the parameter.

This is the preliminary change for IWLAN refactoring since cell
identity is part of the CS/PS network registration.

bug: 64132030
Test: Unit tests
Change-Id: I3ca405d687667b6c43e782339edec26a6f6edfc9
2018-01-10 01:37:04 -08:00
Holly Jiuyu Sun
b01bd54b11 Merge "Merge EuiccProfile into EuiccProfileInfo." 2018-01-10 05:21:35 +00:00
yuemingw
9361a1394c Add public ApnSetting in android.telephony.
Bug: 68208293
Test: manual

Add public ApnSetting class in android.telephony. Move APN TYPE constants out from
PhoneConstants into public ApnTypeConstants.

Design doc: https://docs.google.com/document/d/1UEYjhRGSEwwccPLs_FzFD-IeOsVq63gxmAHNtDfnzAY/edit?pli=1#

Change-Id: I74d23644a872df0abc19730285ae196b6e3e39dd
2018-01-10 03:17:05 +00:00
Treehugger Robot
e1bdd513d0 Merge "Check null before calling clone()" 2018-01-10 03:07:26 +00:00
Treehugger Robot
0cb936a855 Merge "Exposed CDMA SID/NID get APIs" 2018-01-10 02:19:20 +00:00
Treehugger Robot
f448371208 Merge "Remove obsolete workaround." 2018-01-10 01:24:41 +00:00