Commit Graph

277874 Commits

Author SHA1 Message Date
Brad Ebinger
b9f4a2d6c1 Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."
am: ed839943e0

Change-Id: Ib8ed5dbf927300503aba1d97af25703b380c56a4
2017-02-06 22:10:26 +00:00
Brad Ebinger
ed839943e0 Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." 2017-02-06 22:03:29 +00:00
Paul Lawrence
bff26f4bf1 Merge "Expand whitelist"
am: 006065fee4

Change-Id: I8e370c7afddc4911e3860d62809fd007bac40a0b
2017-02-06 20:52:49 +00:00
Treehugger Robot
006065fee4 Merge "Expand whitelist" 2017-02-06 20:43:02 +00:00
Tyler Gunn
cd6ccfd23c Framework fixes to support VoLTE conf calls via RemoteConnectionServices.
Fixing some issues with the addExistingConnection and addConference APIs
on ConnectionService.  When a connection manager relays the addition of
an existing connection or a conference to Telecom, it will assign a new
ID to the new connection/conference.  Due to how RemoteCSes work, the
Connection/Conf will be added directly via TelephonyConnectionService and
also via the connection manager's connection service.  Because the ID
changes, we ended up adding these twice. Conferences weren't a problem in
the GSM conference case because the TElephonyConnectionService's
ConnectionServiceWrapper didn't know of the IDs for the children of the
conference.  However, due to how the existing connections work its not the
case for VoLTE conferences.  To mitigate this, I'm passing the original
connection/conference ID to the connection manager via extras (ugh) and
using this to ensure that when the new existing connection/conference is
added to telecom that the same ID is used.  This ensures that we can
properly de-dupe the requests from TelephonyConnectionService and the
connection manager.

Also, there was some missing code in RemoteConnectionService which would
cause it to not properly track existing connections.

Bug: 31464792
Change-Id: I436f4438fd000ea48ebea7ceb75105bd3f456e46
2017-02-06 12:31:53 -08:00
Josh Gao
ce0722f344 Merge changes from topic 'debuggerd_ambient'
am: 0784e51163

Change-Id: I842b682377d92f1b140fe442073d7b97d5090208
2017-02-06 18:53:04 +00:00
Josh Gao
0f2a0b9908 zygote: make all capabilities inheritable.
am: 45dab78e98

Change-Id: I1983899a771bb82f644c75c0fe3e38342aab8402
2017-02-06 18:44:46 +00:00
Josh Gao
c75e4153cf Revert "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
am: 0a2d61505a

Change-Id: I38d9ec4b7be41b5ed7b3d9c30bce1c09315a5135
2017-02-06 18:44:03 +00:00
Josh Gao
0784e51163 Merge changes from topic 'debuggerd_ambient'
* changes:
  zygote: make all capabilities inheritable.
  Revert "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
2017-02-06 18:37:55 +00:00
Paul Lawrence
b29df84401 Expand whitelist
Bug: 35034743
Test: Builds, boots
Change-Id: I5ab77554d23a8498cf32953d447534742683deb8
2017-02-06 10:33:50 -08:00
Jason Monk
74a8b6543f Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent"
am: ff1d8da55e

Change-Id: I173b94730ae02f3e9b0638aac9f43972b59e10f3
2017-02-06 15:43:04 +00:00
Jason Monk
ff1d8da55e Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" 2017-02-06 15:34:38 +00:00
Narayan Kamath
a93d04a765 Merge "MethodHandles: Expose additional API."
am: 869141fef7

Change-Id: I73b9867bc1973dd4661470cebb0d9086666593aa
2017-02-06 14:15:48 +00:00
Narayan Kamath
869141fef7 Merge "MethodHandles: Expose additional API." 2017-02-06 14:09:46 +00:00
Orion Hodson
dcaa9fd642 Merge "Add bytecodes for invoke-polymorphic"
am: ef59955f58

