OSDN Git Service
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
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"
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
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"
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
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
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
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
Hugo Benichi [Thu, 12 Oct 2017 11:58:32 +0000 (11:58 +0000)]
Merge "Import a few android.net unit tests into frameworks-net"
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
Treehugger Robot [Thu, 12 Oct 2017 09:06:24 +0000 (09:06 +0000)]
Merge "Migrate most of core networking tests to junit4"
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
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
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
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
Hall Liu [Wed, 11 Oct 2017 23:04:58 +0000 (23:04 +0000)]
Merge "Fix URI unparceling and clarify an error condition"
Brad Ebinger [Wed, 11 Oct 2017 22:24:58 +0000 (22:24 +0000)]
Merge "Add new Download Error Codes"
am:
e9bd5449b5
Change-Id: I8fa3c3dcc5104a5326a680ae186c9285a7e47358
Brad Ebinger [Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +0000)]
Merge "Add new Download Error Codes"
Dan Albert [Wed, 11 Oct 2017 21:52:41 +0000 (21:52 +0000)]
Merge "Add missing includes."
am:
4be4bb3db7
Change-Id: Icdae2b63df8e5d61e6acabb6fb85efa28026d535
Treehugger Robot [Wed, 11 Oct 2017 21:37:28 +0000 (21:37 +0000)]
Merge "Add 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
Colin Cross [Wed, 11 Oct 2017 18:37:19 +0000 (18:37 +0000)]
Merge "Convert libjnigraphics to Android.bp"
am:
006c167544
Change-Id: Ic07a49510c946104f74ad72a830aed9696a2ddd6
Colin Cross [Wed, 11 Oct 2017 18:18:45 +0000 (18:18 +0000)]
Merge "Convert libjnigraphics to Android.bp"
Jordan Liu [Wed, 11 Oct 2017 16:31:10 +0000 (16:31 +0000)]
Merge "Add MM#6 string overlay"
am:
b53262c148
Change-Id: I1cbdba97bba4e0074c60ce374978ffb0b0cca8de
Jordan Liu [Wed, 11 Oct 2017 16:15:39 +0000 (16:15 +0000)]
Merge "Add MM#6 string overlay"
Andreas Gampe [Wed, 11 Oct 2017 16:00:51 +0000 (16:00 +0000)]
Merge "EventLogHelper: Clean up code"
am:
386a5687dd
Change-Id: Id2bfdb49859d9ad62e733b8037e27b54bbdb3537
Treehugger Robot [Wed, 11 Oct 2017 15:48:46 +0000 (15:48 +0000)]
Merge "EventLogHelper: Clean up code"
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
Treehugger Robot [Wed, 11 Oct 2017 12:42:41 +0000 (12:42 +0000)]
Merge "IpManager: 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
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
Treehugger Robot [Wed, 11 Oct 2017 04:00:16 +0000 (04:00 +0000)]
Merge "Log 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)
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
Andreas Gampe [Tue, 10 Oct 2017 21:11:10 +0000 (21:11 +0000)]
Merge "LoggingPrintStream: Make visible for testing"
am:
7d1789867b
Change-Id: If6e464f6840b66deb6f6c61b0ca96d847444e910
Treehugger Robot [Tue, 10 Oct 2017 20:57:55 +0000 (20:57 +0000)]
Merge "LoggingPrintStream: Make visible for testing"
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
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
Brad Ebinger [Tue, 10 Oct 2017 18:27:36 +0000 (18:27 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI"
Andreas Gampe [Tue, 10 Oct 2017 17:35:55 +0000 (17:35 +0000)]
Merge "Parcel: Avoid NPE in finalization"
am:
b085deece9
Change-Id: I646baf55627a3874a10775846458af5f1dcd5d8c
Treehugger Robot [Tue, 10 Oct 2017 17:20:56 +0000 (17:20 +0000)]
Merge "Parcel: Avoid NPE in finalization"
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
Andreas Gampe [Tue, 10 Oct 2017 16:50:37 +0000 (16:50 +0000)]
Merge "{Event,Security}Log: Unify code"
am:
0c614c7018
Change-Id: Id43119d11e27b0e0f6bf064e3aa76f8c990b64a4
Treehugger Robot [Tue, 10 Oct 2017 16:41:12 +0000 (16:41 +0000)]
Merge "{Event,Security}Log: Unify code"
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
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
Hugo Benichi [Tue, 10 Oct 2017 14:13:45 +0000 (14:13 +0000)]
Merge "LinkProperties: fix some indentation issues"
am:
a162726df7
Change-Id: If9bc7cf980aa14880dbf6cc43bc86cc269d306cb
Treehugger Robot [Tue, 10 Oct 2017 14:02:35 +0000 (14:02 +0000)]
Merge "LinkProperties: 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
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
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)
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
Andreas Gampe [Mon, 9 Oct 2017 23:30:04 +0000 (23:30 +0000)]
Merge "EventLog: Check for exception after add()"
am:
c30a6ac2f1
Change-Id: I17768ab21d49afbc943702803293b8cd47804e5c
Treehugger Robot [Mon, 9 Oct 2017 23:15:50 +0000 (23:15 +0000)]
Merge "EventLog: Check for exception after add()"
Andreas Gampe [Mon, 9 Oct 2017 22:49:04 +0000 (22:49 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog"
am:
a98866a6b6
Change-Id: I42aa318daa851c634531e9b0868437a16a59abdd
Treehugger Robot [Mon, 9 Oct 2017 22:18:25 +0000 (22:18 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog"
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
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
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
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
Merged-In: I744ec9a3c70376199ba94d68331604276ea761c3
Change-Id: I744ec9a3c70376199ba94d68331604276ea761c3
Chalard Jean [Fri, 6 Oct 2017 09:48:32 +0000 (09:48 +0000)]
Merge "Add some useful helpers and constants."
am:
ed8d236319
Change-Id: I3a934e19ece91bf5957e4c5fa289bbc1a6242915
Chalard Jean [Fri, 6 Oct 2017 09:37:38 +0000 (09:37 +0000)]
Merge "Add some useful helpers and constants."
Erik Kline [Fri, 6 Oct 2017 09:25:29 +0000 (09:25 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors"
am:
3506aaf992
Change-Id: I3a37cf51b0763e42752d35fc26f70c63d3707fae
Treehugger Robot [Fri, 6 Oct 2017 09:16:18 +0000 (09:16 +0000)]
Merge "Log 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)
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
Brad Ebinger [Fri, 6 Oct 2017 03:54:29 +0000 (03:54 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call"
am:
b7dc3a3b21
Change-Id: I16555b53bbf9c743921cbd36578af3550705a242
Treehugger Robot [Fri, 6 Oct 2017 03:43:31 +0000 (03:43 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call"
Jordan Liu [Fri, 6 Oct 2017 03:25:25 +0000 (03:25 +0000)]
Merge "Display "No service" on status bar when SIM unready"
am:
a666dbb628 -s ours
Change-Id: I7f0987c397206fcd3becf16e5d867bf57d2fc528
Jordan Liu [Thu, 5 Oct 2017 23:30:45 +0000 (23:30 +0000)]
Merge "Display "No service" on status bar when SIM unready"
Tobias Thierer [Thu, 5 Oct 2017 23:12:37 +0000 (23:12 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc."
am:
ed6ae8f2b1
Change-Id: I8bd1f9b3994f480d55d7c885b2c24227a67915e9
Tobias Thierer [Thu, 5 Oct 2017 23:01:03 +0000 (23:01 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc."
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
dimitry [Thu, 5 Oct 2017 09:53:27 +0000 (09:53 +0000)]
Merge "NativeActivity: Improve error message reporting"
am:
de3150db1e
Change-Id: Icdce5b900d87e136a398f6c68c4706b53dcdcec0
Treehugger Robot [Thu, 5 Oct 2017 09:44:21 +0000 (09:44 +0000)]
Merge "NativeActivity: Improve error message reporting"
nharold [Thu, 5 Oct 2017 00:44:37 +0000 (00:44 +0000)]
Merge "Cosmetic Cleanups for IpSecService"
am:
5ade9a228d
Change-Id: If47968dbd55f8f38f9e8dda4d78a0e2e41827da8
nharold [Thu, 5 Oct 2017 00:14:16 +0000 (00:14 +0000)]
Merge "Cosmetic Cleanups for IpSecService"
nharold [Wed, 4 Oct 2017 20:24:10 +0000 (20:24 +0000)]
Merge changes from topic "ipsec-svc-cleanup"
am:
9778c7884f
Change-Id: Ide81ae76bd05ba3a2cc7c06c072306d30a489057
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
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
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
Jack He [Wed, 4 Oct 2017 17:22:28 +0000 (17:22 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
am:
cfe51aabd2
Change-Id: I6e2337a0b0f4722b82a91c53c340618b9277f3f6
Treehugger Robot [Wed, 4 Oct 2017 17:01:00 +0000 (17:01 +0000)]
Merge "PBAP: 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
Ben Schwartz [Wed, 4 Oct 2017 12:54:14 +0000 (12:54 +0000)]
Merge "New function signature for setResolverConfiguration"
am:
8052930f4f
Change-Id: I1a2efbabc765dd1ff66316332cd69b221deff83b
Treehugger Robot [Wed, 4 Oct 2017 12:39:09 +0000 (12:39 +0000)]
Merge "New function signature for setResolverConfiguration"
Chih-hung Hsieh [Wed, 4 Oct 2017 06:38:31 +0000 (06:38 +0000)]
Merge "Revert work around clang-tidy segmentation fault."
am:
a47e513464
Change-Id: Ie04d0d16a05c35a865776571f95078e63bc1bf47
Chih-hung Hsieh [Wed, 4 Oct 2017 06:26:42 +0000 (06:26 +0000)]
Merge "Revert work around clang-tidy segmentation fault."
Steven Moreland [Wed, 4 Oct 2017 04:11:38 +0000 (04:11 +0000)]
Merge "Convert java hwbinder mk -> bp."
am:
53c945fb71
Change-Id: Ia1bde2b32e824f160dd4e768531b6b48179f7ba5
Treehugger Robot [Wed, 4 Oct 2017 04:00:03 +0000 (04:00 +0000)]
Merge "Convert 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