Commit Graph

95610 Commits

Author SHA1 Message Date
Rahul Sabnis
5414c1705e Merge "Refactor BluetoothAdapter APIs used by Settings"
am: 8ab35ca19d

Change-Id: I2f6d45fcb3d5c32b15722e37bd25d9c3a2f81dc5
2019-11-07 10:48:03 -08:00
Treehugger Robot
8ab35ca19d Merge "Refactor BluetoothAdapter APIs used by Settings" 2019-11-07 18:18:37 +00:00
James Lin
b815ee2bb9 Merge "[RCS] Create AIDL layer for RcsUceAdapter, create RCS UCE controller implementation in Telephony."
am: 303c5dc0fb

Change-Id: Ibcd4e3ab7c60c1446019d652e5603b02ca9f34b2
2019-11-06 19:33:36 -08:00
James Lin
303c5dc0fb Merge "[RCS] Create AIDL layer for RcsUceAdapter, create RCS UCE controller implementation in Telephony." 2019-11-07 03:26:08 +00:00
Bill Lin
42a049c287 Merge changes from topic "apex_migration"
am: 8eacf37ef3

Change-Id: If897274a7d2b9258142a55a628525821d713af4b
2019-11-06 18:30:09 -08:00
Bill Lin
8eacf37ef3 Merge changes from topic "apex_migration"
* changes:
  Clean up generatePackageInfoFromApex() API
  Populate error message if apexd.markStagedSessionReady fails
  Populate error message if apexd verification fails
  Make ApexManager an abstract class
  Don't use ApexInfo.packageName in StagingManager
2019-11-07 02:04:49 +00:00
Oli Lan
1138012b54 Clean up generatePackageInfoFromApex() API
This changes the API for generatePackageInfoFromApex in PackageParser
in response to review suggestions made in ag/6701090.

The method is renamed to generatePackageInfo with a PackageParser.Package
parameter (as well as an ApexInfo and flags). The implementation is combined
with the main generatePackageInfo method. Callers are changed to perform
the parsing themselves, including the collection of certificates if
necessary.

Note: the method signature and implementation had already changed since
ag/6701090, so the suggestions from that CL may not apply directly.

Bug: 129261524
Test: atest PackageParserTest
Test: atest CtsStagedInstallHostTestCases

Change-Id: Iee213e025583c2201ff9d65c447e4278b925a2f0
Merged-In: I495539679812110f89d5e3d93f2622ba2dab36c0
(cherry picked from commit c2c7a22333)
2019-11-06 23:15:21 +08:00
Hans Boehm
c83c344516 Merge "Add disclaimer to Debug.getRuntimeStat()"
am: 52218ffa3b

Change-Id: I45361fdf486f29c9172b1e478b027142b6e8f6ce
2019-11-06 03:23:52 -08:00
Treehugger Robot
52218ffa3b Merge "Add disclaimer to Debug.getRuntimeStat()" 2019-11-06 11:06:43 +00:00
Chen Xu
54aba99636 Merge "new telephony annotation class"
am: 386027afdd

Change-Id: I0bbea6ae204a899f050c146e1d528eee246a27f3
2019-11-04 16:32:32 -08:00
Amit Mahajan
41f6ef08ba Merge "Create @SystemApi CarrierMessagingServiceWrapper."
am: 4ae457ad9d

Change-Id: Ibce5805d4f4ad4781f42d936cf13381e86d69512
2019-11-04 16:19:03 -08:00
Chen Xu
386027afdd Merge "new telephony annotation class" 2019-11-04 23:29:39 +00:00
Amit Mahajan
4ae457ad9d Merge "Create @SystemApi CarrierMessagingServiceWrapper." 2019-11-04 22:54:58 +00:00
Rahul Sabnis
644d3dd923 Refactor BluetoothAdapter APIs used by Settings
Bug: 143238544
Test: Manual
Change-Id: Ia831d2b4b628b746493602857bcb54b585f13e12
2019-11-04 21:55:54 +00:00
Chen Xu
7631ff7c48 new telephony annotation class
This is a preparatory work for mainline. since Intdef is hidden, so we
have to move some annotations (applied in SDK/system API) to a separate
annotation class and having other module statically link to it.

TODO: include telephony annotation in framework-non-updatable-sources

Bug: 140908357
Test: Build
Change-Id: I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1
(cherry picked from commit c9d4ee112e)
Merged-in: I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1
(cherry picked from commit 4712711d3d91621083bf92f5a1647b92c20a8b81)
2019-11-04 21:26:50 +00:00
Amit Mahajan
02e56cc0ba Create @SystemApi CarrierMessagingServiceWrapper.
This is primarily a wrapper over ICarrierMessagingService
that to create a stable API to communicate with CarrierMessagingService.

