OSDN Git Service
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)
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 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 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
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
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
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
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
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
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
Selim Cinek [Tue, 3 Oct 2017 21:30:14 +0000 (21:30 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button"
am:
ca8b270063
Change-Id: I3ce745ab3546fa93aa0cafa7874b8449e6d2cfc9
Wonsik Kim [Tue, 3 Oct 2017 21:18:10 +0000 (21:18 +0000)]
Merge "fix AmrInputStream.read() hang"
am:
5b6a02eb8b
Change-Id: I7aff9043ec95d2f41e5d3301b01707f5dff4bef2
Selim Cinek [Tue, 3 Oct 2017 21:07:57 +0000 (21:07 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button"
Brad Ebinger [Tue, 3 Oct 2017 20:55:50 +0000 (20:55 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback"
am:
177bd65211
Change-Id: I64950a42e8079a41105d90ea6c584ca6f940a64e
Treehugger Robot [Tue, 3 Oct 2017 20:37:36 +0000 (20:37 +0000)]
Merge "fix AmrInputStream.read() hang"
Brad Ebinger [Tue, 3 Oct 2017 20:23:00 +0000 (20:23 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback"
Brad Ebinger [Tue, 3 Oct 2017 18:51:32 +0000 (18:51 +0000)]
Merge "Remove verification for DownloadReceiver when failure"
am:
f78beae681
Change-Id: I02bc76b2162234c2f063e3dd7f143449a091f012
Brad Ebinger [Tue, 3 Oct 2017 18:45:43 +0000 (18:45 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale"
am:
a830e83028
Change-Id: I225e8b71f53d584e1c8a6325dc2bb57421617dc4
Brad Ebinger [Tue, 3 Oct 2017 18:32:04 +0000 (18:32 +0000)]
Merge "Remove verification for DownloadReceiver when failure"
Brad Ebinger [Tue, 3 Oct 2017 18:31:49 +0000 (18:31 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale"
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
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
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
Orion Hodson [Tue, 3 Oct 2017 08:06:57 +0000 (08:06 +0000)]
Merge "Update dalvik.bytecode package"
am:
537d63fe1a
Change-Id: I41ed71812f67136cbf456bfbdbc5b3a245c93f18
Orion Hodson [Tue, 3 Oct 2017 07:57:14 +0000 (07:57 +0000)]
Merge "Update dalvik.bytecode package"
Yunlian Jiang [Tue, 3 Oct 2017 04:20:17 +0000 (04:20 +0000)]
Merge "Replace strcpy with memcpy."
am:
bb115bac41
Change-Id: I28c118a609d999fe1ef6bd126557e63076f452c6
Treehugger Robot [Tue, 3 Oct 2017 04:09:48 +0000 (04:09 +0000)]
Merge "Replace strcpy with memcpy."
Reifu Sato [Thu, 28 Sep 2017 06:10:09 +0000 (15:10 +0900)]
Collapse Notification panel after tapping CLEAR ALL button
Usually, notification panel is automatically collapsed
after tapping "CLEAR ALL" button but is not collapsed
if all dismissable notifications are scrolled out.
In this case, dismissed notification is still displayed
until notification panel is once collapsed.
And that "dismissed" notification causes several issues.
To avoid this, collapse notification panel automatically
after tapping "CLEAR ALL" button even when all dismissable
notifications are scrolled out.
Fixes:
67246876
Test: manual - post ongoing and dismissable notifications,
and tap CLEAR ALL button.
Change-Id: I048255cde6fdb4cedd2c3472e345ff63c744af68
Colin Cross [Tue, 3 Oct 2017 01:31:05 +0000 (01:31 +0000)]
Merge "Delete jack support"
am:
1704df64ce -s ours
Change-Id: I185bb57219e86d9ef41ebcf5e3f03daaf4946529
Treehugger Robot [Tue, 3 Oct 2017 01:17:25 +0000 (01:17 +0000)]
Merge "Delete jack support"
Wonsik Kim [Mon, 2 Oct 2017 23:16:34 +0000 (16:16 -0700)]
fix AmrInputStream.read() hang
Test: AmrInputStream.read() no longer hangs
Change-Id: I5b3e1c7667891ce250e447c32213511077c5b5df
Jerry Zhang [Tue, 3 Oct 2017 00:04:03 +0000 (00:04 +0000)]
Merge "Add moveObject method to change object's path and parent."
am:
33a200e572
Change-Id: Iabb8c9989ad35140ab1c752fb70741f52e56c04d
Treehugger Robot [Mon, 2 Oct 2017 23:53:56 +0000 (23:53 +0000)]
Merge "Add moveObject method to change object's path and parent."
Ben Schwartz [Mon, 2 Oct 2017 17:08:06 +0000 (13:08 -0400)]
New function signature for setResolverConfiguration
Bug:
64753847
Test: Tests pass. Normal web browsing works normally.
Change-Id: I2dc2b6ef1c82d9b408501fa73be9c7d0f8672d06
Jerry Zhang [Wed, 27 Sep 2017 00:49:52 +0000 (17:49 -0700)]
Add moveObject method to change object's path and parent.
This is needed to implement the MTP MOVE_OBJECT operation.
Bug:
66679910
Test: Move objects and folders, verify mediastore is consistent
Change-Id: I2f4f0c43134fb3ff82745166c051712cc1736b7f
Colin Cross [Wed, 27 Sep 2017 21:43:27 +0000 (14:43 -0700)]
Delete jack support
Remove references to jack makefiles that no longer exist.
Bug:
65302138
Test: m -j checkbuild
Change-Id: I9fbee7db0167300edf59a85badeff87b4b25f846
Merged-In: I9fbee7db0167300edf59a85badeff87b4b25f846
(cherry picked from commit
c6fbe4ef07faaee070f96c380682c5392386be6a)
Colin Cross [Wed, 27 Sep 2017 21:43:27 +0000 (14:43 -0700)]
Delete jack support
Remove references to jack makefiles that no longer exist.
Bug:
65302138
Test: m -j checkbuild
Change-Id: I9fbee7db0167300edf59a85badeff87b4b25f846
Merged-In: I9fbee7db0167300edf59a85badeff87b4b25f846
(cherry picked from commit
c6fbe4ef07faaee070f96c380682c5392386be6a)
Hugo Benichi [Mon, 2 Oct 2017 10:36:22 +0000 (10:36 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"
am:
1211941aa0
Change-Id: I169e1d48bffab3326dd61011b7747c1400b9bc74
Treehugger Robot [Mon, 2 Oct 2017 10:24:48 +0000 (10:24 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"
Hugo Benichi [Fri, 29 Sep 2017 00:34:08 +0000 (09:34 +0900)]
ConnectivityServiceTest: fix flaky testNetworkRequestMaximum
Registered requests are not keyed by PendingIntents in
ConnectivityService, which means that unregistering a request with a
PendingIntent causes a linear search in all registered requests.
testNetworkRequestMaximum was registering too many PendingIntents
simultaneously, causing the unregistration loop to have n^2
complexity and to take a long time to take effect.
To make the unregistering loop less likely to trigger a timeout on
waitForIdle, this patch changes the test to not register MAX_REQUEST
number of PendingIntent, but instead mixes a small number of
PendingIntents with NetworkCallbacks to reach MAX_REQUEST number of
simultaneously registered requests.
When unregistering these requests, callbacks are unregistered first.
Bug:
32561414
Test: runtest frameworks-net
Change-Id: I48b882c884abe20b388190b7f28baee293446f37
Hansong Zhang [Sat, 30 Sep 2017 04:48:28 +0000 (04:48 +0000)]
Merge "Bluetooth HID Device: Fix a typo"
am:
d30e47ecfc
Change-Id: Ibd3c731781359861d89a7f396ead2f9a7b377821
Hansong Zhang [Sat, 30 Sep 2017 04:35:54 +0000 (04:35 +0000)]
Merge "Bluetooth HID Device: Fix a typo"
Brad Ebinger [Fri, 29 Sep 2017 01:00:46 +0000 (18:00 -0700)]
Decouple Content Name Locale from Content Language Locale
There was an assumption that content language Locale was
a 1:1 mapping with content locale name, which is not the
case. This change separates the two and provides a new
API for retreiving the set of Locales for content name.
Test: Manual
Change-Id: I44cb527ceb77fe321500f9d5fc00f6880ee52cb7
Hansong Zhang [Wed, 27 Sep 2017 23:59:01 +0000 (16:59 -0700)]
Bluetooth HID Device: Fix a typo
Fixed a typo in BluetoothInputHost. "DIGITIZER_TABLED" should be
"DIGITIZER_TABLET".
Test: Not needed.
Change-Id: I06ffc536f5912d53319b4d325f77991d65ab04f2
Marco Nelissen [Fri, 29 Sep 2017 20:04:54 +0000 (20:04 +0000)]
Merge "AmrInputStream is not a public API"
am:
c3b1442d52
Change-Id: Iee0e6dfa9907dc70fcf5dae7fcbcf14b8bcb9ffb
Treehugger Robot [Fri, 29 Sep 2017 19:50:37 +0000 (19:50 +0000)]
Merge "AmrInputStream is not a public API"
Brad Ebinger [Fri, 29 Sep 2017 18:04:05 +0000 (11:04 -0700)]
Remove verification for DownloadReceiver when failure
When the ACTION_DOWNLOAD_RESULT_INTERNAL intent is received
with a failure result, don't require that extras exist
in the receiver.
Test: Manual, Testapps
Change-Id: I9ac43a33aff88755cbc804890ce230743195f44d