Commit Graph

105745 Commits

Author SHA1 Message Date
Hans Boehm
c02f9c70b3 Merge "Add disclaimer to Debug.getRuntimeStat()" am: 52218ffa3b
am: c83c344516

Change-Id: I795915183167a1795da7a4a630e008d76cafcf13
2019-11-06 03:35:49 -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
Torne (Richard Coles)
a9395a3a0b Merge "WebView: note deprecation of onscreen zoom controls." into qt-dev am: b0bcbb0c35 am: 016ee6777e
am: 30c6079772

Change-Id: I0fbdb26b176e4f30738923618dd063341017b7c1
2019-11-05 15:26:29 -08:00
Torne (Richard Coles)
30c6079772 Merge "WebView: note deprecation of onscreen zoom controls." into qt-dev am: b0bcbb0c35
am: 016ee6777e

Change-Id: Ibc89c85870f87d002f23aaa8fbbada0f3cd705ae
2019-11-05 15:20:34 -08:00
Torne (Richard Coles)
016ee6777e Merge "WebView: note deprecation of onscreen zoom controls." into qt-dev
am: b0bcbb0c35

Change-Id: If316cbd120ac807313f4d89a212be01b5e4a313e
2019-11-05 15:14:34 -08:00
TreeHugger Robot
b0bcbb0c35 Merge "WebView: note deprecation of onscreen zoom controls." into qt-dev 2019-11-05 22:57:36 +00:00
Chen Xu
3157fcdfd8 Merge "new telephony annotation class" am: 386027afdd
am: 54aba99636

Change-Id: I558883c7fb94b9685da5f5c570d2d331a19ba6d5
2019-11-05 01:15:59 -08:00
Edgar Wang
003ee4342d Merge "Add Tap Gesture for Aware Settings" into qt-qpr1-dev
am: e39c7bd211

Change-Id: I9f640b4c496297084934cb8036e011e675077f0c
2019-11-04 20:13:27 -08:00
TreeHugger Robot
e39c7bd211 Merge "Add Tap Gesture for Aware Settings" into qt-qpr1-dev 2019-11-05 03:59:25 +00:00
Amit Mahajan
55c51a846a Merge "Create @SystemApi CarrierMessagingServiceWrapper." am: 4ae457ad9d
am: 41f6ef08ba

Change-Id: I6e28bc51fcea3504f40e2247ad43d27bacef2edf
2019-11-04 16:42:07 -08: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
Jordan Liu
2493a630a6 Merge "Expose Context.sendOrderedBroadcast with appop" am: 08a94a2236
am: 43b6116549

Change-Id: I556cbff8a4aa8ca1f507cd1f63c435506b09cf0f
2019-11-04 13:31:04 -08: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
626f4cdb81 Merge "new TelephonyRegistryManager" am: 7a79194fcb
am: 44d0c2a7dc

Change-Id: I2a8f753c2c9fbceb4a3cde9b31fdb3d7d82ea028
2019-11-04 10:46:46 -08: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
Martijn Coenen
3d4d4253e4 Merge "Don't hold sProxyLock while retrieving interface descriptors." am: ef6fe13c77
am: d4d27b403c

Change-Id: Ibcdc21838228db0286f3ea4538fd58a03370db35
2019-11-04 00:24:19 -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
64e2f81eba Merge "Add API to set the sll_protocol on PacketSocket" am: 0d6c308c39
am: 7919e04f5b

Change-Id: I4249450e9204d732c1c6548f9af88362f157bb78
2019-10-31 21:57:21 -07: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
John Reck
48145618d2 Merge "Ensure SKP serialization occurs on RenderThread" into qt-qpr1-dev
am: ab9d0b5103

Change-Id: I7176a638d66e74ceb555e867dcea471c7ef6fe53
2019-10-31 10:50:38 -07:00
John Reck
ab9d0b5103 Merge "Ensure SKP serialization occurs on RenderThread" into qt-qpr1-dev 2019-10-31 17:33:44 +00:00
Edgar Wang
5af0fd3316 Add Tap Gesture for Aware Settings
- Add new settings provider key for tap gesture.

Bug: 138296598
Test: atest & manual

Change-Id: Icf0073ded0063ba5ed128bd3e3ea7d28a9336715
Merged-In: Ib76327b37a415512145a150a4b0e176a6cb114d7
2019-11-01 00:50:49 +08:00
Andrei-Valentin Onea
97ad6f5c48 Merge "Add apis for listing all compat changes" am: 2c3b1a1010
am: 4b8947bd56

Change-Id: I924c55f20755d33c6a748326bf07083592fd77e6
2019-10-31 06:52:54 -07:00
Andrei-Valentin Onea
2c3b1a1010 Merge "Add apis for listing all compat changes" 2019-10-31 13:36:26 +00:00
Andrei Onea
18041f787d Add apis for listing all compat changes
These apis are required for adding UI in the Developer options for
modifying compatibility change overrides.

Bug: 138280620
Test: atest CompatConfigTest
Change-Id: If55aa68f9bdd6bed0765324e972de3683bacb553
2019-10-31 11:54:13 +00:00
Phil Weaver
015fe4ff3e Merge "a11y: don't crash the system when illegal component name encounted" am: f4d1789b81
am: 411b523373

Change-Id: Idb8ffd83b4d8b89ebba52ad6fe5e7037ac61b4b7
2019-10-30 18:59:00 -07: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
Torne (Richard Coles)
c1c1a5e7d7 Merge "Clarify CookieManager RFC reference." into qt-dev am: 7186df9e6f am: 45a9d4bc79
am: 04be94e23e

Change-Id: I4b40d40281753e10408d41114490794734002d72
2019-10-30 10:03:58 -07:00
Torne (Richard Coles)
04be94e23e Merge "Clarify CookieManager RFC reference." into qt-dev am: 7186df9e6f
am: 45a9d4bc79

Change-Id: I9a3ea8dcbece844051fd8383deea6a00ae92fe07
2019-10-30 09:57:39 -07:00
Torne (Richard Coles)
45a9d4bc79 Merge "Clarify CookieManager RFC reference." into qt-dev
am: 7186df9e6f

Change-Id: I91a6a53d029b8ec2567eaac93056c91642b5177e
2019-10-30 09:51:40 -07:00
TreeHugger Robot
7186df9e6f Merge "Clarify CookieManager RFC reference." into qt-dev 2019-10-30 16:31:03 +00: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
156230b3bf Merge "ServiceManagerProxy: implement new method" am: 2a6f6ed94b am: 9ab8a0713f
am: 1574e4fd4e

Change-Id: I3018e9922154e7a33dd3aa4814d5f80e4118a77a
2019-10-29 09:36:18 -07:00
Steven Moreland
1574e4fd4e Merge "ServiceManagerProxy: implement new method" am: 2a6f6ed94b
am: 9ab8a0713f

Change-Id: I5af655cba2bb416ed517ba722f0f5ec46610c9bc
2019-10-29 09:26:57 -07:00
Steven Moreland
2a6f6ed94b Merge "ServiceManagerProxy: implement new method" 2019-10-29 15:45:43 +00:00
Nate Fischer
a906395b9e WebView: clarify docs for onShowCustomView am: aaaa660a44 am: 3ea1a6d6ff
am: b2bc8ddcfb

Change-Id: I28eb0e3ffcef7256d3419dbde5bb9bcce2614172
2019-10-29 00:39:55 -07:00