Commit Graph

92646 Commits

Author SHA1 Message Date
Neil Fuller
894b41c3f8 Merge "Track move of timezone classes to libcore.timezone" am: bfd3237eac
am: 0f2e3d68be

Change-Id: Ia88ee2fae4d3c21f2b7b96513bc4e276df13bc28
2018-11-26 15:46:42 -08:00
Jordan Liu
5333436303 Merge "Expose ApnService as a SystemApi and use subId arg" am: 0e706db965
am: 6a0161a184

Change-Id: Ia1abe2d229a034ba0a77ac3dd7034ff3c13dde55
2018-11-26 15:40:03 -08:00
Neil Fuller
bfd3237eac Merge "Track move of timezone classes to libcore.timezone" 2018-11-26 23:04:33 +00:00
Jordan Liu
0e706db965 Merge "Expose ApnService as a SystemApi and use subId arg" 2018-11-26 22:47:52 +00:00
Benedict Wong
03c6d371aa Merge changes from topic "xfrmi-support" am: f928c1e4b9
am: bc33474522

Change-Id: I13a826f5ae3c4cb700be789b369848685da1bc41
2018-11-25 19:26:26 -08:00
Benedict Wong
f928c1e4b9 Merge changes from topic "xfrmi-support"
* changes:
  Cleanup and update comments SA mark disabling comments
  Add XFRM-I support to IpSecService
  Disable attempted updating of SA marks
2018-11-26 03:04:16 +00:00
David Brazdil
7149b1e88c Merge "Create AppComponentFactory.instantiateClassLoader API" am: 67c6ab38ba
am: 060ec73ff2

Change-Id: I7c9f5fa3a9b1992b79cb26f77d03fddbf1ec6ff2
2018-11-22 03:50:07 -08:00
David Brazdil
67c6ab38ba Merge "Create AppComponentFactory.instantiateClassLoader API" 2018-11-22 11:09:15 +00:00
Neil Fuller
69ffbd67c2 Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Exempt-From-Owner-Approval: Trivial import change
Merged-In: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
Change-Id: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
(cherry picked from commit 164394db8e)
2018-11-22 09:57:12 +00:00
Chen Xu
f54b45c68b Merge "integrate carrier id to carrier config" am: cc37384e58
am: 9a93149dab

Change-Id: If10abd107b6cf8f07819993fdcbee58328034ab3
2018-11-21 21:32:11 -08:00
Chen Xu
cc37384e58 Merge "integrate carrier id to carrier config" 2018-11-22 05:06:55 +00:00
chen xu
d95965ae1b integrate carrier id to carrier config
add carrierId and preciseCarrierId in CarrierIdentifier
which will be passed to carrier service to decide which carrier
info to look up

Bug: 110559381
Change-Id: I1b4a44dd32148ebdf5aa437c5938cb89656c27c2
Merged-in: I1b4a44dd32148ebdf5aa437c5938cb89656c27c2
2018-11-21 17:29:43 -08:00
Benson Li
66ba8e8dbc Merge "HFP: Send caller ID in +CLIP command (1/4)" am: 6c4c8aeb70
am: d09c0d88e4

Change-Id: Ic628b5d6b3e4062388523f008ad4257c27bae71d
2018-11-21 13:22:43 -08:00
Treehugger Robot
6c4c8aeb70 Merge "HFP: Send caller ID in +CLIP command (1/4)" 2018-11-21 20:21:19 +00:00
Benedict Wong
781dae6306 Add XFRM-I support to IpSecService
This change adds support for XFRM-I to all IpSecService netd calls.
Fallback logic is in netd, and thus both VTI and XFRM-I parameters are
always passed down to IpSecService.

Bug: 78589502
Test: All java, CTS tests passing
Change-Id: Ie4186f0ad7e50763b21831f6fa411b5ee436de78
2018-11-21 08:34:54 -08:00
Benedict Wong
ab80e1fb30 Disable attempted updating of SA marks
SA marks are never updated during the UPDSA call. This change disables
the attempts to update the specified SAs, ensuring that the config
stored in IpSecService matches that of the allocated kernel resources.

Bug: 111854872
Test: Unit, CTS tests passing
Change-Id: Ic1fb862c8021ffa260c3e262ec698d8af0a826d9
2018-11-21 08:34:54 -08:00
Neil Fuller
f35dd4fa6c Merge "API for retrieving time zone IDs by country" am: 4492ec573a
am: b5ab9c2e1f

Change-Id: I69b477e36d760e5d06c232fc7fd0891d98dd52b6
2018-11-21 07:55:55 -08:00
Neil Fuller
4492ec573a Merge "API for retrieving time zone IDs by country" 2018-11-21 15:18:27 +00:00
Jack Yu
af2218bde6 Merge "Move hidden APIs into system APIs" am: 860d8d0d80
am: c3375240ba

Change-Id: Ibe6fa27d99791e57b1253a9dc990de0706b52fb6
2018-11-20 19:04:24 -08:00
Jack Yu
860d8d0d80 Merge "Move hidden APIs into system APIs" 2018-11-21 02:40:30 +00:00
Hansong Zhang
a7063f1830 Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" am: 215a48cff4
am: 652dffda0b

Change-Id: I7ea71f54d211bf4656472b9a40cd6996507eaa18
2018-11-20 18:23:10 -08:00
Treehugger Robot
215a48cff4 Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" 2018-11-21 01:58:32 +00:00
Stanley Tng
56f272547f Merge "Enable the Debug Logs for Hearing Aids Profile" am: 7271c452a9
am: b6987e3c3c

Change-Id: I4708bea946177b47beb78845a49f082df96e7ede
2018-11-20 17:43:46 -08:00
Treehugger Robot
7271c452a9 Merge "Enable the Debug Logs for Hearing Aids Profile" 2018-11-21 01:20:02 +00:00
Andrew Solovay
8a30c09238 Merge "docs: Removing @see link to hidden field" into pi-dev
am: 807672ac4f

Change-Id: If1d5759ea1f2fe0656e298c2d67d3f817158ebba
2018-11-20 11:08:29 -08:00
Neil Fuller
6caa954ead API for retrieving time zone IDs by country
New method has been requested by Setup Wizard.

Test: CTS: run cts-dev -m CtsUtilTestCases -t android.util.cts.TimeUtilsTest
Bug: 116544863
Merged-In: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9
Change-Id: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9
(cherry picked from commit f9bb2d8f02)
2018-11-20 10:59:18 +00:00
Yuanjia Hsu
183271d1d2 Merge "Modify feature flag of Personal Safety" am: b4a197ca39
am: 4f4e52c1b9

Change-Id: Iebde195a7f6fd86cae357169fae76368df9727b4
2018-11-19 23:12:33 -08:00
Yuanjia Hsu
b4a197ca39 Merge "Modify feature flag of Personal Safety" 2018-11-20 06:39:55 +00:00
Hung-ying Tyan
c3f416b6cd Merge "Allow all system configs in /product" am: eca4c3a0d6
am: 0601a2a886

Change-Id: I4822a4cfddc768fd210f0fe74cf2345f88b0a1b7
2018-11-19 20:09:55 -08:00
Treehugger Robot
eca4c3a0d6 Merge "Allow all system configs in /product" 2018-11-20 03:45:37 +00:00
Eugene Susla
6b833a4df8 Merge "Remove exclusive OWNERS for BitUtils" am: 26aff41aa5
am: 60e62c4e20

Change-Id: I5ff9051230f1f24277f8c864ab99a400accd4c3d
2018-11-19 17:44:39 -08:00
Jordan Liu
2f2dd0a6e1 Expose ApnService as a SystemApi and use subId arg
IApnSourceService#getApns now takes a subId argument, and can be
implemented by extending ApnService.

Bug: 113075153
Test: unit tests and manual
Change-Id: I0202c1f0529ecef558f06a9f8a90a3906912f2f0
Merged-In: I9cfcf977c20f33abd2d773393780f9e54d75fe21
2018-11-19 17:26:09 -08:00
Treehugger Robot
26aff41aa5 Merge "Remove exclusive OWNERS for BitUtils" 2018-11-20 01:20:44 +00:00
Etan Cohen
5faec91513 Merge "Add IPv6 link-local address generation from EUI-48" am: a2a9df3e3a
am: 674479afe5

Change-Id: I63de4fa185649d9389a771860c479899e90b37e4
2018-11-19 16:48:22 -08:00
Andrew Solovay
6fe332c07e docs: Removing @see link to hidden field
Docs had contained a @see link to #FIRST_SDK_INT , but that field
had a @hide directive, so the @see link resulted in an error message
in the output.

Doc staged to:

http://go/dac-stage/reference/android/os/Build.VERSION#SDK_INT

Bug: 80445154
Test: make ds-docs
Change-Id: Id8d461c517bd4d8b3c49b61da37ec0a16768a63d
Exempt-From-Owner-Approval: Doc-only change
2018-11-19 23:02:47 +00:00
Jack Yu
4f956e0fca Move hidden APIs into system APIs
To allow vendor code to construct LinkAddress, which is
one of the parameter in the system API DataCallResponse.

Test: Build
Bug: 73659459
Merged-In: I3e203781d3a03285fa0e047cc8837ccb4a09016a
Change-Id: I3e203781d3a03285fa0e047cc8837ccb4a09016a
2018-11-19 14:40:13 -08:00
Eugene Susla
a931f9eec0 Remove exclusive OWNERS for BitUtils
BitUtils is a fairly generic place where all framework engineers should
be able to contribute reusable code.

Test: test after merge in gerrit UI
Change-Id: Ibd00f0618e3e85aab466cedc43605115994cca4f
2018-11-19 14:38:12 -08:00
David Brazdil
b319ccfdcc Create AppComponentFactory.instantiateClassLoader API
Adds a hook to AppComponentFactory to allow control over the
instantiation of the main app class loader. LoadedApk creates
the default class loader and uses it to load the base APK. If
AppComponentFactory is declared in the manifest, its new method
instantiateClassLoader is called and its result becomes the
class loader used by LoadedApk to instantiate other classes
declared in the manifest. By default this is simply the class
loader created by LoadedApk.

Second method provides AppComponentFactory with a copy of
ApplicationInfo. The factory otherwise cannot locate any of the
app's resources, including its APK or the data folder.

Bug: 111342996
Test: atest CtsClassLoaderFactoryPathClassLoaderTestCases
Test: atest CtsClassLoaderFactoryInMemoryDexClassLoaderTestCases
Merged-In: Id21d9afaf00b9cb64a107bc9893b952407cff0b5
Change-Id: Id21d9afaf00b9cb64a107bc9893b952407cff0b5
(cherry picked from commit fd6dcc21d9)
2018-11-19 17:47:13 +00:00
yuanjiahsu
2c69b0b487 Modify feature flag of Personal Safety
1.Remove feature flag and let Emergency Dialer Shortcut feature always
enabled.
2.Add feature flag for Safety Hub (the bug ID to clean up this feature flag is b/118848485).

Test: Manually
Bug: 117128459
Bug: 118809382
Change-Id: I0a3819629bc579d93c682451abdf271d0b36bf59
2018-11-19 13:12:28 +00:00
Etan Cohen
a8923c5aea Add IPv6 link-local address generation from EUI-48
Add a utility method to convert an EUI-48 to an IPv6 link-local
address based on RFC 4291 (EUI-64 generation) followed by RFC 4862.

Bug: 117605977
Test: atest MacAddressTest
Merged-In: I80b683e69da6beff3b37fc345fc15aa9610d09b7
Change-Id: I80b683e69da6beff3b37fc345fc15aa9610d09b7
2018-11-16 21:50:24 -08:00
Sahin Caliskan
661f548304 Merge "Fix RcsManager and add empty RcsThread class" am: 170c382729
am: 28534639bc

Change-Id: Iac6549fc8216edd7b6f6469f3bf4bc1a06432cd2
2018-11-16 09:59:24 -08:00
Sahin Caliskan
170c382729 Merge "Fix RcsManager and add empty RcsThread class" 2018-11-16 17:29:49 +00:00
Lorenzo Colitti
664145dcbc Merge changes from topic "sort stats" into pi-dev
* changes:
  Change types of fields of network stats reported to framework.
  Fix negative uid stats caused by 464xlat adjust when eBPF is on.
2018-11-16 13:29:38 +00:00
Nicolas Geoffray
ec901b3133 Merge "Make shared library dependencies explicit in SharedLibraryInfo" am: 550b5e68c1
am: a835f23f47

Change-Id: I63fc21a422d00a38f15116c06af9b1342d36f773
2018-11-16 02:42:18 -08:00
Nicolas Geoffray
550b5e68c1 Merge "Make shared library dependencies explicit in SharedLibraryInfo" 2018-11-16 10:20:46 +00:00
Peter Collingbourne
ceebc76cb2 Merge "Preserve x18 while preloading SP-HALs in the zygote." am: 23fd045842
am: e03a81cce8

Change-Id: I577e0964abbf758234af6f80dcc69a55ee57d736
2018-11-15 16:10:08 -08:00
Peter Collingbourne
23fd045842 Merge "Preserve x18 while preloading SP-HALs in the zygote." 2018-11-15 23:38:36 +00:00
Sahin Caliskan
1256486a8f Fix RcsManager and add empty RcsThread class
This change fixes the RcsManager setup and adds an empty RcsThread class. Please see go/rcs-in-telephony-doc for details.

Test: Builds fine
Bug: 109759350
Merged-in: Ie3fe476ab11d515ffab6dcc6ccf5ec801a4c9057
Change-Id: Ie3fe476ab11d515ffab6dcc6ccf5ec801a4c9057
2018-11-15 23:28:24 +00:00
Nicolas Geoffray
5e498b087a Make shared library dependencies explicit in SharedLibraryInfo
bug: 112405321
Test: boots, PackageParserTest
(cherry picked from commit 10b0779df8)

Change-Id: I506cdfdf0d2cb7948eacd3e2658d187f6259f4b9
Merged-In: I591c29f72ad95b2a8adb4a2242f1e764e0e29007
2018-11-15 20:31:31 +00:00
Stanley Tng
420a0eb576 Enable the Debug Logs for Hearing Aids Profile
Bug: 119617521
Test: Compile
Change-Id: I40de1fcb3ca9e0ee66b4650a161f3735722df7ed
2018-11-15 10:22:07 -08:00