Test: basic messaging sanity
Bug: 143609473
Merged-in: I67fda8bab3902b358c483f992633dbdfe3a8cda2
Change-Id: I67fda8bab3902b358c483f992633dbdfe3a8cda2
(cherry picked from commit 92642659e8)
2019-11-04 12:44:01 -08:00
Jordan Liu
43b6116549 Merge "Expose Context.sendOrderedBroadcast with appop"
am: 08a94a2236

Change-Id: I8dd6fe3a9a70eba9d95cfd1e4cefd14c4ba376ed
2019-11-04 12:20:47 -08:00
Jordan Liu
08a94a2236 Merge "Expose Context.sendOrderedBroadcast with appop" 2019-11-04 19:59:28 +00:00
Chen Xu
44d0c2a7dc Merge "new TelephonyRegistryManager"
am: 7a79194fcb

Change-Id: I89e60de64c4c3b8b760413c136241b6c9c0fc98f
2019-11-04 10:35:20 -08:00
Chen Xu
7a79194fcb Merge "new TelephonyRegistryManager" 2019-11-04 18:21:51 +00:00
James.cf Lin
2bc9cd4c6c [RCS] Create AIDL layer for RcsUceAdapter, create RCS UCE controller implementation in Telephony.
Bug: 139260938
Test: Manual
Change-Id: I9f70c8fe4167b51fa82bfb68ae9eacc422194309
2019-11-04 21:04:01 +08:00
Martijn Coenen
d4d27b403c Merge "Don't hold sProxyLock while retrieving interface descriptors."
am: ef6fe13c77

Change-Id: Ie54978b2f19e42c47992e04c2f41c55d8c61df5b
2019-11-04 00:13:53 -08:00
Martijn Coenen
ef6fe13c77 Merge "Don't hold sProxyLock while retrieving interface descriptors." 2019-11-04 07:51:11 +00:00
Jordan Liu
a32e6fcb03 Expose Context.sendOrderedBroadcast with appop
Bug: 143100231
Test: atest ContextTest#testSendOrderedBroadcastWithAppOp
      atest ContextTest#testSendOrderedBroadcastWithAppOp_NotGranted

Change-Id: Ia75d0db11f337769eaf3cf5436e09a7d38b0564c
Merged-In: Ia75d0db11f337769eaf3cf5436e09a7d38b0564c
2019-11-01 16:25:15 -07:00
Chen Xu
1f1c25e815 new TelephonyRegistryManager
today telephonyRegistry lives in system process
this is intended to persists all telephony listeners when
phone process crash. Telephony today notify system server by
using AIDL APIs directly. Instead, we are exposing a proper API
surface: telephonyRegistryManager where only phone app and
carrier privileged apps are allowed to use APIs in
TelephonyRegistryManger to notify telephony related status update.

Bug: 140908357
Test: Build & Manaul
Change-Id: I1b750751148925b4a7bd94553318907654012fc1
(cherry picked from commit 288b71c8c1)
Merged-in: I1b750751148925b4a7bd94553318907654012fc1
2019-11-01 22:44:36 +00:00
Remi NGUYEN VAN
7919e04f5b Merge "Add API to set the sll_protocol on PacketSocket"
am: 0d6c308c39

Change-Id: I203f26229dcd580704665f7a07a391facef49a17
2019-10-31 21:50:40 -07:00
Remi NGUYEN VAN
0d6c308c39 Merge "Add API to set the sll_protocol on PacketSocket" 2019-11-01 04:34:44 +00:00
TreeHugger Robot
abc015499a Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master 2019-10-31 18:38:40 +00:00
Phil Weaver
f4d1789b81 Merge "a11y: don't crash the system when illegal component name encounted" 2019-10-31 01:29:30 +00:00
Xin Li
6f48900f50 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
2019-10-30 14:33:01 -07:00
Ruoyao Liu (刘若尧)
51038e8b3c Add API to set the sll_protocol on PacketSocket
Problem & Root cause:
the mInterfaceBroadcastAddr.sll_protocol is not assigned when the
interface initializes, sll_protocol is 0x0000 by default.
This causes packets to be filtered incorrectly in packet capture,
typically with tcpdump. The previous API is used by DhcpClient, causing
DHCP tx messages to not be recognized properly.

Background: inside the kernel packets carry both an ethertype metadata
(skb->protocol) and may also carry a real ethertype in the mac header.

Previously skb->protocol would be inherited from the socket either from
the protocol from socket() creation or from bind().  This was zero,
so skb->protocol would end up 0, even though the DHCP packets we actually
wrote would have the right on-the-wire ethertype populated in the bytes
passed to send().

As such DHCP packets would look correctly on the wire, but were lacking
the skb->protocol metadata to correctly tag them as IPv4.

This results in 'tc' and packet hooks potentially not triggering
correctly, and can thus result in tcpdump 'ipv4' filters discarding
these packets leading to confusing/erroneous tcpdump output.

In newer kernels (somewhere around 5.3), if socket protocol is 0, we
actually parse out the right ethertype from the mac header during send().

However, for old kernels we can't rely on this kernel magic, and the
right fix is simply to make sure that socket bound protocol is correctly
set to ipv4 [htons(ETH_P_IP)] in the bind() system call.

Solution:
  Add a new constructor in SocketUtils to set the protocol parameter.
Bug: 133196453
Test: manual test
Change-Id: I07887b82e0e32aadb0cbb9f930f2b2fa3e277ca9
2019-10-30 06:26:10 +00:00
Steven Moreland
2a6f6ed94b Merge "ServiceManagerProxy: implement new method" 2019-10-29 15:45:43 +00:00
Peter Wang
0ecde1f5f9 Fixed java doc for EuiccService#eraseSubscriptions
Bug: 143138878
Test: on device
Change-Id: I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183
Merged-In: I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183
2019-10-28 12:40:23 -07:00
Peter Wang
ca01a7ee08 Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" 2019-10-28 19:32:18 +00:00
Steven Moreland
2cd23b6a59 ServiceManagerProxy: implement new method
This class is hanging around for UnsupportedAppUsage. Adding additional
method to fix compilation, but it should never be called.

Bug: 135686713
Test: compilation fixed
Change-Id: I58022af86a53239990e057936826d0f1214acc6f
2019-10-28 11:17:15 -07:00
Xin Li
b2198fa670 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Peter Wang
2ab852d411 Add EuiccCardManager.ResetOption to eraseSubscriptions
Bug: 139474431
Test: on device
Change-Id: Ib8496ed6dbc6179940892de8df7901e84dd67d76
Merged-In: Ib8496ed6dbc6179940892de8df7901e84dd67d76
2019-10-25 14:26:22 -07:00
Xin Li
d3498e3053 Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: Ic0486c8c79d94c9a30efa37676b2f6a94fb7b5fa
Merged-In: Ibe8ff7bdba7a886bd8b91155ae56f087a836981f
2019-10-25 10:27:58 -07:00
Chen Xu
7e902363a6 Merge "make CallerInfo as SystemAPI" 2019-10-25 17:27:45 +00:00
Howard Chen
7898d33e3a Merge "Use new GsiInstallParams struct" 2019-10-25 07:18:57 +00:00
Howard Chen
e176c56f6e Use new GsiInstallParams struct
Bug: 139402092
Test: adb shell am start-activity \
            -n com.android.dynsystem/com.android.dynsystem.VerificationActivity \
            -a android.os.image.action.START_INSTALL \
            -d file:///storage/emulated/0/Download/system.raw.gz \
            --el KEY_SYSTEM_SIZE $(du -b system.raw|cut -f1) \
            --el KEY_USERDATA_SIZE 8589934592

Change-Id: I62330ccbe3c863850b545db5e911196d22f518d7
2019-10-24 21:34:43 +00:00
Neil Fuller
eef56a4e6c Merge "Fix docs to be clearer and more maintainable"
am: 7e62a930a1

Change-Id: I9803c6c8dc78bfd2f86d7850368dfb9ad82ebbf6
2019-10-24 03:09:07 -07:00
Neil Fuller
7e62a930a1 Merge "Fix docs to be clearer and more maintainable" 2019-10-24 09:51:07 +00:00
Michele
e8eefec918 Merge "Removal of usage of hidden APIs"
am: 78b20d0d58

Change-Id: I81d1791744a419b1f0a38559335b83bab3b80512
2019-10-23 23:24:38 -07:00
Michele
db421f56e8 Removal of usage of hidden APIs
Moved RESOLUTION_ACTIONS from EuiccService to EuiccResolutionUiDispatcherActivity,
so that it does not need to be made public.

Bug: 137202333
Test: compilation
Change-Id: If8011bbe6af32c038f55d851acc2406eba208de6
Merged-In: If8011bbe6af32c038f55d851acc2406eba208de6
2019-10-24 00:26:22 +00:00
Myles Watson
31d16458cc Merge "Bluetooth doc: The is a -> This is a"
am: c8d3cde31e

Change-Id: Ibd5c32da0420d3b32f43bb3f14453d08e231ffa5
2019-10-23 15:52:31 -07:00
Treehugger Robot
c8d3cde31e Merge "Bluetooth doc: The is a -> This is a" 2019-10-23 22:32:54 +00:00
Myles Watson
1254da6333 Bluetooth doc: The is a -> This is a
Fixes: 142364826
Test: build
Change-Id: I9bde35140bdfc4d76df7e8c427ac6e8baceee611
2019-10-23 20:38:57 +00:00
TreeHugger Robot
bb326f9a80 Merge "Use language tags to store Configuration's locale list." into stage-aosp-master 2019-10-23 17:15:26 +00:00
Lucas Lin
eb24608dbc Merge "Better notification to user when DNS-over-TLS is broken"
am: 81852c8481

Change-Id: I8be963e35ed5e5ba914c6d3504a52ccb789aaf29
2019-10-23 02:51:56 -07:00