OSDN Git Service

android-x86/frameworks-base.git
6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 04:06:15 +0000 (21:06 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: If7d9f401dbe07259ce36955d9a09eea5d0150bf4

6 years agoMerge "Add storageId to moveObjects"
Jerry Zhang [Thu, 19 Oct 2017 18:11:49 +0000 (18:11 +0000)]
Merge "Add storageId to moveObjects"
am: 1f4f6d2a18

Change-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e

6 years agoMerge "Add storageId to moveObjects"
Jerry Zhang [Thu, 19 Oct 2017 17:55:34 +0000 (17:55 +0000)]
Merge "Add storageId to moveObjects"

6 years agoMerge "Add support for AES-GCM-ESP as an IPSec algorithm"
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

6 years agoMerge "Add support for AES-GCM-ESP as an IPSec algorithm"
Benedict Wong [Thu, 19 Oct 2017 17:06:30 +0000 (17:06 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm"

6 years agoMerge "Move most android.util.Mutable* classes to framework."
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

6 years agoMerge "Move most android.util.Mutable* classes to framework."
Tobias Thierer [Thu, 19 Oct 2017 16:08:07 +0000 (16:08 +0000)]
Merge "Move most android.util.Mutable* classes to framework."

6 years agoMerge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
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

6 years agoMerge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
Tobias Thierer [Thu, 19 Oct 2017 14:15:52 +0000 (14:15 +0000)]
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"

6 years agoMerge "Settings: Fix leak of BroadcastReceiver intents"
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

6 years agoMerge "Settings: Fix leak of BroadcastReceiver intents"
Treehugger Robot [Thu, 19 Oct 2017 05:53:23 +0000 (05:53 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents"

6 years agoSettings: Fix leak of BroadcastReceiver intents
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

6 years agoMerge "Allow ro. properties to have arbitrary lengths"
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

6 years agoAdd support for AES-GCM-ESP as an IPSec algorithm
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

6 years agoMerge "Allow ro. properties to have arbitrary lengths"
Tom Cherry [Wed, 18 Oct 2017 18:21:10 +0000 (18:21 +0000)]
Merge "Allow ro. properties to have arbitrary lengths"

6 years agoAllow 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

6 years agoMove most android.util.Mutable* classes to framework.
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

6 years agoFramework: Prefer android.system.Os over libcore.io.Libcore.os
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

6 years agoMerge "Use soong_ui directly, instead of make"
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

6 years agoMerge "Use soong_ui directly, instead of make"
Dan Willemsen [Wed, 18 Oct 2017 06:00:51 +0000 (06:00 +0000)]
Merge "Use soong_ui directly, instead of make"

6 years agoUse 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

6 years agoAdd storageId to moveObjects
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

6 years agoMerge "Add config to skip showing CF fail-to-disable dialog"
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

6 years agoMerge "Add config to skip showing CF fail-to-disable dialog"
Jordan Liu [Tue, 17 Oct 2017 20:58:01 +0000 (20:58 +0000)]
Merge "Add config to skip showing CF fail-to-disable dialog"

6 years agoMerge "Frameworks: Remove warning for SystemProperties.get"
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

6 years agoMerge "Frameworks: Remove warning for SystemProperties.get"
Tom Cherry [Tue, 17 Oct 2017 19:28:07 +0000 (19:28 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get"

6 years agoMerge "Batterystats handles nested unoptimized ble scans"
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

6 years agoMerge "Batterystats handles nested unoptimized ble scans"
Treehugger Robot [Tue, 17 Oct 2017 19:03:52 +0000 (19:03 +0000)]
Merge "Batterystats handles nested unoptimized ble scans"

6 years agoFrameworks: Remove warning for SystemProperties.get
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

6 years agoAdd config to skip showing CF fail-to-disable dialog
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

6 years agoMerge "Enhance network scan request"
Sooraj Sasindran [Tue, 17 Oct 2017 06:11:06 +0000 (06:11 +0000)]
Merge "Enhance network scan request"
am: b9f49e671a

Change-Id: If24d4740c346761391213f94647c43cbd742444a

6 years agoMerge "Enhance network scan request"
Sooraj Sasindran [Tue, 17 Oct 2017 06:03:31 +0000 (06:03 +0000)]
Merge "Enhance network scan request"

6 years agoBatterystats handles nested unoptimized ble scans
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)

6 years agoMerge "Revert "When updating a split app, copy compiled files from base.apk only.""
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

6 years agoMerge "Add null checks to EMBMS AIDL impls"
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

6 years agoMerge "Revert "When updating a split app, copy compiled files from base.apk only.""
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.""

6 years agoMerge "Add null checks to EMBMS AIDL impls"
Hall Liu [Mon, 16 Oct 2017 22:04:17 +0000 (22:04 +0000)]
Merge "Add null checks to EMBMS AIDL impls"

6 years agoMerge "Use -Werror in frameworks/base"
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

6 years agoMerge "Use -Werror in frameworks/base"
Chih-hung Hsieh [Mon, 16 Oct 2017 19:13:22 +0000 (19:13 +0000)]
Merge "Use -Werror in frameworks/base"

6 years agoMerge "Remove getNetworkType() from ServiceState"
nharold [Mon, 16 Oct 2017 18:41:22 +0000 (18:41 +0000)]
Merge "Remove getNetworkType() from ServiceState"
am: ce1f9afb84

Change-Id: I8e09f9060c7066e99428ea395743f66924443488

6 years agoMerge "Remove getNetworkType() from ServiceState"
nharold [Mon, 16 Oct 2017 18:30:01 +0000 (18:30 +0000)]
Merge "Remove getNetworkType() from ServiceState"

6 years agoMerge "Update locked_region_code_injection tool to ASM 6.0-BETA."
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

6 years agoMerge "Add change to show Invalid card when erroneous card is inserted."
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

6 years agoMerge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"
Hugo Benichi [Sun, 15 Oct 2017 02:24:52 +0000 (02:24 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"
am: d098328585

Change-Id: I1cbe45eb339903630675713d287e3375c7c98e62

6 years agoMerge "Convert ext.jar to Android.bp"
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

6 years agoAdd null checks to EMBMS AIDL impls
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

6 years agoRevert "When updating a split app, copy compiled files from base.apk only."
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

6 years agoUse -Werror in frameworks/base
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

6 years agoRemove getNetworkType() from ServiceState
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

6 years agoMerge "Update locked_region_code_injection tool to ASM 6.0-BETA."
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."

6 years agoEnhance network scan request
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

6 years agoMerge "Add change to show Invalid card when erroneous card is inserted."
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."

6 years agoMerge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"
Hugo Benichi [Fri, 13 Oct 2017 01:44:36 +0000 (01:44 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"

6 years agoMerge "Convert ext.jar to Android.bp"
Colin Cross [Fri, 13 Oct 2017 01:08:01 +0000 (01:08 +0000)]
Merge "Convert ext.jar to Android.bp"

6 years agoMerge "Add a new carrier config to suppress AoC indication"
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

6 years agoMerge "Add a new carrier config to suppress AoC indication"
Jordan Liu [Thu, 12 Oct 2017 23:42:17 +0000 (23:42 +0000)]
Merge "Add a new carrier config to suppress AoC indication"

6 years agoAdd 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

6 years agoMerge "Move to some properties users to libbase properties"
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

6 years agoMerge "Move to some properties users to libbase properties"
Tom Cherry [Thu, 12 Oct 2017 20:47:18 +0000 (20:47 +0000)]
Merge "Move to some properties users to libbase properties"

6 years agoUpdate locked_region_code_injection tool to ASM 6.0-BETA.
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

6 years agoMerge "MSIM: Fix to show PUK view when two sims locked on PIN."
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

6 years agoMerge "MSIM: Fix to show PUK view when two sims locked on PIN."
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."

6 years agoMerge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0"
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

6 years agoMerge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0"
Treehugger Robot [Thu, 12 Oct 2017 18:00:06 +0000 (18:00 +0000)]
Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0"

6 years agoDO NOT MERGE Update demo mode time to 8:00 for Android 8.0
Shawn [Thu, 12 Oct 2017 02:55:43 +0000 (22:55 -0400)]
DO NOT MERGE Update demo mode time to 8:00 for Android 8.0

Change-Id: I6162889c3859d007629226be2a47a6276807aec0

6 years agoMove to some properties users to libbase properties
Tom Cherry [Wed, 11 Oct 2017 20:44:21 +0000 (13:44 -0700)]
Move to some properties users to libbase properties

The libcutils interface cannot read properties with value length > 92
characters, whereas the libbase one can.  ro.build.fingerprint may be
larger than this size in the future, so we move to libbase to prepare.

Bug: 23102347
Bug: 34954705
Test: build
Change-Id: Ic91aa63c7db1a7a01b9a1ee321b7854a9bcf6d12

6 years agoFix ConnectivityServiceTest#testNetworkCallbackMaximum
Hugo Benichi [Thu, 12 Oct 2017 14:09:25 +0000 (23:09 +0900)]
Fix ConnectivityServiceTest#testNetworkCallbackMaximum

Although commit 893a762c2f7 fixed some flakyness issues in
testNetworkCallbackMaximum so that it became stable when ran on its own,
it introduced a new source of random failures because instead of
registering callbacks after callbacks until a limit was reached, commit
893a762c2f7 changed the test logic to push the assertions right up to
the theoretical limit.

More precisely when registering and unregistering PendingIntents in a
loop, not introducing some delay for checking that previous
PendingIntents have been effectively unregistered can cause the test to
fail. This patch fixes this issue.

Bug: 32561414
Bug: 62918393
Test: runtest frameworks-net
      testNetworkCallbackMaximum now succeeds 100 in a row on sailfish

Change-Id: I086817a738ab99fd53ba76ca8faada6151f46472

6 years agoMerge "Import a few android.net unit tests into frameworks-net"
Hugo Benichi [Thu, 12 Oct 2017 12:13:20 +0000 (12:13 +0000)]
Merge "Import a few android.net unit tests into frameworks-net"
am: 24660e5bb7

Change-Id: I41655938d6d1df19130847210437f047c8b65cdf

6 years agoMerge "Import a few android.net unit tests into frameworks-net"
Hugo Benichi [Thu, 12 Oct 2017 11:58:32 +0000 (11:58 +0000)]
Merge "Import a few android.net unit tests into frameworks-net"

6 years agoMerge "Migrate most of core networking tests to junit4"
Hugo Benichi [Thu, 12 Oct 2017 09:24:40 +0000 (09:24 +0000)]
Merge "Migrate most of core networking tests to junit4"
am: 9d456cd9c6

Change-Id: Ib124efb327bfbacd5a637753f9c9724e27a218cb

6 years agoMerge "Migrate most of core networking tests to junit4"
Treehugger Robot [Thu, 12 Oct 2017 09:06:24 +0000 (09:06 +0000)]
Merge "Migrate most of core networking tests to junit4"

6 years agoImport a few android.net unit tests into frameworks-net
Hugo Benichi [Thu, 12 Oct 2017 00:54:49 +0000 (09:54 +0900)]
Import a few android.net unit tests into frameworks-net

Bug: 62918393
Test: runtest frameworks-net
Change-Id: I3c7c60bcfeffec5c5ec287810312349237a2868a

6 years agoMigrate most of core networking tests to junit4
Hugo Benichi [Wed, 11 Oct 2017 02:26:25 +0000 (11:26 +0900)]
Migrate most of core networking tests to junit4

This patch is a batch of mechanical changes to test classes to migrate
away from AndroidTestCase and TestCase.

Bug: 62918393
Test: runtest frameworks-net
Change-Id: I74134609e511f22c4d9ecd65780e981f9ba7ae3f

6 years agoMSIM: Fix to show PUK view when two sims locked on PIN.
Pengquan Meng [Thu, 12 Oct 2017 00:43:33 +0000 (17:43 -0700)]
MSIM: Fix to show PUK view when two sims locked on PIN.

Currently when both sims are locked on PIN, upon exhausting
PIN attempts for SIM1 PIN, SIM1 PUK view is not displayed
and the user is not able to unlock the PUK.

This is due to while fetching the getSecurityMode in Key
-GuardSecurityModel, the ordering of checking the security
mode is PIN first and PUK later.So when one sim is locked
on PUK and the other is locked on PIN the ordering of checking
the PIN first is causing to return PIN as security mode in place
of PUK. This will lead to PUK lock screen not been shown to user.

Fix: In KeyGuardSecurityModel.java, while querying the security Mode
modify the order to check for security mode i.e PUK locked state first
and then PIN locked state.

In KeyGuardSimPinView and KeyGuardSimPukView, check for sim locked on
PIN and reset the flags to show the default message.

Test: manually test
Bug: 34796244

Change-Id: I157959d9eb313b9d3af84f86e1429448a0f7f065

6 years agoMerge "Fix URI unparceling and clarify an error condition"
Hall Liu [Wed, 11 Oct 2017 23:28:42 +0000 (23:28 +0000)]
Merge "Fix URI unparceling and clarify an error condition"
am: 5f123e6ad6

Change-Id: Ib8023d966e01fd2acefc464d8d25ed5030cfd85b

6 years agoMerge "Fix URI unparceling and clarify an error condition"
Hall Liu [Wed, 11 Oct 2017 23:04:58 +0000 (23:04 +0000)]
Merge "Fix URI unparceling and clarify an error condition"

6 years agoMerge "Add new Download Error Codes"
Brad Ebinger [Wed, 11 Oct 2017 22:24:58 +0000 (22:24 +0000)]
Merge "Add new Download Error Codes"
am: e9bd5449b5

Change-Id: I8fa3c3dcc5104a5326a680ae186c9285a7e47358

6 years agoMerge "Add new Download Error Codes"
Brad Ebinger [Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +0000)]
Merge "Add new Download Error Codes"

6 years agoMerge "Add missing includes."
Dan Albert [Wed, 11 Oct 2017 21:52:41 +0000 (21:52 +0000)]
Merge "Add missing includes."
am: 4be4bb3db7

Change-Id: Icdae2b63df8e5d61e6acabb6fb85efa28026d535

6 years agoMerge "Add missing includes."
Treehugger Robot [Wed, 11 Oct 2017 21:37:28 +0000 (21:37 +0000)]
Merge "Add missing includes."

6 years agoAdd change to show Invalid card when erroneous card is inserted.
Wileen Chiu [Wed, 29 Oct 2014 17:18:21 +0000 (22:48 +0530)]
Add change to show Invalid card when erroneous card is inserted.

Add change to show "Invalid card" on UI on CARD_IO_ERROR when
erroneous SIM card is inserted

Bug: 23147806
Change-Id: Ibaacf06f2aad8f206095783cc431a87485f1c2ad

6 years agoAdd missing includes.
Dan Albert [Wed, 11 Oct 2017 19:41:26 +0000 (12:41 -0700)]
Add missing includes.

Test: mma
Bug: None
Change-Id: Iec8b0a7854091946a4bb6e804c5f4cce39a52b47

6 years agoMerge "Convert libjnigraphics to Android.bp"
Colin Cross [Wed, 11 Oct 2017 18:37:19 +0000 (18:37 +0000)]
Merge "Convert libjnigraphics to Android.bp"
am: 006c167544

Change-Id: Ic07a49510c946104f74ad72a830aed9696a2ddd6

6 years agoMerge "Convert libjnigraphics to Android.bp"
Colin Cross [Wed, 11 Oct 2017 18:18:45 +0000 (18:18 +0000)]
Merge "Convert libjnigraphics to Android.bp"

6 years agoMerge "Add MM#6 string overlay"
Jordan Liu [Wed, 11 Oct 2017 16:31:10 +0000 (16:31 +0000)]
Merge "Add MM#6 string overlay"
am: b53262c148

Change-Id: I1cbdba97bba4e0074c60ce374978ffb0b0cca8de

6 years agoMerge "Add MM#6 string overlay"
Jordan Liu [Wed, 11 Oct 2017 16:15:39 +0000 (16:15 +0000)]
Merge "Add MM#6 string overlay"

6 years agoMerge "EventLogHelper: Clean up code"
Andreas Gampe [Wed, 11 Oct 2017 16:00:51 +0000 (16:00 +0000)]
Merge "EventLogHelper: Clean up code"
am: 386a5687dd

Change-Id: Id2bfdb49859d9ad62e733b8037e27b54bbdb3537

6 years agoMerge "EventLogHelper: Clean up code"
Treehugger Robot [Wed, 11 Oct 2017 15:48:46 +0000 (15:48 +0000)]
Merge "EventLogHelper: Clean up code"

6 years agoMerge "IpManager: add display name for helpful logging, and Network"
Erik Kline [Wed, 11 Oct 2017 12:52:23 +0000 (12:52 +0000)]
Merge "IpManager: add display name for helpful logging, and Network"
am: ed0b030e17

Change-Id: I9b5fb4b995e351dfed74bfe83993e379c87305d6

6 years agoMerge "IpManager: add display name for helpful logging, and Network"
Treehugger Robot [Wed, 11 Oct 2017 12:42:41 +0000 (12:42 +0000)]
Merge "IpManager: add display name for helpful logging, and Network"

6 years agoIpManager: add display name for helpful logging, and Network
Erik Kline [Wed, 4 Oct 2017 11:28:54 +0000 (20:28 +0900)]
IpManager: add display name for helpful logging, and Network

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 62476366
Change-Id: I509506814fa704e54f3d67158203276312a24fa1

6 years agoMerge "Log upstream network suspend/resume callbacks"
Erik Kline [Wed, 11 Oct 2017 04:08:55 +0000 (04:08 +0000)]
Merge "Log upstream network suspend/resume callbacks"
am: 645cd2ad26

Change-Id: I375e47a21d2fc6a5e67ff6367087c22beceb6377

6 years agoMerge "Log upstream network suspend/resume callbacks"
Treehugger Robot [Wed, 11 Oct 2017 04:00:16 +0000 (04:00 +0000)]
Merge "Log upstream network suspend/resume callbacks"

6 years agoLog upstream network suspend/resume callbacks
Erik Kline [Tue, 10 Oct 2017 02:54:08 +0000 (11:54 +0900)]
Log upstream network suspend/resume callbacks

Also log signal strength while we're at it:

    2017-10-10T14:05:00.968 - [UpstreamNetworkMonitor] preferred upstream type: WIFI
    2017-10-10T14:06:07.654 - [UpstreamNetworkMonitor] upstream network signal strength: -62 -> -67
    2017-10-10T14:06:13.704 - [UpstreamNetworkMonitor] upstream network signal strength: -67 -> -64

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Bug: 64976634
Bug: 67396342

Merged-In: I9121798bba0be9dcdf1e45d39c092020620fa53b
Merged-In: I1d3420380691efd886315275598134b98f4041ed
Change-Id: Id6e143edc9f5b0256aa637643680f6c8dce70d90
(cherry picked from commit 60caf7d29132262dd4a077b68daa807d22773524)

6 years agoFix URI unparceling and clarify an error condition
Hall Liu [Wed, 11 Oct 2017 02:08:24 +0000 (19:08 -0700)]
Fix URI unparceling and clarify an error condition

Use the proper unparceling method for lists, add a more verbose
exception for when the app fails to declare a critical piece of
metadata.

Change-Id: I29d5291d7b88476496334d268be94f7f8c08255c
Fixes: 67640653
Test: manual, with testapp

6 years agoMerge "LoggingPrintStream: Make visible for testing"
Andreas Gampe [Tue, 10 Oct 2017 21:11:10 +0000 (21:11 +0000)]
Merge "LoggingPrintStream: Make visible for testing"
am: 7d1789867b

Change-Id: If6e464f6840b66deb6f6c61b0ca96d847444e910

6 years agoMerge "LoggingPrintStream: Make visible for testing"
Treehugger Robot [Tue, 10 Oct 2017 20:57:55 +0000 (20:57 +0000)]
Merge "LoggingPrintStream: Make visible for testing"

6 years agoAdd new Download Error Codes
Brad Ebinger [Tue, 10 Oct 2017 01:06:59 +0000 (18:06 -0700)]
Add new Download Error Codes

Adds new MBMS Download Session error codes to allow for
more fine grained error reporting to the client app.

Test: Manual
Change-Id: I9c2163d934835efaaa145e4c0f8a91838d84aa1e

6 years agoMerge "Require DownloadRequest#Builder to have mandatory Source URI"
Brad Ebinger [Tue, 10 Oct 2017 18:39:56 +0000 (18:39 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI"
am: 432c2b0fb9

Change-Id: I3332d44105c6ce4f8d4223caad66715c4c67d52f

6 years agoMerge "Require DownloadRequest#Builder to have mandatory Source URI"
Brad Ebinger [Tue, 10 Oct 2017 18:27:36 +0000 (18:27 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI"