OSDN Git Service

android-x86/frameworks-base.git
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: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 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:28:07 +0000 (19:28 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get"

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: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: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: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:30:01 +0000 (18:30 +0000)]
Merge "Remove getNetworkType() from ServiceState"

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: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 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: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"
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 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"
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: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:12:26 +0000 (22:12 +0000)]
Merge "Add new Download Error Codes"

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: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:15:39 +0000 (16:15 +0000)]
Merge "Add MM#6 string overlay"

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"
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"
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"
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:27:36 +0000 (18:27 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI"

6 years agoMerge "Parcel: Avoid NPE in finalization"
Treehugger Robot [Tue, 10 Oct 2017 17:20:56 +0000 (17:20 +0000)]
Merge "Parcel: Avoid NPE in finalization"

6 years agoEventLogHelper: Clean up code
Andreas Gampe [Tue, 10 Oct 2017 03:13:21 +0000 (20:13 -0700)]
EventLogHelper: Clean up code

Use scoped wrappers and unique_ptr.

Bug: 67511924
Test: m
Test: Device boots
Test: cts-tradefed run commandAndExit cts -m CtsUtilTestCases -t android.util.cts.EventLogTest
Change-Id: If9abfb8b43a4653ccd7fc553257ab3529063577f

6 years agoMerge "{Event,Security}Log: Unify code"
Treehugger Robot [Tue, 10 Oct 2017 16:41:12 +0000 (16:41 +0000)]
Merge "{Event,Security}Log: Unify code"

6 years agoLoggingPrintStream: Make visible for testing
Andreas Gampe [Tue, 10 Oct 2017 16:09:26 +0000 (09:09 -0700)]
LoggingPrintStream: Make visible for testing

The class must be public to avoid test issues. If the class is
package-private, the test would have to be in the boot class-
path:

 Rejecting re-init on previously-failed class java.lang.Class<com.android.internal.os.LoggingPrintStreamTest$TestPrintStream>: java.lang.IllegalAccessError: Class com.android.internal.os.LoggingPrintStream extended by class com.android.internal.os.LoggingPrintStreamTest$TestPrintStream is inaccessible (declaration of 'com.android.internal.os.LoggingPrintStreamTest$TestPrintStream' appears in /data/app/com.android.frameworks.coretests-SD7GJmYE507ACoE9gu2mnw==/base.apk)
   at java.lang.Object java.lang.reflect.Constructor.newInstance0(java.lang.Object[]) (Constructor.java:-2)
   at java.lang.Object java.lang.reflect.Constructor.newInstance(java.lang.Object[]) (Constructor.java:334)
   at junit.framework.Test junit.framework.TestSuite.createTest(java.lang.Class, java.lang.String) (TestSuite.java:61)

Test: m
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java
Change-Id: I26cead7954cf4309c8b3e16994c35a3f4a9eb798

6 years agoParcel: Avoid NPE in finalization
Andreas Gampe [Tue, 10 Oct 2017 15:01:38 +0000 (08:01 -0700)]
Parcel: Avoid NPE in finalization

Check whether the guard is null to avoid:

 Uncaught exception thrown by finalizer
 java.lang.NullPointerException: Attempt to invoke virtual method 'void dalvik.system.CloseGuard.close()' on a null object reference
      at android.os.ParcelFileDescriptor.closeWithStatus(ParcelFileDescriptor.java:740)
      at android.os.ParcelFileDescriptor.finalize(ParcelFileDescriptor.java:990)
      at java.lang.Daemons$FinalizerDaemon.doFinalize(Daemons.java:250)
      at java.lang.Daemons$FinalizerDaemon.runInternal(Daemons.java:237)
      at java.lang.Daemons$Daemon.run(Daemons.java:103)
      at java.lang.Thread.run(Thread.java:764)

Follow-up to commit da5a3e12f4f8f965c57d6f93c74190f43ea233f3.

Bug: 7426029
Bug: 10330121
Test: m
Change-Id: I903f1545ab784008727ff23bb95fe182bd95b62a

6 years agoMerge "LinkProperties: fix some indentation issues"
Treehugger Robot [Tue, 10 Oct 2017 14:02:35 +0000 (14:02 +0000)]
Merge "LinkProperties: fix some indentation issues"

6 years agoLinkProperties: fix some indentation issues
Hugo Benichi [Tue, 10 Oct 2017 07:29:06 +0000 (16:29 +0900)]
LinkProperties: fix some indentation issues

Test: no functional change
Change-Id: I469bba154feb382156e56043d83f066a5bd658aa

6 years ago{Event,Security}Log: Unify code
Andreas Gampe [Mon, 9 Oct 2017 23:21:11 +0000 (16:21 -0700)]
{Event,Security}Log: Unify code

Extract common code into eventlog_helper.

Bug: 67511924
Test: m
Test: Device boots
Test: cts-tradefed run commandAndExit cts -m CtsUtilTestCases -t android.util.cts.EventLogTest
Change-Id: Idafad832385f57c22f40dbb8570e95da6d44f08f

6 years agoConvert libjnigraphics to Android.bp
Colin Cross [Sun, 8 Oct 2017 01:38:31 +0000 (18:38 -0700)]
Convert libjnigraphics to Android.bp

See build/soong/README.md for more information.

Test: m -j
Change-Id: If302f63276fa815423f50df0f12c1700975dbc43
Merged-In: If302f63276fa815423f50df0f12c1700975dbc43
(cherry picked from commit 02a8657837321c12ec81207bf43e3ace61b3962f)

6 years agoRequire DownloadRequest#Builder to have mandatory Source URI
Brad Ebinger [Mon, 9 Oct 2017 18:23:21 +0000 (11:23 -0700)]
Require DownloadRequest#Builder to have mandatory Source URI

This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.

Test: Manual, Telephony Test MBMS app
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db

6 years agoMerge "EventLog: Check for exception after add()"
Treehugger Robot [Mon, 9 Oct 2017 23:15:50 +0000 (23:15 +0000)]
Merge "EventLog: Check for exception after add()"

6 years agoMerge "SecurityLog: Apply 7b25bb8 to SecurityLog"
Treehugger Robot [Mon, 9 Oct 2017 22:18:25 +0000 (22:18 +0000)]
Merge "SecurityLog: Apply 7b25bb8 to SecurityLog"

6 years agoEventLog: Check for exception after add()
Andreas Gampe [Mon, 9 Oct 2017 15:25:36 +0000 (08:25 -0700)]
EventLog: Check for exception after add()

When reading events, calling Collection.add() may result in an
OutOfMemoryError or immutability error. Check for an exception
after the call in EventLog and SecurityLog.

Bug: 67511924
Test: m
Test: Device boots
Change-Id: If0fbf6b01051b5311eeb88d3f52470cd8b1eec59

6 years agoSecurityLog: Apply 7b25bb8 to SecurityLog
Andreas Gampe [Mon, 9 Oct 2017 19:01:25 +0000 (12:01 -0700)]
SecurityLog: Apply 7b25bb8 to SecurityLog

Apply logging rewrites from commit 7b25bb8ec79e420e9655a00301cbca80a38cde2d
to SecurityLog.

Test: manual confirm event log messages from services continue
Bug: 31992412
Bug: 31456426
Change-Id: If482a89690fa9fd1da6b5e13398df4bab47ca200

6 years agoAdd MM#6 string overlay
Jordan Liu [Mon, 9 Oct 2017 18:38:50 +0000 (11:38 -0700)]
Add MM#6 string overlay

Change-Id: I004e46cd9a6b911b935b72d8aa584055eded53dd
Fixes: 66983094
Test: manual

6 years agoMerge "Add some useful helpers and constants."
Chalard Jean [Fri, 6 Oct 2017 09:37:38 +0000 (09:37 +0000)]
Merge "Add some useful helpers and constants."

6 years agoMerge "Log NAT update descriptions when receiving netlink errors"
Treehugger Robot [Fri, 6 Oct 2017 09:16:18 +0000 (09:16 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors"

6 years agoLog NAT update descriptions when receiving netlink errors
Erik Kline [Fri, 6 Oct 2017 03:56:55 +0000 (12:56 +0900)]
Log NAT update descriptions when receiving netlink errors

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - new logging messages observed

    2017-10-06T13:15:25.190 - [OffloadController] ERROR Error updating NAT conntrack entry >TCP (192.168.43.222, 58054) -> (198.35.26.112, 443)<: android.system.ErrnoException: NetlinkErrorMessage{...
Bug: 29337859
Bug: 32163131
Bug: 64976634
Bug: 67396342

Merged-In: Ia1f0b97f89a9848a64099d01184fcbc2056a1b34
Merged-In: I426b0a0545d56aba7924c416799b37731e7e4b18
Change-Id: Ie05d4e6588d75f8a9798f40b68a317e24b3b5050
(cherry picked from commit a5ae9056e74a13d394c4bb6c36f9255214ffb68b)

6 years agoAdd some useful helpers and constants.
Chalard Jean [Wed, 4 Oct 2017 05:51:42 +0000 (14:51 +0900)]
Add some useful helpers and constants.

Test: Pulled out of a client app ; the client app is behaving
Test: identically to how it was behaving before. Wrote unit
Test: tests in frameworks-net.

Change-Id: I397137748a95c65cee2e1e1b243a1a260e83a6f7

6 years agoMerge "Fix NPE when removing PIN locked SIM during E911 call"
Treehugger Robot [Fri, 6 Oct 2017 03:43:31 +0000 (03:43 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call"

6 years agoMerge "Display "No service" on status bar when SIM unready"
Jordan Liu [Thu, 5 Oct 2017 23:30:45 +0000 (23:30 +0000)]
Merge "Display "No service" on status bar when SIM unready"

6 years agoMerge "Fix documentation generation with OpenJDK 9 javadoc."
Tobias Thierer [Thu, 5 Oct 2017 23:01:03 +0000 (23:01 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc."

6 years agoFix NPE when removing PIN locked SIM during E911 call
Brad Ebinger [Thu, 5 Oct 2017 18:39:06 +0000 (11:39 -0700)]
Fix NPE when removing PIN locked SIM during E911 call

There is the possibility of mCallback being null while
the Keyguard still has a PhoneStateListener registered
for onSimStateChanged callback. This can cause a NPE.

Bug: 66986066
Test: Manual, PIN/PUK locked SIM
Change-Id: I799c9521f787e800e259c3bdce9edee3f844f5f3

6 years agoMerge "NativeActivity: Improve error message reporting"
Treehugger Robot [Thu, 5 Oct 2017 09:44:21 +0000 (09:44 +0000)]
Merge "NativeActivity: Improve error message reporting"

6 years agoMerge "Cosmetic Cleanups for IpSecService"
nharold [Thu, 5 Oct 2017 00:14:16 +0000 (00:14 +0000)]
Merge "Cosmetic Cleanups for IpSecService"

6 years agoCosmetic Cleanups for IpSecService
Nathan Harold [Wed, 4 Oct 2017 19:58:55 +0000 (12:58 -0700)]
Cosmetic Cleanups for IpSecService

This is a follow-up CL to address comments
on aosp/466677
-Rename ManagedResourceArray.get()
-Comment cleanup

Bug: 38397094
Test: runtest frameworks-net
Change-Id: I6fbdd89c4a864fe1d8a19c68947f582d7b1f0f21

6 years agoMerge changes from topic "ipsec-svc-cleanup"
nharold [Wed, 4 Oct 2017 20:00:52 +0000 (20:00 +0000)]
Merge changes from topic "ipsec-svc-cleanup"

* changes:
  Split IpSecServiceTest to add IPv6 Tests
  Add equals() for IpSecAlgorithm and IpSecConfig
  Input Validation for IpSecService

6 years agoNativeActivity: Improve error message reporting
dimitry [Wed, 4 Oct 2017 17:44:56 +0000 (19:44 +0200)]
NativeActivity: Improve error message reporting

The error message is not necessary a dlerror(). For the devices with
native bridge it is reported by NB implementation.

Bug: http://b/67412560
Test: manual
Change-Id: I05377c3490199c40419831b5aae27cb30d4a321b

6 years agoMerge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
Treehugger Robot [Wed, 4 Oct 2017 17:01:00 +0000 (17:01 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"

6 years agoPBAP: Use ACTION_CONNECTION_STATE_CHANGED intent
Jack He [Tue, 3 Oct 2017 02:08:30 +0000 (19:08 -0700)]
PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent

* Use ACTION_CONNECTION_STATE_CHANGED to broadcast connection state
  change to comply with BluetoothProfile interface requirement
* Use BluetoothProfile.STATE_* variables to represent connection
  states for PBAP profile

Bug: 63873163
Test: Connect to car kits
Change-Id: I7dfcfc1b3a3e4868ea5e313f62ad5e504d58b9c2

6 years agoMerge "New function signature for setResolverConfiguration"
Treehugger Robot [Wed, 4 Oct 2017 12:39:09 +0000 (12:39 +0000)]
Merge "New function signature for setResolverConfiguration"

6 years agoMerge "Revert work around clang-tidy segmentation fault."
Chih-hung Hsieh [Wed, 4 Oct 2017 06:26:42 +0000 (06:26 +0000)]
Merge "Revert work around clang-tidy segmentation fault."

6 years agoMerge "Convert java hwbinder mk -> bp."
Treehugger Robot [Wed, 4 Oct 2017 04:00:03 +0000 (04:00 +0000)]
Merge "Convert java hwbinder mk -> bp."

6 years agoConvert java hwbinder mk -> bp.
Steven Moreland [Mon, 2 Oct 2017 23:58:41 +0000 (16:58 -0700)]
Convert java hwbinder mk -> bp.

This library is used to avoid a circular dependency
between frameworks.jar and HIDL hal definition libs.
It is not installed on the device.

Bug: 33420795
Test: m -j hwbinder and things it depends on
Change-Id: I44cc670383f80275026ea892151524599b713087

6 years agoRevert work around clang-tidy segmentation fault.
Chih-Hung Hsieh [Wed, 4 Oct 2017 03:14:21 +0000 (20:14 -0700)]
Revert work around clang-tidy segmentation fault.

Bug: 34740546
Test: build with WITH_TIDY=1 and
WITH_TIDY_CHECKS="*,-readability-*,-google-readability-*,-google-runtime-references"

Change-Id: If99c75cab6a2bec0c6b38aa17189668b4943478d

6 years agoSplit IpSecServiceTest to add IPv6 Tests
Nathan Harold [Tue, 26 Sep 2017 18:44:23 +0000 (11:44 -0700)]
Split IpSecServiceTest to add IPv6 Tests

-Split IpSecServiceTest into parameterized
 and single tests.
-Add IPv6 parameters

Bug: 66954381
Test: this
Change-Id: Ib98c112560014f73bccc3d2842c31d297c7a07ef

6 years agoAdd equals() for IpSecAlgorithm and IpSecConfig
Nathan Harold [Tue, 26 Sep 2017 02:33:13 +0000 (19:33 -0700)]
Add equals() for IpSecAlgorithm and IpSecConfig

Add equality testing methods to support tests
for parceling and un-parceling IpSecConfig.

Bug: 38397094
Test: runtest -x IpSecConfigTest.java
Change-Id: I31e318334d39ed6e9daf5ec8f3be7dcec75e12ad

6 years agoInput Validation for IpSecService
Nathan Harold [Wed, 23 Aug 2017 20:46:33 +0000 (13:46 -0700)]
Input Validation for IpSecService

All of the input to IpSecService over the Binder
interface needs to be validated both for sanity
and for safety.

-Sanity check all the parameters coming from binder.
-Added setters for IpSecConfig to decouple the test
 from the IpSecManager. This was needed because the
 input validation caused the tests to fail due to a
 null parameter that was previously un-tested.
-Added the mode flag to the IpSecConfig bundle this
 oversight was found during testing.
-Expose the getResourceId() methods for testing in
 UdpEncapsulationSocket, SecurityParameterIndex, and
 IpSecTransform classes.
-Remove the unneeded getIpSecConfig() from
 IpSecTransform: unneeded now that we can synthesize
 configs.

Bug: 38397094
Test: runtest frameworks-net
Change-Id: I5241fc7fbfa9816d54219acd8d81a9f7eef10dd4

6 years agoMerge "Collapse Notification panel after tapping CLEAR ALL button"
Selim Cinek [Tue, 3 Oct 2017 21:07:57 +0000 (21:07 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button"

6 years agoMerge "fix AmrInputStream.read() hang"
Treehugger Robot [Tue, 3 Oct 2017 20:37:36 +0000 (20:37 +0000)]
Merge "fix AmrInputStream.read() hang"

6 years agoMerge "Adds a filtering bitmask to DownloadStateCallback"
Brad Ebinger [Tue, 3 Oct 2017 20:23:00 +0000 (20:23 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback"

6 years agoMerge "Remove verification for DownloadReceiver when failure"
Brad Ebinger [Tue, 3 Oct 2017 18:32:04 +0000 (18:32 +0000)]
Merge "Remove verification for DownloadReceiver when failure"

6 years agoMerge "Decouple Content Name Locale from Content Language Locale"
Brad Ebinger [Tue, 3 Oct 2017 18:31:49 +0000 (18:31 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale"

6 years agoAdds a filtering bitmask to DownloadStateCallback
Brad Ebinger [Fri, 29 Sep 2017 22:12:08 +0000 (15:12 -0700)]
Adds a filtering bitmask to DownloadStateCallback

Adds the ability for an EMBMS app to specify a filtering
bitmask to DownloadStateCallback, which is used to filter
out callbacks that the EMBMS app doesn't need to listen
to.

Test: Testapps
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb

6 years agoDisplay "No service" on status bar when SIM unready
Wenting Xiong [Thu, 13 Oct 2016 09:38:16 +0000 (17:38 +0800)]
Display "No service" on status bar when SIM unready

Introduce carrier config to forcibly display "No Service" instead of
"Emergency calls only" when SIM is unready.

Test: manual - checked displaying "No service" on status bar
Bug: 29191964
Change-Id: I744ec9a3c70376199ba94d68331604276ea761c3

6 years agoFix documentation generation with OpenJDK 9 javadoc.
Tobias Thierer [Tue, 3 Oct 2017 11:15:02 +0000 (12:15 +0100)]
Fix documentation generation with OpenJDK 9 javadoc.

"make docs" breaks ("lint: @attr must be a field") on three @attr ref
statements in LinearLayoutManager. These are the only @attr ref
statements that reference the support library's resources from
framework (the others are within framework or within the support
library); it may be that the R class that they're referencing is
merely in the wrong package, but changing it to com.android.internal.R
or android.R didn't fix the issue.

Since LinearLayoutManager is an internal class, it's not worth the
effort of trying to make this work. This CL drops the three offending
@attr ref statements, thereby fixing the build.

Bug: 62049770
Test: Treehugger

Change-Id: Ife01201019f4fffd5552da11591661539ca40fdd