Commit Graph

421113 Commits

Author SHA1 Message Date
Luke Huang
9bc31a14c1 Merge "Fix issue for DnsResolver#query" am: 3fd64333d2
am: da47327520

Change-Id: I819fa9eb0abab64951fdb8adb7b1fc660544a1ad
2019-05-30 04:36:42 -07:00
Luke Huang
da47327520 Merge "Fix issue for DnsResolver#query"
am: 3fd64333d2

Change-Id: I012facbd15e78f2a484f4955828bb980fb553e95
2019-05-30 04:30:39 -07:00
Luke Huang
3fd64333d2 Merge "Fix issue for DnsResolver#query" 2019-05-30 11:22:50 +00:00
Chiachang Wang
a5c68348d8 Merge "Replace limited connectivity notification after detecting it" am: b6482348b0
am: 7cfc1d4ec6

Change-Id: I004e78a33689e2208918d4316bcf9a8f50a0bac3
2019-05-30 04:10:30 -07:00
Chiachang Wang
7cfc1d4ec6 Merge "Replace limited connectivity notification after detecting it"
am: b6482348b0

Change-Id: I9e501d404e465714c657d8056e84e008e72861c7
2019-05-30 04:05:38 -07:00
Chiachang Wang
b6482348b0 Merge "Replace limited connectivity notification after detecting it" 2019-05-30 10:56:08 +00:00
Chalard Jean
6010104f06 Merge "Prevent a 4-way binder interlock leading to a leak." am: 2b801dc016
am: 88cf9c532e

Change-Id: Idb8659a22b9d18f1d0bc566b476f4c536c00da90
2019-05-30 03:40:37 -07:00
Chalard Jean
88cf9c532e Merge "Prevent a 4-way binder interlock leading to a leak."
am: 2b801dc016

Change-Id: I00652e13f79a5b2d75fae36bf213e3c2727660c9
2019-05-30 03:35:12 -07:00
Treehugger Robot
2b801dc016 Merge "Prevent a 4-way binder interlock leading to a leak." 2019-05-30 10:22:30 +00:00
Remi NGUYEN VAN
f045873ea3 Merge "Check system_server PID in NetworkStack calls" into qt-dev
am: 0e740ae97e

Change-Id: I88c03a9ee636b3dec090845585d3bdaea559fbbb
2019-05-30 03:16:08 -07:00
TreeHugger Robot
0e740ae97e Merge "Check system_server PID in NetworkStack calls" into qt-dev 2019-05-30 10:01:13 +00:00
Jin Seok Park
49d3fb772a Merge "Catch OutOfMemoryError and log warning" into qt-dev
am: f66a0737ca

Change-Id: I73ffd7764f57470afcaac23ab5546d6ea786c387
2019-05-30 02:55:06 -07:00
Jin Seok Park
f66a0737ca Merge "Catch OutOfMemoryError and log warning" into qt-dev 2019-05-30 09:40:57 +00:00
Mark Chien
83a528fbf2 [automerger skipped] Merge "Fix captive portal can't show certificate problem" into qt-dev
am: 709c46a60a -s ours
am skip reason: change_id I64b05adcb46baf3fca116dbdc5177bc31c71e06d with SHA1 c0274d1315 is in history

Change-Id: I8b637490b79bc202530e095644ad7e23c434e59f
2019-05-30 02:19:36 -07:00
Chalard Jean
8a0f055e75 Fix a comment
I need to learn to read

Bug: 119216095
Test: comment-only change
Change-Id: Ia2317fc146462e73c1c770ad0f6f2009e497649b
2019-05-30 18:10:01 +09:00
TreeHugger Robot
709c46a60a Merge "Fix captive portal can't show certificate problem" into qt-dev 2019-05-30 09:07:03 +00:00
Chalard Jean
c85f9a8968 Always give VPN the INTERNET capability.
Split-tunnel VPN (which are the only ones affected by this change)
always fall through to the default network for routes they don't
handle, and even if the underlying network(s) don't provide access
this may be a pinhole that can actually reach the broader network.

In practice this behaves like the original release of P and is the
safest thing to do for Q. In R we should evaluate giving the VPN
app the ability to simply tell the network stack whether it does
provide Internet access or not.

