OSDN Git Service
Bill Yi [Sun, 8 Oct 2017 07:11:31 +0000 (07:11 +0000)]
Import translations. DO NOT MERGE
am:
87c4d55ccb -s ours
Change-Id: I5884b9fbc3d2385c8aac8fe4612aec6a69ccdcb7
Bill Yi [Sun, 8 Oct 2017 00:23:29 +0000 (17:23 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I944d5c1ac050fe65d777b815adb59f5d6536811a
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: I65c24d3382c8c667eaab76a88e4a64853ca71e0d
Wenting Xiong [Fri, 6 Oct 2017 18:30:42 +0000 (18:30 +0000)]
Display "No service" on status bar when SIM unready
am:
b267ecde4b -s ours
Change-Id: I3e49fae02085e6457db867fbc18f9225d33758bc
Leon Scroggins III [Fri, 6 Oct 2017 17:53:01 +0000 (17:53 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours am:
d9c818dce4 -s ours
am:
497520a1e8 -s ours
Change-Id: I8cea5e47f98f4407029dfdcc281b4d6edad143b0
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
Leon Scroggins III [Fri, 6 Oct 2017 17:28:40 +0000 (17:28 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours
am:
d9c818dce4 -s ours
Change-Id: Ib0e20e79c8d9708845aede08f86d17bb08855642
Leon Scroggins III [Fri, 6 Oct 2017 17:10:50 +0000 (17:10 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9
am:
85a68d9e71 -s ours
Change-Id: I09f8c134edef5c4cf67805faaf8cd56cae65ed69
Leon Scroggins III [Fri, 6 Oct 2017 16:53:46 +0000 (16:53 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d
am:
54c2cbb0f9
Change-Id: Iae83cebe615d0df3a6f2c6bdee6f8002d3ae82b0
Leon Scroggins III [Fri, 6 Oct 2017 16:32:10 +0000 (16:32 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc
am:
f32424b90d
Change-Id: I405bee24b11319430e3490f3299d9c8b6438e407
Leon Scroggins III [Fri, 6 Oct 2017 16:18:49 +0000 (16:18 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88
am:
2399d935bc
Change-Id: Ib219c4c5299b681b6f3858cb67c70a7fd9110f20
Leon Scroggins III [Fri, 6 Oct 2017 16:06:34 +0000 (16:06 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
am:
cfe2352d88
Change-Id: Id7d59d95e8f5dfa68f7ff55ca5729a11a1fdf1d0
TreeHugger Robot [Fri, 6 Oct 2017 15:45:37 +0000 (15:45 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
Chalard Jean [Fri, 6 Oct 2017 09:58:27 +0000 (09:58 +0000)]
Merge "Add some useful helpers and constants." am:
ed8d236319
am:
0f4421873e
Change-Id: I2f7f4f69dcb4bbb1641af70a26ac95b1bb659ce8
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:34:49 +0000 (09:34 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors" am:
3506aaf992
am:
cb2860362b
Change-Id: I9841bc9640c203a4b7d6698eddedbee7b8b24a8a
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 04:03:51 +0000 (04:03 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" am:
b7dc3a3b21
am:
4910739237
Change-Id: I7a0be565cebff2f87b136a6c29484ee43ca116ab
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:35:53 +0000 (03:35 +0000)]
Merge "Display "No service" on status bar when SIM unready" am:
a666dbb628 -s ours
am:
e59a45f3ae
Change-Id: I76241cdf485b9b9e6193a22cf5748d8695ff8d23
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:21:40 +0000 (23:21 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc." am:
ed6ae8f2b1
am:
8d4e36b1e8
Change-Id: Iba6de5e888f7de9835199eda278c46f6b3c261d8
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 10:04:12 +0000 (10:04 +0000)]
Merge "NativeActivity: Improve error message reporting" am:
de3150db1e
am:
7de4dd6e07
Change-Id: Ifb7d744bade56fd723567cc774a2849b03cbdeb4
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:55:38 +0000 (00:55 +0000)]
Merge "Cosmetic Cleanups for IpSecService" am:
5ade9a228d
am:
0bdb9a6e00
Change-Id: Iac3aa05b4de68b818fe840c2ade4aa600fe29622
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:35:20 +0000 (20:35 +0000)]
Merge changes from topic "ipsec-svc-cleanup" am:
9778c7884f
am:
ae61e0c6e8
Change-Id: If8803e2fc98adb2f08a5bf2944fc60d0f0e71acd
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:42:26 +0000 (17:42 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am:
cfe51aabd2
am:
8057ba832e
Change-Id: I946cce466bb5e048ad7b19cd97caa466dab27a52
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 13:04:43 +0000 (13:04 +0000)]
Merge "New function signature for setResolverConfiguration" am:
8052930f4f
am:
12318b5b4e
Change-Id: I12d721a809646070900f81723a4d10f4635fec15
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:47:41 +0000 (06:47 +0000)]
Merge "Revert work around clang-tidy segmentation fault." am:
a47e513464
am:
e640a8284d
Change-Id: Ia52f1419e49016748e5651b192ef2eba19008d8d
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:20:08 +0000 (04:20 +0000)]
Merge "Convert java hwbinder mk -> bp." am:
53c945fb71
am:
7bebf15460
Change-Id: Ia799ca49151cdb20b6327d814f65822b46d8fb45
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:45:55 +0000 (21:45 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button" am:
ca8b270063
am:
d4b6e59cad
Change-Id: Ib6f48bc7bf8f6cfae5f66adcdd7923891c320f99
Wonsik Kim [Tue, 3 Oct 2017 21:30:17 +0000 (21:30 +0000)]
Merge "fix AmrInputStream.read() hang" am:
5b6a02eb8b
am:
4c2bbbf552
Change-Id: I6764a29474ec9da78109e93c6a4f85ac3f8c2c1a
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
Brad Ebinger [Tue, 3 Oct 2017 21:13:34 +0000 (21:13 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" am:
177bd65211
am:
387b90aa97
Change-Id: I4332a7f839aec731acaafbb9fa6213f2ada39857
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 19:05:26 +0000 (19:05 +0000)]
Merge "Remove verification for DownloadReceiver when failure" am:
f78beae681
am:
354eed7bac
Change-Id: I33894a72def642bd8977e41bec21140fdb738716
Brad Ebinger [Tue, 3 Oct 2017 18:58:11 +0000 (18:58 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale" am:
a830e83028
am:
768b6c5e4a
Change-Id: Ibb2d70b40c0a439ad37deb911eb6b08ccde4bbfe
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:15:45 +0000 (08:15 +0000)]
Merge "Update dalvik.bytecode package" am:
537d63fe1a
am:
7e806c2942
Change-Id: I1fb0eebc7b345d9b21b10a4b9511d91e61a45046
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:27:42 +0000 (04:27 +0000)]
Merge "Replace strcpy with memcpy." am:
bb115bac41
am:
16951dcb54
Change-Id: I72b660c6c0b56afa4f713ee2a1d17c53d9efd98a
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:41:41 +0000 (01:41 +0000)]
Merge "Delete jack support" am:
1704df64ce -s ours
am:
b8fb4e35ba
Change-Id: If710d83dae6ca05a024862b7f176a130aab8a3da
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
TreeHugger Robot [Tue, 3 Oct 2017 00:28:16 +0000 (00:28 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804"" into oc-dr1-dev-plus-aosp
Jerry Zhang [Tue, 3 Oct 2017 00:13:50 +0000 (00:13 +0000)]
Merge "Add moveObject method to change object's path and parent." am:
33a200e572
am:
0f09ac317d
Change-Id: Ie2c742826fb4b7cb21e15f4d4777145ebbbd0923
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."
Hansong Zhang [Mon, 2 Oct 2017 22:20:13 +0000 (22:20 +0000)]
DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804"
This reverts commit
45f17f453342accf5478e0b3a2a80e9e8a4ce8e8.
Merged-In: I06ffc536f5912d53319b4d325f77991d65ab04f2
Change-Id: I74271f26bbe28b02117d688a6aa0bf83f0be3780
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
Colin Cross [Mon, 2 Oct 2017 19:51:03 +0000 (19:51 +0000)]
Delete jack support
am:
72ad4a04ee
Change-Id: I58d8bfced33df174b48b797c62d8010233285fca
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)
Bill Yi [Mon, 2 Oct 2017 17:51:36 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours
am:
899f5cf309 -s ours
Change-Id: Ia3d156d8da37e54364775285658dbdfd4f176468