Commit Graph

384085 Commits

Author SHA1 Message Date
Patrick Huang
fd5caa2de4 Merge "Document permissions for euicc privileged actions."
am: 7e2e333769

Change-Id: Ief36f070adf466447ec676487817f21d550b5527
2019-03-20 18:52:41 -07:00
Treehugger Robot
7e2e333769 Merge "Document permissions for euicc privileged actions." 2019-03-21 01:41:23 +00:00
Jack He
af14ccdd09 Merge "Bluetooth: Add event_value to BluetoothClassicPairingEventReported"
am: 9c7fb4566d

Change-Id: I7142e2c751b014662ab4af5e2d516a96ee034725
2019-03-20 17:46:19 -07:00
Howard Chen
c48af5916b Merge "Support starting gsid lazily"
am: 4108388601

Change-Id: I5f6a9e3492cf41c2681297ce770310cda862de3d
2019-03-20 17:40:44 -07:00
Treehugger Robot
9c7fb4566d Merge "Bluetooth: Add event_value to BluetoothClassicPairingEventReported" 2019-03-21 00:33:08 +00:00
Colin Cross
0783f2d300 Merge "Dist aapt2 protos"
am: b602193169

Change-Id: I07d5c0307cf8faa03f0869e78b3a548f171ad6b0
2019-03-20 17:31:27 -07:00
Howard Chen
4108388601 Merge "Support starting gsid lazily" 2019-03-21 00:28:31 +00:00
Treehugger Robot
b602193169 Merge "Dist aapt2 protos" 2019-03-21 00:07:21 +00:00
Jack Yu
6c1815ac79 Merge "API review feedback changes"
am: 84ea11384d

Change-Id: I37c4f558d313d3ea7f201633273dc53f6ffd128c
2019-03-20 16:36:19 -07:00
Treehugger Robot
84ea11384d Merge "API review feedback changes" 2019-03-20 23:22:20 +00:00
Shuo Qian
c9da35e296 Merge "Add Prefix per Carrier requirement"
am: 592e9abb0b

Change-Id: I84cae8e10cd495d2504f6dddba0f622b8c3b49a0
2019-03-20 15:57:24 -07:00
Shuo Qian
592e9abb0b Merge "Add Prefix per Carrier requirement" 2019-03-20 22:44:59 +00:00
Patrick Huang
dafb87c957 Document permissions for euicc privileged actions.
Bug: 128317064
Test: Test on phone
Change-Id: I285597e48e97f1b4ffe4b4eb4ac68010905f4e1f
Merged-In: I285597e48e97f1b4ffe4b4eb4ac68010905f4e1f
2019-03-20 15:35:14 -07:00
sqian
108cb12a6a Add Prefix per Carrier requirement
Some carrier requires if users dial an emergency number address with
some prefix, the combination of the prefix and the address is also a
valid emergency number to dial.

Bug: 122429213
Test: Treehugger
Change-Id: Ib9b96bb0a210aba64a8652984d22f3564813fa9d
Merged-In: Ib9b96bb0a210aba64a8652984d22f3564813fa9d
(cherry picked from commit 69f48c5e90)
2019-03-20 14:16:14 -07:00
Jack Yu
1b9eafb4f4 API review feedback changes
Made the follwing changes based on API council review
feedback

1. Made the class and its Builder class final
2. Removed methods that should not be in the builder
3. Changed the return type of available services
   from array to list.

Test: Unit tests
Bug 127657991

Merged-In: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
Change-Id: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
(cherry picked from commit 20d71403b8)
2019-03-20 14:08:27 -07:00
Brad Ebinger
ec6bf56d64 Merge "Make ImsException final"
am: cdc0da732d

Change-Id: Ic2aafb555b69398852409fc80f6ace5f0f92d1dc
2019-03-20 13:29:07 -07:00
Brad Ebinger
cdc0da732d Merge "Make ImsException final" 2019-03-20 20:10:32 +00:00
Steven Moreland
bfed6db4e1 Merge "Remove telephony-common classes."
am: 6d77176920

Change-Id: I04c352cc56f66b06142c9a94f0b7ca7d51b26195
2019-03-20 11:46:35 -07:00
Pengquan Meng
ffddf67508 Merge "[API feedback] fixed API for NR"
am: 7afba9e583

Change-Id: I703b745d276171f57092668d502441d45ae6ded6
2019-03-20 11:42:00 -07:00
Steven Moreland
6d77176920 Merge "Remove telephony-common classes." 2019-03-20 18:30:10 +00:00
Pengquan Meng
7afba9e583 Merge "[API feedback] fixed API for NR" 2019-03-20 18:22:16 +00:00
Pengquan Meng
546c24ccb6 [API feedback] fixed API for NR
This CL included the follow change:
1. Change getPreferredNetworkTypeBitmap to
getPreferredNetworkTypeBitmask [b/126552419]
2. Change setPreferredNetworkTypeBitmap to
setPreferredNetworkTypeBitmask [b/126552419]
3. Add @IntRange annonation to CellIdentityNr.getNrarfcn() [b/126552419]

4. In javadoc, explain the acronym NR to say: (New Radio 5G)
[b/126552559]

5. Mark CellInfoNr.getCellSignalStrength and CellInfoNr.getCellIdentity
    as @NonNull [b/126699572]

6. Mark CellIdentityNr.getMncString() and CellIdentityNr.getMccString()
    as @Nullable [b/126702744]

Bug: 126552419
Bug: 126552559
Bug: 126699572
Bug: 126702744
Test: build
Merged-In: I133075a3688c3fa7550c8a2f43bc13d8b25999b2
Change-Id: I133075a3688c3fa7550c8a2f43bc13d8b25999b2
2019-03-20 11:19:21 -07:00
Steven Moreland
48b058ef41 Merge "pm: SharedLibraryInfo: toString closing bracket"
am: 05a8e0b44c

Change-Id: I373baed1fdd987bef7dafdbabacb86a0ef6cfbc0
2019-03-20 11:06:08 -07:00
Chen Xu
a05023c222 Merge "improve mism support for phonestatelistner"
am: ed4d220c97

Change-Id: If09726fbd0bf82fdbe2da884d97d9b78089eb1ac
2019-03-20 10:55:57 -07:00
Treehugger Robot
05a8e0b44c Merge "pm: SharedLibraryInfo: toString closing bracket" 2019-03-20 17:51:00 +00:00
Chen Xu
ed4d220c97 Merge "improve mism support for phonestatelistner" 2019-03-20 17:32:37 +00:00
chen xu
2506ceb71e improve mism support for phonestatelistner
1. throw exception if reuse the same listner for different sub
2. subId should come from TM instance not phonestateListener.
3. refactor settings to apply phonestatelistner with TM instances

Bug: 117555407
Test: Manual
Change-Id: I1af07798d7982575cccc27462af179182c033409
(cherry picked from commit 0ebc9b67e9)
Merged-in: I1af07798d7982575cccc27462af179182c033409
2019-03-20 09:39:06 -07:00
Jack He
3b25983447 Bluetooth: Add event_value to BluetoothClassicPairingEventReported
* Add an event_value field to log status value such as
 - encryption enabled state
 - simple pairing mode
 - secure connection host support
 - delete all flag

Bug: 128966402
Test: make
Change-Id: I512b7a1a7fba73ea30bca028566d43d353c56613
2019-03-20 04:05:17 -07:00
Lorenzo Colitti
be2028471f Merge changes from topic "framework-no-networkstack-aidl"
am: 74867d1661

Change-Id: I13ba3cb016a63353cfa62a61106d16e30eff0076
2019-03-20 03:18:47 -07:00
Lorenzo Colitti
bc1d9ded1a Move TcpKeepalivePacketData out of the framework.
am: a3f811a547

Change-Id: I7657e6827299ad398bc16bc792150fd901226b4d
2019-03-20 03:11:11 -07:00
Lorenzo Colitti
faa074ebbe Stop using netd parcelables in the framework.
am: b90ad24f99

Change-Id: Ic4ac445c582ff8b55d253d99de6750d250e9d9e5
2019-03-20 03:03:27 -07:00
Lorenzo Colitti
74867d1661 Merge changes from topic "framework-no-networkstack-aidl"
* changes:
  Remove the framework dependency on netd_aidl_parcelables-java.
  Move TcpKeepalivePacketData out of the framework.
  Stop using netd parcelables in the framework.
2019-03-20 09:45:37 +00:00
Lucas Lin
4e7830d866 Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page"
am: 1a80ff943d

Change-Id: Ief7b9c8f172fa3ad5a1143d998d455797c1bf937
2019-03-20 00:07:59 -07:00
Lucas Lin
1a80ff943d Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page" 2019-03-20 06:53:26 +00:00
Jack Yu
55e73c27a8 Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"
am: 936c536bba

