OSDN Git Service
TreeHugger Robot [Fri, 20 Oct 2017 15:32:39 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:31:30 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:31:01 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:29:19 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:28:04 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:27:19 +0000 (15:27 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:23:26 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Ben Schwartz [Fri, 20 Oct 2017 15:08:55 +0000 (15:08 +0000)]
Merge "Add a global setting to disable DNS over TLS"
am:
4a906c167b
Change-Id: Ie0f5586342b32c9e7c745ab9697b44158a920233
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a global setting to disable DNS over TLS"
Nick Kralevich [Fri, 20 Oct 2017 14:53:14 +0000 (14:53 +0000)]
Merge "more O_CLOEXEC"
am:
9f8ed6500a
Change-Id: I7d07ad29cddeac5f44cc5a918e33b0a9068d29c0
Treehugger Robot [Fri, 20 Oct 2017 14:44:26 +0000 (14:44 +0000)]
Merge "more O_CLOEXEC"
Bill Yi [Fri, 20 Oct 2017 09:23:10 +0000 (02:23 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: I54b9c45224a393b5724a8964858817e3247ece54
Bill Yi [Fri, 20 Oct 2017 09:06:39 +0000 (02:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: I1786cdac7dae8737ba1f7ea7665a62dfcfc2d7f2
Niranjan Pendharkar [Fri, 20 Oct 2017 08:25:19 +0000 (08:25 +0000)]
Merge "Fix netlink group mismatch in fds used for offload"
am:
fb7c0e8c91
Change-Id: Iaca85d6b06dfc642ffce7c53bb87cd25dabe04c9
Treehugger Robot [Fri, 20 Oct 2017 08:14:40 +0000 (08:14 +0000)]
Merge "Fix netlink group mismatch in fds used for offload"
Bill Yi [Fri, 20 Oct 2017 05:58:04 +0000 (22:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: I92ebc3587a83fcb69588e4629eac2d8a779c2ebd
Pengquan Meng [Fri, 20 Oct 2017 05:52:43 +0000 (05:52 +0000)]
Merge "[framework] Fixed signal strength issue"
am:
6d98743048
Change-Id: I5d6ff6f0419b658ee9786567087b95ced5e70233
Bill Yi [Fri, 20 Oct 2017 05:50:47 +0000 (22:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: Ie775264bf5f54adb9239d9a66821164c8db38136
Pengquan Meng [Fri, 20 Oct 2017 05:44:42 +0000 (05:44 +0000)]
Merge "[framework] Fixed signal strength issue"
Niranjan Pendharkar [Wed, 18 Oct 2017 23:58:25 +0000 (16:58 -0700)]
Fix netlink group mismatch in fds used for offload
Existing groups used for binding to netlink conntrack events don't
seem to work as expected. Fix this by using exact groups defined
in IOffloadConfig hal.
Test: as follows
- Compiles and boots on walleye
- Validated conntrack destroy events are received as expected.
- Validated offload works as expected.
Bug:
68018148
CRs-fixed:
2126789
Change-Id: I76178fd7f109b82a4e4961347b8949937813d71d
Steven Moreland [Fri, 20 Oct 2017 04:23:34 +0000 (04:23 +0000)]
Merge "HwBinder: don't re-implement libhidl's getService"
am:
992f9e7e0b
Change-Id: Icd082eca740ea5a9839dffc326c45ed9d4102a10
Bill Yi [Fri, 20 Oct 2017 04:12:57 +0000 (21:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: If95ea8054ecb9379831d35c7dbc0e66da6eb40cf
Treehugger Robot [Fri, 20 Oct 2017 04:12:29 +0000 (04:12 +0000)]
Merge "HwBinder: don't re-implement libhidl's getService"
Bill Yi [Fri, 20 Oct 2017 03:59:22 +0000 (20:59 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: I4b0f45fb1d4416ac0996365e9da9f83b966c6e66
Bill Yi [Fri, 20 Oct 2017 03:24:36 +0000 (20:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: Ib3f8bff07023825dbc2b4e15daf73e0c03341d29
Erik Kline [Fri, 20 Oct 2017 02:45:14 +0000 (02:45 +0000)]
Merge changes I3b56e75d,I36255a2c
am:
5c7128c070
Change-Id: I8ab4bfa6a069d24b89a6595dbc9ffd5d6dd816ec
Treehugger Robot [Fri, 20 Oct 2017 02:29:41 +0000 (02:29 +0000)]
Merge changes I3b56e75d,I36255a2c
* changes:
Skeletal IpManager proxying to the new IpClient
Rename IpManager to IpClient
tiansiming [Fri, 20 Oct 2017 01:47:15 +0000 (01:47 +0000)]
Merge "Remove "result2" in AccountManagerService"
am:
eaf4d18bdf
Change-Id: I80c362a0250430f5d8948e4815638eab31d8c2b1
Treehugger Robot [Fri, 20 Oct 2017 01:29:45 +0000 (01:29 +0000)]
Merge "Remove "result2" in AccountManagerService"
Nick Kralevich [Fri, 20 Oct 2017 00:51:50 +0000 (17:51 -0700)]
more O_CLOEXEC
Test: code compiles.
Change-Id: I4f76258cc607dee6754abbcab5ba5d4c339e69cd
Nan Zhang [Fri, 20 Oct 2017 00:17:23 +0000 (00:17 +0000)]
Merge "Shard framework during Java compilation for target side."
am:
6a90c3f793
Change-Id: I1a24f704d3537bde1e4aaef5bd4edf4cc898bb04
Treehugger Robot [Thu, 19 Oct 2017 23:46:18 +0000 (23:46 +0000)]
Merge "Shard framework during Java compilation for target side."
Pengquan Meng [Thu, 19 Oct 2017 01:07:58 +0000 (18:07 -0700)]
[framework] Fixed signal strength issue
The flag GSM of signal strength maybe unknown under OOS, but the signal
strength changed has been notified. In this case, set the flag GSM based
on the signal strength data.
Test: manual
Bug:
62431424
Change-Id: I9e63c45ea8b7c6c37e6ecd2478808c310c3d69ae
Jerry Zhang [Thu, 19 Oct 2017 18:11:49 +0000 (18:11 +0000)]
Merge "Add storageId to moveObjects"
am:
1f4f6d2a18
Change-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e
Jerry Zhang [Thu, 19 Oct 2017 17:55:34 +0000 (17:55 +0000)]
Merge "Add storageId to moveObjects"
Benedict Wong [Thu, 19 Oct 2017 17:14:53 +0000 (17:14 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
am:
b6df7f0d35
Change-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b
Benedict Wong [Thu, 19 Oct 2017 17:06:30 +0000 (17:06 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
Tobias Thierer [Thu, 19 Oct 2017 16:18:44 +0000 (16:18 +0000)]
Merge "Move most android.util.Mutable* classes to framework."
am:
cd06caf10e
Change-Id: I25fd01bd4bc8c582e6cb79a03de47847b46bcb83
Tobias Thierer [Thu, 19 Oct 2017 16:08:07 +0000 (16:08 +0000)]
Merge "Move most android.util.Mutable* classes to framework."
Tobias Thierer [Thu, 19 Oct 2017 14:25:12 +0000 (14:25 +0000)]
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
am:
5f04db96b3
Change-Id: If85216d03022708787a7218e494434453d5548e3
Tobias Thierer [Thu, 19 Oct 2017 14:15:52 +0000 (14:15 +0000)]
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
Steven Moreland [Thu, 19 Oct 2017 06:19:43 +0000 (23:19 -0700)]
HwBinder: don't re-implement libhidl's getService
Rather than re-implementing getService in the JNI backend
for HIDL Java classes, we call the implementation in libhidl.
This does several good things:
- prevents frameworks/base/core from depending on PRODUCT_FULL_TREBLE
- prevents frameworks/base/core from having any user vs. userdebug differences
- ensures there are no subtle differences between C++ and Java getService
- removes essentially copy/pasted code
- unlocks the door to provide 'getService' 'tryGetService' semantics in Java
(b/
67981006)
Has the side effect of making passthrough mode kind work in Java, but
still with parcelling to transition between the ABIs:
- getRawServiceInternal returns passthrough service
- toBinder wraps that service in Bn*
- in-process binder calls are made in the same process
Test: device boots + hidl_test_java
Bug:
67974907
Change-Id: Ie459f95eb8a059f578f703d1f73ca42417cfeeb8
Manu Viswanadhan [Thu, 19 Oct 2017 06:02:23 +0000 (06:02 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents"
am:
3499af28c4
Change-Id: I2b0f3920f39981956d25017999a25799d995252b
Treehugger Robot [Thu, 19 Oct 2017 05:53:23 +0000 (05:53 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents"
Erik Kline [Wed, 11 Oct 2017 13:00:11 +0000 (22:00 +0900)]
Skeletal IpManager proxying to the new IpClient
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- both wifi and ethernet connectivity works
Bug:
62476366
Change-Id: I3b56e75d545594b88849a621e4ae09f2e1d45c69
Erik Kline [Wed, 11 Oct 2017 10:43:10 +0000 (19:43 +0900)]
Rename IpManager to IpClient
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
62476366
Change-Id: I36255a2c8e1a2f52693716b445359cce0b4304af
Manu Viswanadhan [Tue, 25 Oct 2016 15:08:23 +0000 (20:38 +0530)]
Settings: Fix leak of BroadcastReceiver intents
Use Case: Repeated BT ON/OFF
Failure: Broadcast receiver leak is observed with ON/OFF stress
test which leads to broadcast receiver delays.
Steps:
BT ON/OFF.
Root Cause: During every ON/OFF there are broadcast receiver leaks
caused by repeated registering of profile intent receivers.
Fix: Separate broadcast receiver created for profile intents, such
that broadcast receiver for adapter state intents is always
active. Unregister and re-register the profile receiver when BT
is turned OFF.
Test: BT ON/OFF
Bug:
35415158
Change-Id: Id1db747c61bb2dd33515ac45cdc2059844d3e4f5
Tom Cherry [Wed, 18 Oct 2017 18:39:42 +0000 (18:39 +0000)]
Merge "Allow ro. properties to have arbitrary lengths"
am:
3851f132d1
Change-Id: Ie9c340401786d97e469e283418cffef6fbbbb186
Benedict Wong [Wed, 23 Aug 2017 04:42:33 +0000 (21:42 -0700)]
Add support for AES-GCM-ESP as an IPSec algorithm
Allows native AES-GCM-ESP to be used as an IPSec transport/tunnel mode
algorithm with kernel support
Bug:
63589918
Test: IPsecService tests added, existing ones pass
Change-Id: Ie1a9a902be205f269aa37bf956198f2e5b177c21
Tom Cherry [Wed, 18 Oct 2017 18:21:10 +0000 (18:21 +0000)]
Merge "Allow ro. properties to have arbitrary lengths"
Tom Cherry [Wed, 18 Oct 2017 16:25:17 +0000 (09:25 -0700)]
Allow ro. properties to have arbitrary lengths
Bug:
23102347
Bug:
34954705
Test: build
Change-Id: I99b074633c60e95cdd2284bf8a708b9187c1e310
Tobias Thierer [Wed, 18 Oct 2017 13:33:57 +0000 (14:33 +0100)]
Move most android.util.Mutable* classes to framework.
android.util is the only package shared between libcore and
framework, with only the Mutable* classes living in libcore.
This CL topic moves most of these classes to framework.
After this CL topic, only MutableInt and MutableLong remain
in libcore. This prevents future libcore dependencies on
android.util; it is a first step towards removing the package
overlap between libcore and framework.
Test: Treehugger
Bug:
67901714
Change-Id: Id466181cb0db747da17f38ddb0b99c3e522add16
Tobias Thierer [Tue, 17 Oct 2017 19:26:20 +0000 (20:26 +0100)]
Framework: Prefer android.system.Os over libcore.io.Libcore.os
This is a pure refactoring with no a behavior change other than
that these calls now go through android.system.Os, which immediately
delegates to Libcore.os.
This is a first step towards separating framework (via
android.system.Os) vs. libcore (via Libcore.os) clients of these
low level APIs. Separating these is a prerequisite towards moving
the API parts of android.system into framework, and moving the
rest into a different package in libcore.
Test: Treehugger
Bug:
67901714
Change-Id: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
Merged-In: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
Dan Willemsen [Wed, 18 Oct 2017 06:10:06 +0000 (06:10 +0000)]
Merge "Use soong_ui directly, instead of make"
am:
e994b4b584
Change-Id: I406a02af2d5fd1accf5c53609af00f416669e18f
Dan Willemsen [Wed, 18 Oct 2017 06:00:51 +0000 (06:00 +0000)]
Merge "Use soong_ui directly, instead of make"
Dan Willemsen [Wed, 18 Oct 2017 00:46:41 +0000 (17:46 -0700)]
Use soong_ui directly, instead of make
This will use ckati instead of make for dumping variables, for
consistent makefile parsing. It may also sandbox executions, etc.
Also skip the legacy make wrapper to build, and use soong_ui instead.
The command line arguments are equivalent, but -j is no longer
necessary, we'll default to a sane value.
Test: bit -b framework
Change-Id: Idc2c9d1abe84b6b783b8702925de5493d47a4509
Jerry Zhang [Tue, 17 Oct 2017 20:47:51 +0000 (13:47 -0700)]
Add storageId to moveObjects
When moving between different storages, the storageId
must be changed as well.
Bug:
67028892
Test: Move between storages with virtual sdcard.
Change-Id: Ie82aa8d53686bfffb7c26b46a49524a00f2f0214
Jordan Liu [Tue, 17 Oct 2017 21:06:58 +0000 (21:06 +0000)]
Merge "Add config to skip showing CF fail-to-disable dialog"
am:
d32138d78a
Change-Id: I0bb3388b4f2e0243049316c3548aacf6f034ffd2
Jordan Liu [Tue, 17 Oct 2017 20:58:01 +0000 (20:58 +0000)]
Merge "Add config to skip showing CF fail-to-disable dialog"
Tom Cherry [Tue, 17 Oct 2017 19:37:45 +0000 (19:37 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get"
am:
c589496ce9
Change-Id: Ibef1415adec0dac324b0531b7038640c3584fdf1
Tom Cherry [Tue, 17 Oct 2017 19:28:07 +0000 (19:28 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get"
Bookatz [Tue, 17 Oct 2017 19:24:40 +0000 (19:24 +0000)]
Merge "Batterystats handles nested unoptimized ble scans"
am:
4627c01ee4 -s ours
Change-Id: I044d02d6b00f63573870643ad83fce11740dd498
Treehugger Robot [Tue, 17 Oct 2017 19:03:52 +0000 (19:03 +0000)]
Merge "Batterystats handles nested unoptimized ble scans"
Ben Schwartz [Mon, 2 Oct 2017 17:27:13 +0000 (13:27 -0400)]
Add a global setting to disable DNS over TLS
Bug:
63449024
Test: Manual. Appears to work.
Change-Id: Ib3b58bfff5951240a2e02f18c362efa96635ef4f
Tom Cherry [Tue, 17 Oct 2017 16:20:01 +0000 (09:20 -0700)]
Frameworks: Remove warning for SystemProperties.get
We now disallow non-UTF8 property values directly in property_service,
so there is no need for this warning.
This partially reverts
33aea8d40e6cc99f7968a6c6605a81a4587b85e7.
Bug:
63177684
Test: make
Change-Id: I61f49f635c6095013f55b906e00925a8cbd1ea8c
DongYuchen [Thu, 16 Feb 2017 10:22:36 +0000 (18:22 +0800)]
Add config to skip showing CF fail-to-disable dialog
Add config to skip showing CF fail-to-disable dialog. Because it is not
always correct to show fail-to-disable dialog. It depends on the way
of NW CF handling. The default value is set to false.
Test: manual - checked the call forwarding fail dialog was not shown
Bug:
35790386
Change-Id: I8b0e3d15736d95df8fcac205cb9a3ef2f8579988
Sooraj Sasindran [Tue, 17 Oct 2017 06:11:06 +0000 (06:11 +0000)]
Merge "Enhance network scan request"
am:
b9f49e671a
Change-Id: If24d4740c346761391213f94647c43cbd742444a
Sooraj Sasindran [Tue, 17 Oct 2017 06:03:31 +0000 (06:03 +0000)]
Merge "Enhance network scan request"
Bookatz [Tue, 11 Jul 2017 23:49:17 +0000 (16:49 -0700)]
Batterystats handles nested unoptimized ble scans
When a ble scan starts, it tells batterystats whether that scan is
unoptimized. When the scan stops, batterystats is not informed of
whether the stopped scan was unoptimized. Because the ble scan call
could not be nested (couldn't call start twice without stopping first),
this was fine, but now nesting is possible, so batterystats needs to
know whether the stopped ble scan is unoptimized.
Bug:
63456783
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Test: no new errors when run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testUnoptimizedBleScans
Change-Id: Ia73f294cf1807ddaf20f1c0bcc28add001cac78c
Merged-In: Ia73f294cf1807ddaf20f1c0bcc28add001cac78c
(cherry picked from commit
94c5a313d7313a9a88abdf4267af43b87deb0dd2)
Calin Juravle [Mon, 16 Oct 2017 22:51:45 +0000 (22:51 +0000)]
Merge "Revert "When updating a split app, copy compiled files from base.apk only.""
am:
154535317e
Change-Id: Ia91f126900e3c52016af233f33c47b0a3c38d111
Hall Liu [Mon, 16 Oct 2017 22:44:48 +0000 (22:44 +0000)]
Merge "Add null checks to EMBMS AIDL impls"
am:
9e93a6515e
Change-Id: I888b5772fca069b638f1c2d0f803cf3863b7ff85
Calin Juravle [Mon, 16 Oct 2017 22:26:06 +0000 (22:26 +0000)]
Merge "Revert "When updating a split app, copy compiled files from base.apk only.""
Hall Liu [Mon, 16 Oct 2017 22:04:17 +0000 (22:04 +0000)]
Merge "Add null checks to EMBMS AIDL impls"
Chih-hung Hsieh [Mon, 16 Oct 2017 19:24:53 +0000 (19:24 +0000)]
Merge "Use -Werror in frameworks/base"
am:
16fbd3a1d8
Change-Id: Iab69cf4f99cf4bedd12eb7764c773a893bfe5343
Chih-hung Hsieh [Mon, 16 Oct 2017 19:13:22 +0000 (19:13 +0000)]
Merge "Use -Werror in frameworks/base"
nharold [Mon, 16 Oct 2017 18:41:22 +0000 (18:41 +0000)]
Merge "Remove getNetworkType() from ServiceState"
am:
ce1f9afb84
Change-Id: I8e09f9060c7066e99428ea395743f66924443488
nharold [Mon, 16 Oct 2017 18:30:01 +0000 (18:30 +0000)]
Merge "Remove getNetworkType() from ServiceState"
tiansiming [Fri, 13 Oct 2017 02:57:25 +0000 (10:57 +0800)]
Remove "result2" in AccountManagerService
I think result2 here is to filter out other value returned from getAccountRemovalAllowed.
As the annotation shown in getAccountRemovalAllowed in AbstractAccountAuthenticator,
the result will only contain KEY_INTENT or KEY_BOOLEAN_RESULT or
KEY_ERROR_CODE and KEY_ERROR_MESSAGE. KEY_INTENT has been judged at the beginning of onResult,
KEY_ERROR_CODE and KEY_ERROR_MESSAGE seem extraneous when back to AccountManager,
so i believe that it's ok to use result directly here other than get one more Bundle object.
(tip: if result2 is nessesary, its name doesn't looks formal)
Bug:N/A
Test:N/A
Change-Id: I4e352baa1e74ac680398c328db0c4bc873ba528b
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Tobias Thierer [Sun, 15 Oct 2017 02:38:05 +0000 (02:38 +0000)]
Merge "Update locked_region_code_injection tool to ASM 6.0-BETA."
am:
26817938f6
Change-Id: I193d04b7a4ebf0f39f60ac275a7eeb93499ded9d
Wileen Chiu [Sun, 15 Oct 2017 02:32:25 +0000 (02:32 +0000)]
Merge "Add change to show Invalid card when erroneous card is inserted."
am:
4bc825aecc
Change-Id: I89a5b529033c30defacc715ef3c8310500e5fae7
Hugo Benichi [Sun, 15 Oct 2017 02:24:52 +0000 (02:24 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"
am:
d098328585
Change-Id: I1cbe45eb339903630675713d287e3375c7c98e62
Colin Cross [Sun, 15 Oct 2017 02:06:20 +0000 (02:06 +0000)]
Merge "Convert ext.jar to Android.bp"
am:
42156f3e56
Change-Id: I44443e9095c8b527ebb42d11a6f5369fdf3e5d05
Hall Liu [Fri, 13 Oct 2017 23:51:21 +0000 (16:51 -0700)]
Add null checks to EMBMS AIDL impls
Add null checks for things that the user passes in so that they don't
inadvertently cause NPEs for the middleware later on.
Change-Id: I09392a2ac9adec494fcbeeba889ce7fca6708323
Fixes:
67785040
Test: manual
Calin Juravle [Fri, 13 Oct 2017 23:46:26 +0000 (23:46 +0000)]
Revert "When updating a split app, copy compiled files from base.apk only."
This reverts commit
d1235f54d4943a0a3a920013a5875b5193bd0490.
Reason for revert: We now include the classpath when asking the runtime
if we need to dexopt. This hack is no longer needed.
Bug:
62269291
Change-Id: I396778f6db0acbbe9017168b35e6023ff97f36fe
Chih-Hung Hsieh [Tue, 3 Oct 2017 16:57:55 +0000 (09:57 -0700)]
Use -Werror in frameworks/base
* Fix unused variable and return value warnings.
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: I890e65a20848d00559ba5a4f9691be1347b456af
Nathan Harold [Mon, 9 Oct 2017 18:27:40 +0000 (11:27 -0700)]
Remove getNetworkType() from ServiceState
This method was deprecated 4 years and 11 months ago
and set to be removed in 2013. It was replaced by
getVoiceNetworkType().
Bug:
67589287
Test: make checkbuild on goog/master
Change-Id: I5fefa755738ff2fb3f3babfcafd4dfb329314feb
Tobias Thierer [Fri, 13 Oct 2017 17:40:50 +0000 (17:40 +0000)]
Merge "Update locked_region_code_injection tool to ASM 6.0-BETA."
Sooraj Sasindran [Thu, 20 Jul 2017 09:43:58 +0000 (02:43 -0700)]
Enhance network scan request
BUG=
63865942
Test: Verified by making changes in settings app to call the api
and confirmed that the new information is delivered to vendor
code
Merged-In: Ia17647bdedefed5230f4d113b7286d820f557e95
Change-Id: Ia17647bdedefed5230f4d113b7286d820f557e95
Treehugger Robot [Fri, 13 Oct 2017 13:02:21 +0000 (13:02 +0000)]
Merge "Add change to show Invalid card when erroneous card is inserted."
Hugo Benichi [Fri, 13 Oct 2017 01:44:36 +0000 (01:44 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"
Colin Cross [Fri, 13 Oct 2017 01:08:01 +0000 (01:08 +0000)]
Merge "Convert ext.jar to Android.bp"
Jordan Liu [Thu, 12 Oct 2017 23:58:55 +0000 (23:58 +0000)]
Merge "Add a new carrier config to suppress AoC indication"
am:
db95dff0d8
Change-Id: If86b396f87e4f9f143f7abc02b4e05478693ade0
Jordan Liu [Thu, 12 Oct 2017 23:42:17 +0000 (23:42 +0000)]
Merge "Add a new carrier config to suppress AoC indication"
Omata Shou [Tue, 22 Aug 2017 08:17:55 +0000 (17:17 +0900)]
Add a new carrier config to suppress AoC indication
Some carriers require to suppress the AoC(Advice of Charge) indication.
This carrier config is used to disable the popup dialog which warns the
user of data charges.
Test: Passed make build
Bug:
65036581
Merged-In: Ibb8d548573c9c747c790722ee526fcd626b3fa67
Change-Id: Ibb8d548573c9c747c790722ee526fcd626b3fa67
Tom Cherry [Thu, 12 Oct 2017 21:01:53 +0000 (21:01 +0000)]
Merge "Move to some properties users to libbase properties"
am:
2b20612e77
Change-Id: I376b9179ed242810c529d289558a44b422c1e8f5
Tom Cherry [Thu, 12 Oct 2017 20:47:18 +0000 (20:47 +0000)]
Merge "Move to some properties users to libbase properties"
Tobias Thierer [Wed, 11 Oct 2017 15:46:05 +0000 (16:46 +0100)]
Update locked_region_code_injection tool to ASM 6.0-BETA.
ASM 6 is required to read version 53 (OpenJDK 9) class files.
Test: make EXPERIMENTAL_USE_OPENJDK9=true services.core
(in the presence of other unsubmitted CLs that fix
other issues)
Test: Copied all required dependencies into a subdirectory lib/,
then ran the steps from TestMain.java, both for OpenJDK 8
and OpenJDK 9 toolchains.
Bug:
67676752
Change-Id: If324d8ea28450d9a8426a2279190b2f4d9213ed5
Pengquan Meng [Thu, 12 Oct 2017 18:26:47 +0000 (18:26 +0000)]
Merge "MSIM: Fix to show PUK view when two sims locked on PIN."
am:
00644ec5cc
Change-Id: Ic0b0927a52f2734cccff6f977aa0dfe9cd6e8d5c
Pengquan Meng [Thu, 12 Oct 2017 18:10:37 +0000 (18:10 +0000)]
Merge "MSIM: Fix to show PUK view when two sims locked on PIN."
Shawn [Thu, 12 Oct 2017 18:08:39 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0"
am:
afc4e370cd -s ours
Change-Id: I3fa8d25130022abb4b5d0e39c0fc149ec2190604