Bug: 119216095
Test: FrameworksNetTests NetworkStackTests
Change-Id: I262ca41fe0225660551c9a421562405366b6acac
Merged-In: I262ca41fe0225660551c9a421562405366b6acac
(cherry picked from commit 6d5a4a3b1d)
2019-05-30 08:54:35 +00:00
Chalard Jean
aa88c42127 Merge "Always give VPN the INTERNET capability." am: 3ec6ba7509
am: 6d5a4a3b1d

Change-Id: I144939e7197deec403d6c91f83b414d357190bd4
2019-05-30 01:54:33 -07:00
Chalard Jean
6d5a4a3b1d Merge "Always give VPN the INTERNET capability."
am: 3ec6ba7509

Change-Id: I1e8c9dca828ef8631b3e7cfb58594c2afe91db21
2019-05-30 01:48:24 -07:00
Chalard Jean
3ec6ba7509 Merge "Always give VPN the INTERNET capability." 2019-05-30 08:36:19 +00:00
Sunny Goyal
fceb39bb05 Merge "Adding a compat class to listen for exclusion rect changes" into qt-dev
am: 14aabea07c

Change-Id: I5b9e7569cb81ed04bca887f522cb906524beb0e3
2019-05-30 01:28:26 -07:00
Remi NGUYEN VAN
4895c50e4f Check system_server PID in NetworkStack calls
Add a check that callers with UID 1000 always have the same PID. This is
a proxy for checking that no system is designed to bind to the network
stack unless it is the system_server, as otherwise either the
system_server would start crashing, or that system would not have access
to binder calls.

Also remove access from PHONE_UID as it is not being used.

Test: Flashed, WiFi working, Bluetooth reverse tethering shows no
      permission issue.
Bug: 133209255
Change-Id: Ib848aaaedfd599c1d4437378846c7dda74352019
2019-05-30 17:26:03 +09:00
Neil Fuller
43b25f1332 Merge "Switch to HexEncoding from ByteStringUtils" into qt-dev-plus-aosp 2019-05-30 08:24:54 +00:00
Chiachang Wang
d74d7e62d9 Replace limited connectivity notification after detecting it
No internet notification may be prompted before partial
connectivity being detected. Partial connectivity status will
be set into NAI and prompted in the Setting. Behavior is not
aligned between Setting and notification. Thus, update
notification again if partial connectivity is detected.
Also, sliently show the updated notification if no internet
notification has already been shown to user to prevent alerting
user in short time.

Bug: 130683832
Test: Verified with simulated partial connectivity
Test: atest FrameworksNetTests
Change-Id: Ie16a8ce6e0fa437048e8c1eea240314ca30e9520
2019-05-30 16:19:47 +08:00
TreeHugger Robot
14aabea07c Merge "Adding a compat class to listen for exclusion rect changes" into qt-dev 2019-05-30 08:19:04 +00:00
Chalard Jean
d5603307e1 Prevent a 4-way binder interlock leading to a leak.
System server             |        NetworkStack
                              |
NetworkMonitorCallbacks  ←----|--- NetworkMonitorCallbacks$Stub$Proxy
         ↓                    |           ↑
  NetworkAgentInfo            |      NetworkMonitor
         ↓                    |           ↑
NetworkMonitor$Stub$Proxy ----|---→ NetworkMonitorImpl

Bug: b/133174607
Test: Manual. The simplest artifact is observed by watching the output of
adb shell dumpsys meminfo -d com.android.networkstack | grep 'Proxy Binders'
while connecting and disconnecting multiple times to any network.
This will display the number of binder proxies. Before this, the binder
proxy count increases by 1 with each connection and never goes down (there
is some noise, as proxy objects are sometimes created for other reasons,
and get GC'd eventually). After this, the binder proxy count is always
eventually stable at 27 + connected network count.

See the bug for the complete analysis.

Change-Id: Ide2428dab3fcd6d7cd00aa2a9fd99d6c99b815a4
2019-05-30 17:12:46 +09:00
Chalard Jean
06d81d2c62 Always give VPN the INTERNET capability.
Split-tunnel VPN (which are the only ones affected by this change)
always fall through to the default network for routes they don't
handle, and even if the underlying network(s) don't provide access
this may be a pinhole that can actually reach the broader network.

In practice this behaves like the original release of P and is the
safest thing to do for Q. In R we should evaluate giving the VPN
app the ability to simply tell the network stack whether it does
provide Internet access or not.

Bug: 119216095
Test: FrameworksNetTests NetworkStackTests
Change-Id: I262ca41fe0225660551c9a421562405366b6acac
2019-05-30 16:11:14 +09:00
Winson Chung
a000d4f9c4 [automerger skipped] Merge "Update sysui OWNERS" into qt-dev
am: 8608b9e115 -s ours
am skip reason: change_id I43640d87c4fcd0a8211dc04c4203a7b80b150f58 with SHA1 5ec20d472e is in history

Change-Id: I0f0851a45797278eb8092242c2b5c7d5b453a9d8
2019-05-29 23:47:10 -07:00
Dario Freni
33af23a0ff Merge "Prevent installation of new APEX." into qt-dev
am: 2b5de1f231

Change-Id: I85e247ba4cc242528593b4d40a7f610e46acb608
2019-05-29 23:44:57 -07:00
Luke Huang
c211b27621 Fix issue for DnsResolver#query
1. Previously, getDnsNetId doesn't handle all the cases.
Fix it with cosidering bypass private DNS flag.
2. Make getDnsNetId return Network instead of netId,
and change name from getDnsNetId to getDnsNetwork

Bug: 129530368
Test: atest DnsResolverTest DnsUtilsTest
Change-Id: Ic8d45b802d72a266f9ec97bfea620c1ede6967e5
2019-05-30 06:34:03 +00:00
Winson Chung
8608b9e115 Merge "Update sysui OWNERS" into qt-dev 2019-05-30 06:33:26 +00:00
TreeHugger Robot
2b5de1f231 Merge "Prevent installation of new APEX." into qt-dev 2019-05-30 06:08:42 +00:00
Mark Chien
cd31d19710 Fix captive portal can't show certificate problem
Captive portal overrides two shouldOverrideUrlLoading methods,
but show certificate logic only be implemented in deprecated one.

Bug: 133714666
Test: -build, flash, boot
      -atest FramworksNetTests
      -manual test

Change-Id: I2656bb709cb0bf259279ca75ad8411cd8c92fb43
Merged-In: I64b05adcb46baf3fca116dbdc5177bc31c71e06d
(cherry picked from commit 9161b5e845)
2019-05-30 05:32:32 +00:00
Jin Seok Park
6e3113302f Catch OutOfMemoryError and log warning
Bug: 133827762
Test: atest CtsMediaTestCases:android.media.cts.ExifInterfaceTest
Change-Id: I5c6e247136e033968f418a50276971a8a686e021
2019-05-30 14:26:11 +09:00
lumark
e0af39403e Skip IME initialization when received the token that already registered
When IME window switches from current display to another display and back quickly,
system will re-bind InputMethodService to re-attach window token for each moving,
the IME service lifecycle will be onBind -> onUnBind -> onDestroy -> onBind.

Ideally, system will deliver window token when onServiceConnected and system should
only receive one onServiceConnected when the last service bound.

But due to user switch display very quick, before unbind service callbacked from client,
the next bind service request comes, caused the connection exists in system side and
client will then callback 2 onServiceConnected to system.

Since CL [1] introduced InputMethodPrivilegedOperationsRegistry to deal with token
registraction singleton-ness, the exception will be thrown for above case due to
the duplicate window token passed to client.

Add InputMethodPrivilegedOperationsRegistry#isRegistered to check if the token
already registered, if so, skip this duplicate initialization request.

[1]: I4a61470f06ffac5f7a512536f8431489db0108f4

Fix: 133624278
Test: manual as below steps:
    1) Settings > Developer options, enable "Simulated display" & "force desktop mode"
    2) Reboot device.
    3) Launch app from simulated display.
    4) Launch app from primary display (i.e. contacts), focus EditText to show IME.
    5) Tapping primary & simulated display repeatly & quickly.
    6) See if any exception log from IME application. (i.e. Gboard)

Change-Id: Ie6bfbae735724fe744590e715124d2737d2b665d
2019-05-30 12:27:17 +08:00
Michael Groover
b8dc8384d6 Merge "Update Build#SERIAL docs to reflect device ID restrictions" into qt-dev
am: daf8086aa0