Change-Id: I8142e09fbee353c95a4b429e8d1bc7365aa5863e
2019-03-19 23:42:34 -07:00
Jack Yu
936c536bba Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" 2019-03-20 06:30:53 +00:00
Remi NGUYEN VAN
72841b4287 Merge "Add documentation for CaptivePortal APP_RETURN_*"
am: 31e3f2e734

Change-Id: Idc55c5c729e2a66ad845dbc8ddaf97580c7ae8cc
2019-03-19 22:53:43 -07:00
Remi NGUYEN VAN
31e3f2e734 Merge "Add documentation for CaptivePortal APP_RETURN_*" 2019-03-20 05:40:41 +00:00
Sasha Smundak
3c611bc533 Merge "Convert tests/**/Android.mk files to Android.bp, part II"
am: e1f19a6ef9

Change-Id: I036b1a4ccb3e09132a9eb51aa579db58d2e7809d
2019-03-19 21:25:31 -07:00
Treehugger Robot
e1f19a6ef9 Merge "Convert tests/**/Android.mk files to Android.bp, part II" 2019-03-20 01:18:56 +00:00
Remi NGUYEN VAN
39e5f3feaf Merge "Add Parcelable implementation for ApfCapabilities"
am: cea27f4327

Change-Id: I218b583755259a8c0824777c3247a090bdbd348b
2019-03-19 17:51:34 -07:00
Remi NGUYEN VAN
cea27f4327 Merge "Add Parcelable implementation for ApfCapabilities" 2019-03-20 00:34:53 +00:00
Lorenzo Colitti
a3f811a547 Move TcpKeepalivePacketData out of the framework.
This class is not used in framework.jar, only in services.jar.
Move it out of the framework so framework.jar can stop depending
on the NetworkStack stable AIDL interfaces.

This should really under com.android.server as well, but that's
a cross-project change to be done in another CL.

Test: m
Bug: 128804404
Change-Id: Ib2805f7fcc516a5f6989c252365d1c95b8042703
Merged-In: Ib2805f7fcc516a5f6989c252365d1c95b8042703
2019-03-20 08:56:31 +09:00
Lorenzo Colitti
9a4ae2c3f1 Remove the framework dependency on netd_aidl_parcelables-java.
In its own change because it conflicts in internal master.

Test: m
Bug: 128804404
Change-Id: I74531ef11d504b232d4f377532d5e0812dbc88db
Merged-In: I74531ef11d504b232d4f377532d5e0812dbc88db
2019-03-20 08:56:31 +09:00
Lorenzo Colitti
b90ad24f99 Stop using netd parcelables in the framework.
The only actual users of these classes are in services.jar, not
in frameworks.jar. The only reason the framework depends on them
is that the code that converts to and from stable parcelables is
currently in the framework. Move that code to services and cut
the dependency.

These classes aren't used in the networkstack app so they don't
need to be in shared. They also can't be in shared because the
classes are not in the SDK. So put the conversion functions
directly inside their only user (NetworkManagementService).

Also remove the jarjar rules that rename the classes for use by
the NetworkStack app.

This does not actually remove the dependency from the build file,
that will be done in a future CL.

Bug: 128804404
Test: builds, boots
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest HostsideVpnTests
Change-Id: I027d50ba56091f5558f45e6e08f32e5912b2a82a
Merged-In: I027d50ba56091f5558f45e6e08f32e5912b2a82a
2019-03-20 08:56:24 +09:00
Cody Kesting
0b0d934919 Merge "Add class comment to avoid extending ServiceState class."
am: f0a67227c4

Change-Id: Ie643f2f1292df7491c9d800127e0c81bc70fc605
2019-03-19 16:52:15 -07:00
Cody Kesting
f0a67227c4 Merge "Add class comment to avoid extending ServiceState class." 2019-03-19 23:33:40 +00:00
Andreas Gampe
782ae5139d Merge "Zygote: Load system server code early"
am: f039816600

Change-Id: I0a2895b64d3a505c3de8e6dfe24a861cc1e38fec
2019-03-19 14:49:48 -07:00
Brad Ebinger
264915fd18 Make ImsException final
Bug: 128902253
Test: atest FrameworksTelephonyTests
Change-Id: I88058f8382978163718de8194249fad87ae52d10
2019-03-19 14:48:37 -07:00
Chenbo Feng
c059f56e0f Merge "Add uid information in PackageListObserver"
am: 62e041a6dd

Change-Id: I4fef26fed802902d6a69563c19704a94916ff834
2019-03-19 14:42:14 -07:00