Change-Id: If95860a3680dc8857b54a864917d5074eba57c9a
2017-02-06 10:30:40 +00:00
Orion Hodson
ef59955f58 Merge "Add bytecodes for invoke-polymorphic" 2017-02-06 10:21:55 +00:00
Akira Oshimi
8d2e9a9b30 Add tile information to ACTION_QS_TILE_PREFERENCES intent
One application can provide two or more custom Quick Settings tiles.
But there is no way to know which tile is long-pressed from application
side because ACTION_QS_TILE_PREFERENCES intent that is sent when
long-pressed doesn't have any additional information. So the component
name and state of the tile should be added to the intent.

Bug: 34832801
Test: manual - long press a custom tile

Change-Id: Iaa884cd944f19a2f007cbde645e8f8b1198bffb7
2017-02-06 04:45:13 +00:00
Chris Craik
6385d23f43 Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE"
am: 6678d34133  -s ours

Change-Id: I841f908f57d94ee91c72ef2c6d428cc1f14a5690
2017-02-03 21:53:26 +00:00
Chris Craik
6678d34133 Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE" 2017-02-03 21:44:35 +00:00
Paul Lawrence
f907b0fcc7 Merge "Expand whitelist"
am: fe88a5e81d

Change-Id: I9bc80af8b045edb667840828fc84f2e0ab12863b
2017-02-03 21:23:55 +00:00
Paul Lawrence
fe88a5e81d Merge "Expand whitelist" 2017-02-03 21:17:00 +00:00
Tyler Gunn
4e26b8e75e Merge "Add "wifi lost" disconnect cause."
am: 802b0c8fd1

Change-Id: I2f1ac8f8d8874f30720790888fa4e6beabc03c91
2017-02-03 21:10:39 +00:00
Tyler Gunn
802b0c8fd1 Merge "Add "wifi lost" disconnect cause." 2017-02-03 21:03:23 +00:00
Paul Lawrence
9375f3eff6 Merge "Optimize seccomp"
am: 7e812616c9

Change-Id: I6061c25fe18b136d9a4920acd3f54043c44abe4a
2017-02-03 20:19:11 +00:00
Paul Lawrence
7e812616c9 Merge "Optimize seccomp" 2017-02-03 20:14:15 +00:00
Chris Craik
f772c047fa Add ShadowShaderAnimation benchmark DO NOT MERGE
Bug: 34809371
Test: manual

New benchmark uses several levels of overdraw from just shadows to benchmark
shadow shader performance.

Tessellation workload is minimal, due to simple rect caster shape.

Change-Id: I572476bd54e04566851f39027ada7254597b37f8
2017-02-03 11:45:47 -08:00
Tyler Gunn
87f208b3b3 Add "wifi lost" disconnect cause.
New disconnect cause used when wifi call is dropped due to loss of wifi
connection.

Test: Manual, unit.
Merged-In: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
Bug: 32571209
Change-Id: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
2017-02-03 19:05:18 +00:00
Paul Lawrence
88ec14b0e5 Expand whitelist
Bug: 34908783
Test: Device boots. Unable to test app due to Fake OEM error
Change-Id: I2a0f5646fa39f95875ecb661599d76f4b28a43ac
2017-02-03 10:28:23 -08:00
Paul Lawrence
14f31aa647 Optimize seccomp
Bug: 34946764
Test: Make sure boots, seccomp still blocks, and is faster
Change-Id: I2b4da512f8a9eb8a32f4435561285d42e4b0395f
2017-02-02 15:19:25 -08:00
Peter Qiu
281fae21f8 Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field"
am: e724f82b3d

Change-Id: I250566dbd8dff8c50692e47b1b3e9bb7568bb8b4
2017-02-02 19:37:50 +00:00
Treehugger Robot
e724f82b3d Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" 2017-02-02 19:29:53 +00:00
Paul Lawrence
dcf63748fc Merge "Install seccomp into zygote not init"
am: ba9bbd8517

Change-Id: I989c34f133e37b68dbd387b263dc5191ac8d6215
2017-02-02 18:18:15 +00:00
Paul Lawrence
521d25294b Install seccomp into zygote not init
am: ef85477470

Change-Id: I22745a759cc4f9797cb3c806bbdd4d69d6cccdcb
2017-02-02 18:18:08 +00:00
Alex Deymo
5292c727b7 Merge "Compile native network functionis into libandroid_net."
am: b1cb60d920