Change-Id: I8bd70254ac6b461062761665db9cef30f97636e1
2019-05-29 21:26:33 -07:00
Michael Groover
daf8086aa0 Merge "Update Build#SERIAL docs to reflect device ID restrictions" into qt-dev 2019-05-30 04:11:55 +00:00
Govinda Wasserman
7359be82e0 Adds learned state to the Reminder Experience for Assistant Handles
am: 1f606b099e

Change-Id: I674839782e711bd6b909ebdc8d126948ea492060
2019-05-29 20:42:02 -07:00
Hongyi Zhang
700137e637 Add Usage info for LocationManager's APIs
All new code in LMS wrapped with try/catch and swallowing exceptions
to make sure new code never crashes LocationManagerService.

Bug: 133906682,133190291
Test: Tested with (statsd_testdrive + gnss test apk). Work as intended.
Change-Id: I989b1361c029e76d35861cf23d5c3d152f0bf81a
2019-05-30 03:41:17 +00:00
Govinda Wasserman
1f606b099e Adds learned state to the Reminder Experience for Assistant Handles
Also sets the Reminder Experience as the default behavior.

Test: Tested locally
BUG:132983599
Change-Id: I27b063ca142fbde99b0bd1f6d107f45d6070869a
2019-05-29 23:06:02 -04:00
Chenbo Feng
590e191ab5 [automerger skipped] Merge "Add server information for pptp vpn" into qt-dev
am: 4311022170 -s ours
am skip reason: change_id Ia6b00dd88f8f31823647c56c20b8c7edd20280f7 with SHA1 b38065dd3a is in history

Change-Id: I88245117b4c90de8faa3d7976213249eaa73b9d4
2019-05-29 19:53:00 -07:00
TreeHugger Robot
4311022170 Merge "Add server information for pptp vpn" into qt-dev 2019-05-30 02:38:17 +00:00
Mark Chien
c0274d1315 Merge "Fix captive portal can't show certificate problem" am: 1bbb08b87f
am: 060b94c618

Change-Id: I64b05adcb46baf3fca116dbdc5177bc31c71e06d
2019-05-29 19:31:06 -07:00
Mark Chien
060b94c618 Merge "Fix captive portal can't show certificate problem"
am: 1bbb08b87f

Change-Id: I31b65a3ca79f269f66b4f7b623d7acac4265af0b
2019-05-29 19:25:56 -07:00
Miranda Kephart
02a014f539 Merge "Add white edgelights to AOSP" into qt-dev
am: 0bcd698481

Change-Id: Ia226601e07740dfe5c78273580bb50e7174e6476
2019-05-29 19:25:05 -07:00
Miranda Kephart
0bcd698481 Merge "Add white edgelights to AOSP" into qt-dev 2019-05-30 02:15:55 +00:00
Mark Chien
1bbb08b87f Merge "Fix captive portal can't show certificate problem" 2019-05-30 02:13:41 +00:00
Priyank Singh
a47b6f7c4d Make the Handle bar grabbable.
Bug: 133514822
Test: Manual
Change-Id: I4bd9ab183ac5953d1e581031832512e7a9cc17aa
2019-05-29 18:57:13 -07:00
Christopher Tate
36c998c6b7 Prevent double teardown of service connections
Asynchronicities in activity teardown -> service connection teardown
introduced a race in which the teardown could race with new service
bindings to "the same" service instance, and then wind up attempting to
shut down a new, valid instance inappropriately.  Fixed by making sure
to clear the "what needs to be torn down" bookkeeping as part of the
act of doing that teardown, removing the possibility for stale state.

Fixes: 131029480
Test: manual
Test: atest CtsAppTestCases
Change-Id: I33a63f524d147ff6ec97dd3efb0127dcace8bf3c
2019-05-29 18:46:09 -07:00
chen xu
34de33a053 [automerger skipped] Merge "NetworkStatAccess Should checkCarrierPrivileges cross all subscriptions" into qt-dev
am: d5109d1bd2 -s ours
am skip reason: change_id I49fbde1fe73b33aadcf8fd23ad224f363b137bf3 with SHA1 bd0005b43d is in history

Change-Id: Icfe0c92b130b7bde5686ec8186d5df0fa16aa126
2019-05-29 18:14:18 -07:00