OSDN Git Service
Treehugger Robot [Wed, 16 Aug 2017 21:16:50 +0000 (21:16 +0000)]
Merge "Improve container capability bounding in containers"
Di Lu [Wed, 16 Aug 2017 16:20:18 +0000 (16:20 +0000)]
Merge "Add user quota information into the IpSecService dump"
Luis Hector Chavez [Wed, 12 Jul 2017 17:03:30 +0000 (10:03 -0700)]
Improve container capability bounding in containers
This change stops relying on the ro.boot.container property for dropping
a subset of capabilities and instead relies on the effective capability
mask of the Zygote process, prior to forking.
When Android is running in a pid/mount/net/user namespace, even if a
particular capability is present, some operations that require that
capability check whether it is allowed in the init namespace (instead of
in the current namespace), so they would fail even with the capability
granted within the namespace. So, explicitly dropping the capabilities
from the beginning allows for clearer signalling of which operations can
be expected to work instead of failing silently for mysterious reasons.
Bug:
63579953
Test: aosp_bullhead-eng still boots
Test: Running Zygote without CAP_SYS_MODULE makes it such that
system_server does not request it.
Change-Id: I1d18d13341bcc04e701fd14092e7e94961728620
Treehugger Robot [Wed, 16 Aug 2017 14:38:29 +0000 (14:38 +0000)]
Merge "Add convenience methods to IpPrefix and LinkAddress"
Hugo Benichi [Tue, 8 Aug 2017 04:06:04 +0000 (13:06 +0900)]
Add convenience methods to IpPrefix and LinkAddress
Also moving relevant test files into tests/net as part of runtest
framworks-net.
Also removes testHashCode in LinkAddress() because this test relies on
the assumption that hashCode() is stable across releases or jdk
versions, which is absolutely not true.
This creates maintenance work for little benefit since hashCode is
already tested as part of the equality test.
For instance this test is now broken because hashing for InetAddress
changed.
Bug:
62988545
Bug:
62918393
Test: runtest frameworks-net, added coverage in tests
Change-Id: I695bc3f0e801bf13bc4fc0706565758f12b775b4
Treehugger Robot [Wed, 16 Aug 2017 11:37:11 +0000 (11:37 +0000)]
Merge "More OWNERS file for core networking team"
Treehugger Robot [Wed, 16 Aug 2017 11:34:24 +0000 (11:34 +0000)]
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
Hugo Benichi [Wed, 16 Aug 2017 06:43:14 +0000 (15:43 +0900)]
More OWNERS file for core networking team
Test: build
Change-Id: I7cef188e29f487025aee04ab0c1a003bb32a7048
Hugo Benichi [Wed, 16 Aug 2017 04:19:04 +0000 (13:19 +0900)]
Allow NetworkAgent "immutable updates" to NetworkCapabilities
This patch loosens the validation checks when a NetworkAgent updates it
NetworkCapabilities: instead of checking that capabilities labeled as
"immutable" stay identical across updates, it is now accepted to change
immutable capabilities in a way that the new NetworkCapabilities
satisfies the old NetworkCapabilities.
This allows a NetworkAgent to update itself in order to match more
requests, but will still catch NetworkAgents that sends degradation
updates causing potentially requests to not match anymore.
Bug:
64125969
Test: runtest frameworks-net
Change-Id: I2a1b3f9c0be6415e40edc989d0c1b03b5631f7b1
Brad Ebinger [Tue, 15 Aug 2017 17:41:27 +0000 (17:41 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
Lorenzo Colitti [Tue, 15 Aug 2017 01:57:28 +0000 (01:57 +0000)]
Merge changes I82d3bee0,I9c9413d7
* changes:
Pass data usage limits to tethering offload code.
Don't time out when fetching tether offload stats.
nharold [Tue, 15 Aug 2017 01:12:28 +0000 (01:12 +0000)]
Merge "Cleanup ServiceState.toString()"
ludi [Thu, 10 Aug 2017 22:44:40 +0000 (15:44 -0700)]
Add user quota information into the IpSecService dump
Bug:
64093788
Test: runtest frameworks-net
Change-Id: I6c5fc9e2db4ba57e0db4f6380a1251c4e444951b
Tyler Gunn [Mon, 14 Aug 2017 21:24:18 +0000 (21:24 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete."
Nathan Harold [Wed, 2 Aug 2017 17:51:47 +0000 (10:51 -0700)]
Cleanup ServiceState.toString()
Updating the formatting of the toString() method to
name the fields that it's printing, and to use one of
the more common formats for object dumping.
Bug:
64300932
Test: compilation, dumpsys
Change-Id: I56c4679d2a4a184f659870481e2ce0699fe38613
Treehugger Robot [Mon, 14 Aug 2017 19:57:26 +0000 (19:57 +0000)]
Merge "PrintSpooler: fix monkey crash if height&width small than 0"
Tyler Gunn [Fri, 12 May 2017 17:04:49 +0000 (10:04 -0700)]
Add ConnectionService callback invoked when connection creation complete.
Adding a new @hide callback in ConnectionService which a CS implementation
can implement. A callback from Telecom is responsible for invoking this
method.
Test: Manual
Bug:
33272455
Change-Id: Id17cf0fd8fd491b7677f9b7a7b52c76270b1c8c9
Brad Ebinger [Fri, 30 Jun 2017 22:34:32 +0000 (15:34 -0700)]
Adds a new string definition for IMS Access blocked reason
When a call is disconnected with the Telephony DisconnectCause
IMS_ACCESS_BLOCKED, DisconnectCause#getReason will now return
the reason REASON_IMS_ACCESS_BLOCKED.
Bug:
33821263
Test: manual tests
Merged-In: Ic8b76e83aa8eb20074862f0e67734d2c5389ba12
Change-Id: Ic17cefa35a51f739c893923a2db7f3dca8ada202
Treehugger Robot [Mon, 14 Aug 2017 16:29:04 +0000 (16:29 +0000)]
Merge "Add config option to enable/disable pause workaround."
Lorenzo Colitti [Fri, 11 Aug 2017 04:47:49 +0000 (13:47 +0900)]
Pass data usage limits to tethering offload code.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I82d3bee030bafa8fe85855885b5fc3893e699181
Lorenzo Colitti [Mon, 14 Aug 2017 04:07:42 +0000 (13:07 +0900)]
Don't time out when fetching tether offload stats.
Currently, fetching tethering offload stats has a 1000ms timeout,
after which we return stats of zero. However, returning zero is
invalid and will cause various parts of the network stats
accounting code to complain that statistics are moving backwards,
causing at least a log.wtf, and possibly a crash.
This CL removes the timeout entirely.
An alternative would have been to keep the timeout and return
null if the stats fetch failed. However, this complicates the
code, and if the HAL is persistently slow, could cause no stats
to be counted, ever. Given the impact of such behaviour on users'
data plans it is likely better to block until the stats are
collected.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I9c9413d757f44e87a51ea7ca82b657cc6aa0d4ba
Tyler Gunn [Mon, 15 May 2017 18:43:25 +0000 (11:43 -0700)]
Add config option to enable/disable pause workaround.
Test: Manual/unit
Bug:
35304446
Merged-In: I9a0c73ce62812a87e30d9759a0d205ffa282caf2
Change-Id: I9a0c73ce62812a87e30d9759a0d205ffa282caf2
Joachim Sauer [Mon, 14 Aug 2017 12:19:39 +0000 (12:19 +0000)]
Merge "API updated for ICU4J 59.1"
huiwan [Tue, 1 Aug 2017 05:21:13 +0000 (13:21 +0800)]
PrintSpooler: fix monkey crash if height&width small than 0
During the monkey test, should add check height & width before
create the bitmap, to avoid the monkey test fail.
Change-Id: I5619c30af63afa3d74d0417e37c67c4920e099ba
Test: build & run
Treehugger Robot [Fri, 11 Aug 2017 20:40:35 +0000 (20:40 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
Tyler Gunn [Fri, 11 Aug 2017 18:14:02 +0000 (18:14 +0000)]
Merge changes from topic 'call-session-may'
* changes:
Add callSessionMayHandover API to ImsCallSession.
IMS: Support for Possible Call Session Handover
Steven Moreland [Fri, 11 Aug 2017 01:08:37 +0000 (18:08 -0700)]
ScopedUtfChars: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using ScopedUtfChars find headers
Bug:
63762847
Merged-In: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Treehugger Robot [Fri, 11 Aug 2017 00:31:41 +0000 (00:31 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
Brad Ebinger [Thu, 27 Jul 2017 19:57:03 +0000 (12:57 -0700)]
Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.
This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.
Bug:
63137625
Test: Manual
Merged-In: I0e049166ddf3604d312748b63a94fa6ebe77c29d
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
Brad Ebinger [Thu, 10 Aug 2017 22:50:45 +0000 (22:50 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
Amit Mahajan [Thu, 10 Aug 2017 15:59:43 +0000 (15:59 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
Amit Mahajan [Thu, 10 Aug 2017 15:57:38 +0000 (15:57 +0000)]
Merge "Get isim card data use subId."
Brad Ebinger [Thu, 22 Jun 2017 18:39:11 +0000 (11:39 -0700)]
Add method that checks the Binder status of ImsConfig
Adds a method to check whether or not the ImsConfig
binder has died.
Bug:
62723694
Test: maual, follow bug procedure
Merged-In: I0ecd6a43d4375d3ac4d7d54b3d437832c0221f05
Change-Id: I9df6533e7e7dc69487cea50fada6c89599b031a3
Treehugger Robot [Wed, 9 Aug 2017 22:10:19 +0000 (22:10 +0000)]
Merge "Add future consideration for USB rndis notification handling"
Erik Kline [Wed, 9 Aug 2017 03:53:46 +0000 (20:53 -0700)]
Add future consideration for USB rndis notification handling
Test: builds
Bug:
63970368
Merged-In: If6afe1cdce9995251ba53fbf30acf9d6e31f9433
Merged-In: I78e280c2299ec3f4d97138ca648f9629ba82e87f
Merged-In: I891cd82b0e8af1049fa3ab9b0a95a2a9ab2e0b26
Change-Id: Ic9ca133a44123f281bd4cfeac57d426346c2b76d
(cherry picked from commit
1290568110405fd45f13824e67beeb98c30400a4)
Jakub Pawlowski [Wed, 9 Aug 2017 18:56:57 +0000 (18:56 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification"
Treehugger Robot [Wed, 9 Aug 2017 18:54:32 +0000 (18:54 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts."
Treehugger Robot [Wed, 9 Aug 2017 18:44:08 +0000 (18:44 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis."
Erik Kline [Tue, 8 Aug 2017 01:11:22 +0000 (18:11 -0700)]
Always note the state of RNDIS from USB broadcasts.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
63970368
Merged-In: I53115deda25ca83a00bd9de12891a72028647d12
Merged-In: I317b694c3a8c76077c031c4410d5b97ed79c1bbc
Merged-In: Ie226534011d6439c24cfe1957c5cf47ba171b0c0
Change-Id: I273edbe21fea586f1353ff378515401efc6bb15e
(cherry picked from commit
3897dc179f23dfbaf10f0139160aa29a232144f5)
Jakub Pawlowski [Tue, 8 Aug 2017 22:47:57 +0000 (15:47 -0700)]
Bluetooth: AdvertiseData parceling simplification
Use writeTypedArray instead of writeList - this will not serialize
string with type name, which is unnecessary
Use createByteArray instead of readByteArra - it takes care of null and
empty array handling
Test: sl4a FilteringTest, BleAdvertiseApiTest
Change-Id: I6a22674a0bf9933e39691de7f2b2b52a060ae368
nharold [Wed, 9 Aug 2017 17:05:49 +0000 (17:05 +0000)]
Merge "Add UserQuotaTracker to IpSecService"
Tyler Gunn [Thu, 1 Jun 2017 21:12:54 +0000 (14:12 -0700)]
Enforce call log length limit on a per PhoneAccount basis.
Performing the auto delete based on the PhoneAccount of the new entry.
This ensures no one CS can cause the removal of entries by another.
Test: Manual
Bug:
38196259
Merged-In: I382cb62a1b2b7e482c49ece05f90fc982b797add
Change-Id: I382cb62a1b2b7e482c49ece05f90fc982b797add
Fredrik Roubert [Thu, 6 Apr 2017 23:21:12 +0000 (01:21 +0200)]
API updated for ICU4J 59.1
Bug:
62410016
Test: make
Change-Id: Ieeee55e7fec1022ef62e792f83ba5c2c177b77af
Jason Monk [Wed, 9 Aug 2017 13:41:54 +0000 (13:41 +0000)]
Merge "Prevent data usage dialog from being displayed again"
Treehugger Robot [Wed, 9 Aug 2017 10:26:14 +0000 (10:26 +0000)]
Merge "Minor fixes for netd restarts and StrictController."
yanxue.xu [Thu, 13 Jul 2017 08:40:55 +0000 (16:40 +0800)]
Get isim card data use subId.
Get isim card data is obtained the default card data instead of the corresponding card data.
It is necessary to obtain the card data according to the subid.
Test: Get isim card data use subId.
Change-Id: I9ad90f8180f35449879507b6f086c4be01aacc9d
Nathan Harold [Mon, 24 Apr 2017 23:16:34 +0000 (16:16 -0700)]
Add UserQuotaTracker to IpSecService
Add a small tracking object to enforce maximum
quotas for SPIs, Transforms, and Encap sockets. The
current quota limits are intentionally conservative
with the expectation that we can relax them more
easily than we can shrink them.
Bug:
37688603
Test: tbd
Change-Id: Iee59ac59ef9f4a7ab75a2e04f9ca72da82fc3229
Chen Xu [Wed, 9 Aug 2017 01:19:24 +0000 (01:19 +0000)]
Merge "initial value for data_roaming based on carrier"
Chen Xu [Wed, 9 Aug 2017 01:09:42 +0000 (01:09 +0000)]
Merge "Handle invalid destination address gracefully"
Jordan Liu [Wed, 9 Aug 2017 00:41:57 +0000 (00:41 +0000)]
Merge "Fix error message strings"
fionaxu [Fri, 23 Jun 2017 01:14:23 +0000 (18:14 -0700)]
initial value for data_roaming based on carrier
1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.
Bug:
36193933
Test: manual test
Change-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3
Treehugger Robot [Wed, 9 Aug 2017 00:00:43 +0000 (00:00 +0000)]
Merge "Fix graphical artifact in the fisheye effect"
Treehugger Robot [Tue, 8 Aug 2017 23:56:05 +0000 (23:56 +0000)]
Merge "Moved channels settings from carrier config to resources"
fionaxu [Tue, 20 Jun 2017 06:22:29 +0000 (23:22 -0700)]
Handle invalid destination address gracefully
Bug:
37578305
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java --test-method testSendTextWithInvalidDestAddr
Change-Id: I2e79acb66178586d29dc89ad018f2726ed654a85
Jordan Liu [Tue, 8 Aug 2017 23:06:17 +0000 (16:06 -0700)]
Fix error message strings
mmcc_imsi_unknown_in_hlr and mmcc_illegal_ms are updated to reflect
newly supported requirements.
Fixes:
64194949
Test: manual
Change-Id: I358ba1d562d30e958580003336ace3941bd5e04f
Jakub Pawlowski [Tue, 8 Aug 2017 22:39:31 +0000 (22:39 +0000)]
Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)"
Jack Yu [Thu, 4 May 2017 18:50:51 +0000 (11:50 -0700)]
Moved channels settings from carrier config to resources
Since CBS channels are more countries specific instead
of carrier specific, moving it to resources makes
more sense.
Test: Manual
bug:
31223529
Merged-In: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Change-Id: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Tyler Gunn [Fri, 9 Jun 2017 20:16:06 +0000 (13:16 -0700)]
Add callSessionMayHandover API to ImsCallSession.
This matches the new AIDL definition in the API.
Test: Manual
Bug:
62489988
Change-Id: I97ad5b5359f19d533b5b8644fd37008c0c69bf9c
Anju Mathapati [Mon, 27 Mar 2017 22:43:20 +0000 (15:43 -0700)]
IMS: Support for Possible Call Session Handover
Adding the callSessionMayHandover API that allows
for the lower layers to indicate that the call session
may handover based on actions taken by the user/UI
layer.
The API provides current and target RAT information
pertaining to the possible handover.
Bug:
62489988
Test: Manual
Change-Id: I006462ce5688bb99a94d5135574fb2c17878685a
Jakub Pawlowski [Tue, 8 Aug 2017 11:27:20 +0000 (04:27 -0700)]
Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.
Test: compilation test
Change-Id: I9a6db8832c9ec3215c648e325d67278832ef22cc
Merged-In: I9a6db8832c9ec3215c648e325d67278832ef22cc
(cherry picked from commit
06ae9c665b6fce7a748c3d7175359bff8343768c)
Treehugger Robot [Tue, 8 Aug 2017 18:03:14 +0000 (18:03 +0000)]
Merge "Add null check for Wi-Fi command"
Calin Juravle [Tue, 8 Aug 2017 17:03:21 +0000 (17:03 +0000)]
Merge "Update DexLoadReporter to comply with the new reporting API"
Treehugger Robot [Tue, 8 Aug 2017 08:30:03 +0000 (08:30 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
Hugo Benichi [Tue, 8 Aug 2017 07:20:07 +0000 (07:20 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk"
Treehugger Robot [Tue, 8 Aug 2017 07:16:48 +0000 (07:16 +0000)]
Merge "Fix flaky IpPrefixTest."
Treehugger Robot [Tue, 8 Aug 2017 07:07:25 +0000 (07:07 +0000)]
Merge "Add OWNERS to com.android.server.net"
Hugo Benichi [Fri, 4 Aug 2017 03:12:25 +0000 (12:12 +0900)]
DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies
Rational for do not merge: the list of native libraries needed in
Android.mk is not consistent at the moment for aosp master and for
internal branches. Furthermore it is not consistent within internal
branches either. This patch only attempts to fix the tests of the
branches where it matters for development. Otherwise the cost of merge
conflicts makes it undesirable.
Test: All tests in runtest frameworks-net pass.
Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708
(cherry pick from commit
99e8ab6e46eec5dbd1b059b3732672d537b3cf34)
Change-Id: Ic732b3dafc3497235e455b8748ac4f99cf02b221
Hugo Benichi [Mon, 7 Aug 2017 01:27:04 +0000 (10:27 +0900)]
Add OWNERS to com.android.server.net
Test: build
Change-Id: I9236489814103ab20b077ebfc30155dcdb66d411
Hugo Benichi [Thu, 10 Nov 2016 13:45:56 +0000 (22:45 +0900)]
Fix flaky IpPrefixTest.
Test: IpPrefixTest passes
Bug:
32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645
(cherry pick from commit
32c687040301cb3601fd110281a742159a963aa9)
Change-Id: Ibaf11aae9b13af868bebff820c9e7615b63c8eb2
naoyuki kato [Tue, 22 Nov 2016 04:27:11 +0000 (13:27 +0900)]
Prevent data usage dialog from being displayed again
The data usage dialog is displayed every time rotating the device.
To solve this issue, prevent NetworkOverLimitActivity from being
re-created when rotating the device.
Bug:
36801016
Test: manual - show NetworkOverLimitActivity and rotate the device
Change-Id: I51429aa49157756107e9b3fa9d450f82f894dcab
Hugo Benichi [Tue, 8 Aug 2017 01:46:57 +0000 (10:46 +0900)]
Connectivity OWNERS: let owners modify Android.mk
Since per-file overwrites the directory default, just allowing
build.master@android.com for Android.mk with a per-file rule prevents
the owners of the directory to modify Android.mk files without bypassing
OWNERS check in gerrit.
This patch fixes this issue for Connectivity OWNERS files by explicitly
listing Connectivity members for a few Android.mk files.
Test: build
Change-Id: I9c2a2519c3e7dd27e66334b090e074968b408cbc
Lorenzo Colitti [Tue, 18 Jul 2017 15:23:44 +0000 (00:23 +0900)]
Minor fixes for netd restarts and StrictController.
1. Ensure we don't change strict mode network policy for a given
UID from a non-accept policy to another non-accept policy,
as netd does not support this.
2. Move the "strict enable" and "bandwidth enable" commands
inside the lock. This improves correctness, and it is safe to
do now that those commands now only take a few milliseconds,
instead of several hundred milliseconds.
3. Fix an NPE in connectNativeNetdService which causes the system
to crash when netd crashes.
Bug:
28362720
Test: bullhead builds, boots
Test: "adb shell killall netd" no longer crashes the system
Change-Id: Icdaa9d1e2288accf35de21df56bc6bd2b0628255
Treehugger Robot [Mon, 7 Aug 2017 19:17:33 +0000 (19:17 +0000)]
Merge "Use class retention for VisibleForTesting annotations"
Colin Cross [Fri, 4 Aug 2017 23:39:05 +0000 (16:39 -0700)]
Use class retention for VisibleForTesting annotations
The VisibleForTesting annotations are used by proguard to prevent
stripping code that is needed at runtime for tests. The annotations
were marked with source retention, which worked fine with Jack's
proguard implementation. When we switched back to javac + proguard,
the VisibleForTesting annotations are gone by the time proguard
sees the classes, so the annotated classes and methods can still
be stripped.
Move the VisibleForTesting annotation to class retention, which
matches guava's equivalent annotation.
Bug:
64365384
Test: m -j MtpDocumentsProvider &&
javap -cp out/target/common/obj/APPS/MtpDocumentsProvider_intermediates/classes-proguard.jar com.android.mtp.MtpRoot
Change-Id: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
Merged-In: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
(cherry picked from commit
8e846143ddc285117d391561de7abd670078d27f)
Treehugger Robot [Sat, 5 Aug 2017 00:55:48 +0000 (00:55 +0000)]
Merge "Add dirty_image_objects file."
Hugo Benichi [Sat, 5 Aug 2017 00:43:20 +0000 (00:43 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences"
Steven Moreland [Fri, 4 Aug 2017 19:14:48 +0000 (19:14 +0000)]
Merge "services.core: remove use of -static hidl java"
Colin Cross [Fri, 4 Aug 2017 15:54:24 +0000 (15:54 +0000)]
Merge "Move inserted method after end of try block"
Hugo Benichi [Fri, 4 Aug 2017 04:18:40 +0000 (13:18 +0900)]
NetworkCapabilities: fix describeImmutableDifferences
This patch fixes the mask used in describeImmutableDifferences which did
not correctly turn NET_CAPABILITY_NOT_METERED into bit flag.
Bug:
63326103
Test: added unit tests, runtest frameworks-net
Change-Id: Ib6b390b1daef5912859302692af7dcd6cfd3e39a
Colin Cross [Thu, 3 Aug 2017 22:58:45 +0000 (15:58 -0700)]
Move inserted method after end of try block
Methods inserted at the end of a synchronized {} block also need to
be outside of the implicit try{} block. Make sure the next
instruction is the virtual end label for the try block, and put
the inserted method after the label.
Bug:
64301866
Test: locked_region_code_injection test
Test: m -j checkbuild
Change-Id: I6626aa45580b4df692e02fc6127a2947a6075e2e
Calin Juravle [Sat, 22 Jul 2017 19:33:41 +0000 (12:33 -0700)]
Update DexLoadReporter to comply with the new reporting API
This is a partial cherry pick of commit
3bec94d78b0a66c4fa5cebd851ea33bcc51916b0.
It is partial because it only adapts DexLoadReporter to use the new
reporter BaseDexClassLoader.Reporter API.
Bug:
38138251
Test: make
Merged-In: I2486522fb811f9fc58a44b92642f43a41e7d5bac
(cherry picked from commit
3bec94d78b0a66c4fa5cebd851ea33bcc51916b0)
Change-Id: I4c41dbeb8a9297caac8b0eb936cf74832569f33e
Steven Moreland [Tue, 1 Aug 2017 23:34:40 +0000 (16:34 -0700)]
services.core: remove use of -static hidl java
These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).
Bug:
36376126
Test: boot marlin device
Merged-In: I6acb6a41fd5c62a3070ada373aed11706c423463
Change-Id: Ic3a62e7be36b1efca10a9e2e2d0efc430578d061
Jeff Hao [Mon, 31 Jul 2017 20:35:01 +0000 (13:35 -0700)]
Add dirty_image_objects file.
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.
(cherry-picked from commit
37641ae54ab72509276d0fdd3f0fabeea9988c4a)
Bug:
62554875
Test: mm test-art-host
Merged-In: I6a36120235ee4f47bc1cb1ddc4413cfc561cb9a7
Change-Id: I6a36120235ee4f47bc1cb1ddc4413cfc561cb9a7
Treehugger Robot [Thu, 3 Aug 2017 10:29:55 +0000 (10:29 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:15:24 +0000 (10:15 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
Treehugger Robot [Wed, 2 Aug 2017 23:25:32 +0000 (23:25 +0000)]
Merge "Fix compile issue"
Treehugger Robot [Wed, 2 Aug 2017 23:02:04 +0000 (23:02 +0000)]
Merge "com.android.server: use proper nativehelper headers"
John Reck [Wed, 29 Jun 2016 22:11:23 +0000 (15:11 -0700)]
Fix compile issue
Change-Id: Ic3423cfb23c6057210efb2e9110551b694c0101c
(cherry picked from commit
9688a3d33451134d6ff54f7b60f8db7a338a40f1)
Treehugger Robot [Wed, 2 Aug 2017 21:50:44 +0000 (21:50 +0000)]
Merge "zygote: always log process exit reason."
Steven Moreland [Tue, 1 Aug 2017 17:18:40 +0000 (10:18 -0700)]
com.android.server: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: com.android.server finds headers
Bug:
63762847
Merged-In: Icb3018f520004f65e8dd565d6e1d563551548eba
Change-Id: Ib36fec53c30760af5dac4097b3eceda6c4c6c7f0
Josh Gao [Wed, 2 Aug 2017 19:54:05 +0000 (12:54 -0700)]
zygote: always log process exit reason.
Multiple people have run into problems where apps disappear without a
trace. Always log process exit, so that it's clear when a process is
intentionally exiting. (The amount of extraneous logging this generates
is probably minimal.)
Test: none
Change-Id: I77169da4d0f05dabfe38490757975ad7ad0247b2
Treehugger Robot [Wed, 2 Aug 2017 17:10:11 +0000 (17:10 +0000)]
Merge "Add owners for the network security config"
Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]
Merge "Add hwbinder library"
Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
Jonathan Basseri [Wed, 2 Aug 2017 01:44:09 +0000 (01:44 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Jonathan Basseri [Wed, 2 Aug 2017 01:10:47 +0000 (01:10 +0000)]
Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit
6f4657363cac93ddcc718d9716e3b138f770f2e2.
Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
Stan Iliev [Wed, 27 Jul 2016 22:08:06 +0000 (18:08 -0400)]
Delete dead code function SpotShadow::makeClockwise
Delete SpotShadow::makeClockwise, which is unused and does
not link when compiler optimizations are disabled (for debugging).
SpotShadow::makeClockwise calls non-existent function
ShadowTessellator::isClockwise, which only works because the
optimizer deletes the function.
Change-Id: Ib8a014bf168782772faa1da7d75a079c1fd28ed9
(cherry picked from commit
fdb625a309755fb762c448dd8c2c4e3a7cc26021)
Chad Brubaker [Tue, 1 Aug 2017 20:03:06 +0000 (13:03 -0700)]
Add owners for the network security config
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I9bb8f5ceaae4a1af8c93f5416a6a5cea42915c62
Jonathan Basseri [Tue, 1 Aug 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.
Bug:
63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657