Change-Id: Ia0cf31b962cd26b9c7d1d4917b3523e7f3fbfa2c
2017-02-02 18:16:45 +00:00
Alex Deymo
af657d14fc Compile native network functionis into libandroid_net.
am: f3b7411060

Change-Id: Ib01eaf11caacb35ba905012f06d0777d237dd2d1
2017-02-02 18:11:40 +00:00
Paul Lawrence
ba9bbd8517 Merge "Install seccomp into zygote not init" 2017-02-02 18:09:18 +00:00
Treehugger Robot
b1cb60d920 Merge "Compile native network functionis into libandroid_net." 2017-02-02 17:59:55 +00:00
Paul Lawrence
ef85477470 Install seccomp into zygote not init
Bug: 34710876
Test: Boots, correct size filter installed, blocks unallowed calls

Change-Id: I3e66e8724ace37f7d30451b98a5e574766252ea0
2017-02-02 17:45:11 +00:00
Erik Kline
6f32aa0259 Merge "Add ConnectivityManager.networkCapabilitiesForType()"
am: c313123afe

Change-Id: I0ad50fbf38f11b383fd889dc598cfddd47051477
2017-02-02 07:22:05 +00:00
Treehugger Robot
c313123afe Merge "Add ConnectivityManager.networkCapabilitiesForType()" 2017-02-02 07:15:05 +00:00
Hugo Benichi
6236f49f0e Merge "Define Network notification proto constants."
am: 05550d9ed8

Change-Id: I3a169ace694ed42c59f3d818f007b638fdf4969f
2017-02-02 06:42:32 +00:00
Hugo Benichi
05550d9ed8 Merge "Define Network notification proto constants." 2017-02-02 06:36:22 +00:00
Erik Kline
180a3d07a8 Merge "Add test for repeated calls to registerMobileUpstreamRequest()"
am: 603eefd5d5

Change-Id: I6b2a0d6df70df028ef9b8ff5d689c5a627d8daf8
2017-02-02 05:15:23 +00:00
Treehugger Robot
603eefd5d5 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" 2017-02-02 05:07:23 +00:00
Erik Kline
35bf06c968 Add ConnectivityManager.networkCapabilitiesForType()
This static method returns a NetworkCapabilities instance with
transports and capabilities set according to the given legacy type.

Also:
    - add NetworkRequest.Builder.setCapabilities(), to be able to use
      the NetworkCapabilities instances returned from the above
    - update UpstreamNetworkMonitor to make immediate use of this

Test: as follows
    - build (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - WiFi to DUN upstream tethering works
Bug: 32163131

Change-Id: Idfe1ddd2815c355cbf27cf29eb0e3de177de84e9
2017-02-02 11:07:59 +09:00
Josh Gao
45dab78e98 zygote: make all capabilities inheritable.
Set CapInh to the full set of permitted capabilities, so that the crash
handler can raise ambient capabilities to allow crash_dump to ptrace
zygote-descended children without needing CAP_SYS_PTRACE. CapInh is
restricted by filesystem capabilities if the ambient capability set
hasn't been raised, so this should only have an effect when ambient
capabilities are modified.

Bug: http://b/34853272
Test: debuggerd -b `pidof system_server`
Change-Id: I27d2aa4ab4fc47a183ce2b254be178de4d58840c
2017-02-01 17:56:43 -08:00
Josh Gao
0a2d61505a Revert "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
This reverts commit 59972218f8.

Bug: http://b/34853272
Test: debuggerd -b `pidof system_server`
Change-Id: I440932210b6e84647c2848bab2e082a58338fb1e
2017-02-01 17:56:43 -08:00
Steven Moreland
4ede371d80 Merge "Cleanup hwbinder getService code."
am: 9be24a3040

Change-Id: Idb75f2c41e6e0fd9c2eb03ef4960e40cb6556308
2017-02-01 20:53:24 +00:00
Treehugger Robot
9be24a3040 Merge "Cleanup hwbinder getService code." 2017-02-01 20:46:45 +00:00
Brad Ebinger
9f1ccbf5f9 Merge "Turn off Dynamic IMS switching for now"
am: 2bb0d95e91

Change-Id: Ie74b53ca5f0b6463b371368608c793d402878d50
2017-02-01 19:44:55 +00:00