OSDN Git Service
Alex Naidis [Sat, 7 Jan 2017 01:44:14 +0000 (01:44 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am:
0b325c6634
am:
fd55f834c8
Change-Id: Ia53faad0ba004233d0ee031e1ca83d705f5bd379
Alex Naidis [Sat, 7 Jan 2017 01:40:42 +0000 (01:40 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
am:
0b325c6634
Change-Id: I5d217037bececb7a096ccfa018fafaa4280e4537
Treehugger Robot [Sat, 7 Jan 2017 01:33:18 +0000 (01:33 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
Pavlin Radoslavov [Sat, 7 Jan 2017 01:29:44 +0000 (01:29 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options" am:
bfd7f9a1f8
am:
d190040dd1
Change-Id: I051932a98729e91f4e6512c9fa84a7e261b8cd96
Pavlin Radoslavov [Sat, 7 Jan 2017 01:25:34 +0000 (01:25 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options"
am:
bfd7f9a1f8
Change-Id: I0cc5f64f292a56e6301b294974c1bd3cc72664c0
Treehugger Robot [Sat, 7 Jan 2017 01:19:33 +0000 (01:19 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options"
Pavlin Radoslavov [Thu, 5 Jan 2017 18:46:08 +0000 (10:46 -0800)]
Add Bluetooth Codec selection UI to the Developer Options
Test: A2DP streaming to headsets and manual UI interaction
Bug:
30958229
Change-Id: I88f6efedf1c89b524c863543135ef7be9b7e1a7c
Alex Naidis [Tue, 3 Jan 2017 17:24:57 +0000 (18:24 +0100)]
DefaultPermissionGrantPolicy: Pass correct arguments
After parsing the xml files in the "default-permissions"
system, we are passing the arguments in the wrong order.
The method we are targeting is:
private void grantRuntimePermissionsLPw(PackageParser.Package pkg, Set<String> permissions,
boolean systemFixed, boolean isDefaultPhoneOrSms, int userId) {
However we are passing our argument for "systemFixed"
to "isDefaultPhoneOrSms" and the other way around too.
This patch fixes it by using the version of the method
which takes 4 arguments and sets "isDefaultPhoneOrSms"
as false.
Change-Id: I3604a5d6045aadcd91b6dd3f6f1b47b561403b23
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Dan Albert [Fri, 6 Jan 2017 21:03:24 +0000 (21:03 +0000)]
Merge "Unversion NDK stub libraries." am:
ddc7ac8ba6
am:
e2b4d4a38a
Change-Id: I57440577773e47f60e6af4e9112523b78741f9fa
Dan Albert [Fri, 6 Jan 2017 20:54:52 +0000 (20:54 +0000)]
Merge "Unversion NDK stub libraries."
am:
ddc7ac8ba6
Change-Id: I0cf382ae983796b948acfe84e1bb9b639de86a65
Treehugger Robot [Fri, 6 Jan 2017 20:44:18 +0000 (20:44 +0000)]
Merge "Unversion NDK stub libraries."
Dan Albert [Fri, 6 Jan 2017 00:01:14 +0000 (16:01 -0800)]
Unversion NDK stub libraries.
The system versions of these libraries aren't versioned yet.
Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I74e988be8f60f8728a0bfa7360091cbd9f5b1186
Ruchi Kandoi [Fri, 6 Jan 2017 19:03:07 +0000 (19:03 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am:
cc4203221b
am:
388980d88f
Change-Id: I8d5498492cae8ffe9048422720427855eaad5ca8
Ruchi Kandoi [Fri, 6 Jan 2017 18:58:17 +0000 (18:58 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
am:
cc4203221b
Change-Id: I4add3ce1cf3170aff887865302964b4425094692
Ruchi Kandoi [Fri, 6 Jan 2017 18:49:44 +0000 (18:49 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
Ruchi Kandoi [Thu, 29 Dec 2016 21:31:43 +0000 (13:31 -0800)]
nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
Bug:
32881476
Test: Manual; backup, change settings, restore
Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Alain Vongsouvanh [Fri, 6 Jan 2017 17:41:43 +0000 (17:41 +0000)]
bools: fix use_lock_pattern_drawable javadoc.
am:
c4046b5542
Change-Id: I381d005e73d6100e619dabf607b27cb18a969d7f
TreeHugger Robot [Fri, 6 Jan 2017 10:40:33 +0000 (10:40 +0000)]
Merge "resolve merge conflicts of
2fda2ce15958 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Yohann Roussel [Fri, 6 Jan 2017 09:42:44 +0000 (09:42 +0000)]
Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" am:
43c98c74fe
am:
ef5d1cb3b4
Change-Id: Ia2f1b08cf63b6543be1e50786ba9090ffedc1431
Yohann Roussel [Fri, 6 Jan 2017 09:38:33 +0000 (09:38 +0000)]
Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks"
am:
43c98c74fe
Change-Id: I8475d98d4d4eaf3801c9c13570f36a10c525daa3
Yohann Roussel [Fri, 6 Jan 2017 09:29:25 +0000 (09:29 +0000)]
Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks"
Alain Vongsouvanh [Fri, 6 Jan 2017 06:54:07 +0000 (22:54 -0800)]
bools: fix use_lock_pattern_drawable javadoc.
Change-Id: If135544edb499ee64117bf81c6e3d0eebbfcff00
Ajay Panicker [Fri, 6 Jan 2017 01:46:10 +0000 (01:46 +0000)]
Merge "Prevent LocalSocket from creating an fd if fd is already there" am:
616910fd53
am:
d76576b6d1
Change-Id: I0b59b10a095bf23d4f26856690bf6be2a5304cbc
Ajay Panicker [Fri, 6 Jan 2017 01:41:09 +0000 (01:41 +0000)]
Merge "Prevent LocalSocket from creating an fd if fd is already there"
am:
616910fd53
Change-Id: I90192dd7e656b9bec62815ad628fc4e67f806240
Treehugger Robot [Fri, 6 Jan 2017 01:29:46 +0000 (01:29 +0000)]
Merge "Prevent LocalSocket from creating an fd if fd is already there"
Steven Moreland [Fri, 6 Jan 2017 01:09:26 +0000 (01:09 +0000)]
Merge "HwBinder: get/register checked exceptions." am:
9ec4fec5ca
am:
3290ba072b
Change-Id: I49ee88cca2b2da0eac8d73cf408d2c5bfb409ce9
Steven Moreland [Fri, 6 Jan 2017 01:05:02 +0000 (01:05 +0000)]
Merge "HwBinder: get/register checked exceptions."
am:
9ec4fec5ca
Change-Id: Id6abc10992428af2e55cb5228c298b69c111c621
Treehugger Robot [Fri, 6 Jan 2017 00:58:17 +0000 (00:58 +0000)]
Merge "HwBinder: get/register checked exceptions."
Evgenii Stepanov [Fri, 6 Jan 2017 00:29:29 +0000 (00:29 +0000)]
Merge "Fix stack-buffer-overflow detected by AddressSanitizer." am:
1d8995aa9c
am:
bd38f6f4f8
Change-Id: Id28b9734e27b62f2eb642a4193482e9026f8f3b7
Evgenii Stepanov [Fri, 6 Jan 2017 00:25:28 +0000 (00:25 +0000)]
Merge "Fix stack-buffer-overflow detected by AddressSanitizer."
am:
1d8995aa9c
Change-Id: I65a468b94b1bc927bb4cff8b08a08dc6a8aca09e
Treehugger Robot [Fri, 6 Jan 2017 00:17:00 +0000 (00:17 +0000)]
Merge "Fix stack-buffer-overflow detected by AddressSanitizer."
Amin Shaikh [Fri, 6 Jan 2017 00:15:01 +0000 (00:15 +0000)]
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am:
48eecdcbc4
am:
7495cf633c
Change-Id: Ie6913526fbc1b0ae63eb7c0c7be7d9eac5772f50
Amin Shaikh [Fri, 6 Jan 2017 00:08:19 +0000 (00:08 +0000)]
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer."
am:
48eecdcbc4
Change-Id: I6b9ecd35dbc0758cd45b804dc9586287428af293
Treehugger Robot [Thu, 5 Jan 2017 23:57:53 +0000 (23:57 +0000)]
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer."
Ajay Panicker [Thu, 5 Jan 2017 23:38:52 +0000 (15:38 -0800)]
Prevent LocalSocket from creating an fd if fd is already there
Any LocalSocket created with a FileDescriptor will throw IOExceptions
when performing most opperations due to the fact that the LocalSocket
tries to create an implementation but fails since there is a FileDescriptor
already set.
Bug:
34095140
Test: Setup using tap&go
Change-Id: Ie8f50def6156c16617697d939d6c0ab570281642
Alain Vongsouvanh [Thu, 5 Jan 2017 23:27:37 +0000 (15:27 -0800)]
resolve merge conflicts of
2fda2ce15958 to nyc-mr1-dev-plus-aosp
Change-Id: Ia35164bd4ea262fa72afb7b78a47b0e4f0ef96ba
Amin Shaikh [Thu, 5 Jan 2017 22:28:47 +0000 (14:28 -0800)]
Fix NetworkScorerAppManager#isCallerActiveScorer.
The current implementation checks whether the caller's uid has the
SCORE_NETWORKS permission instead of checking the passed in callingUid. I
removed this check entirely because the getActiveScorer method already checks
whether the scorer's package has the SCORE_NETWORKS permission. There is no way
callingUid can equal the active scoring package's uid without also having the
SCORE_NETWORKS permission.
Bug:
34107721
Test: runtest --path core/tests/coretests/src/android/net/NetworkScorerAppManagerTest.java
Change-Id: Ifd427792169837c84a10a76b208c76137db06ae9
Xin Li [Thu, 5 Jan 2017 21:57:48 +0000 (21:57 +0000)]
Merge "Use half-width quotes in code example." am:
1fe99a819c
am:
161d1487ba
Change-Id: Ia4814baf438c72d4ceed3be864e391513ed1c78e
Xin Li [Thu, 5 Jan 2017 21:51:13 +0000 (21:51 +0000)]
Merge "Use half-width quotes in code example."
am:
1fe99a819c
Change-Id: I28a34f7813268d7a9303029d257996d6ceb53269
Treehugger Robot [Thu, 5 Jan 2017 21:39:05 +0000 (21:39 +0000)]
Merge "Use half-width quotes in code example."
Evgenii Stepanov [Mon, 3 Oct 2016 21:44:35 +0000 (14:44 -0700)]
Fix stack-buffer-overflow detected by AddressSanitizer.
Bug:
31855186
Test: boot SANITIZE_TARGET=address build
Change-Id: I5c2c64564ccea28e416d66b27af9d86506d622ce
Xin Li [Thu, 5 Jan 2017 19:43:09 +0000 (11:43 -0800)]
Use half-width quotes in code example.
Test: m -j49 -k docs
BUG:
34106216
Change-Id: I366b0bf085ad3fd166b7961301bb8c35da6a7630
Steven Moreland [Wed, 4 Jan 2017 18:37:59 +0000 (10:37 -0800)]
HwBinder: get/register checked exceptions.
Bug:
33673120
Test: hidl_test_java
Change-Id: Id19b61b252e756a032ae11f7b59bd8eed82edbe9
Alain Vongsouvanh [Fri, 18 Nov 2016 21:27:16 +0000 (13:27 -0800)]
widget: Adding support for custom LockPatternView.
OEMs can overlay the default 9 dots by providing two drawables that represent
those dots:
* lockscreen_notselected: asset to display when a cell has not been selected.
* lockscreen_selected: asset to display when a cell has been selected.
BUG:
33755663
Change-Id: Ic595b01f5e1321696b7a3feb0ff73c1acccfb942
Martijn Coenen [Thu, 5 Jan 2017 09:52:32 +0000 (09:52 +0000)]
Merge "Callback elision for HIDL interfaces." am:
33bd8a97b3
am:
4369507dcb
Change-Id: Ic9ea53f3b7cff0d656b6147ca6d159b75df0bdda
Martijn Coenen [Thu, 5 Jan 2017 09:47:45 +0000 (09:47 +0000)]
Merge "Callback elision for HIDL interfaces."
am:
33bd8a97b3
Change-Id: Ic001e0d9a9c946cf9be38a55b2e0ec61b4931cf4
Martijn Coenen [Thu, 5 Jan 2017 09:40:55 +0000 (09:40 +0000)]
Merge "Callback elision for HIDL interfaces."
Robert Sesek [Thu, 5 Jan 2017 09:37:32 +0000 (09:37 +0000)]
Merge "Synchronize access to WebViewZygote." am:
fd6f631de5
am:
c8111e07d0
Change-Id: I8c389a9c06bd0b8d1964756323e6c7e010901f89
Robert Sesek [Thu, 5 Jan 2017 09:31:24 +0000 (09:31 +0000)]
Merge "Synchronize access to WebViewZygote."
am:
fd6f631de5
Change-Id: I20eaaf40b2ed060caf3685f229005c3e78f29d19
Treehugger Robot [Thu, 5 Jan 2017 09:20:59 +0000 (09:20 +0000)]
Merge "Synchronize access to WebViewZygote."
Pavlin Radoslavov [Thu, 5 Jan 2017 07:55:27 +0000 (07:55 +0000)]
Merge "Integration of the LDAC codec for A2DP source" am:
3c050268f0
am:
bb8f1cd92b
Change-Id: I62f8462330d7661b8008abf862c4d4bb47c129dc
Pavlin Radoslavov [Thu, 5 Jan 2017 07:49:49 +0000 (07:49 +0000)]
Merge "Integration of the LDAC codec for A2DP source"
am:
3c050268f0
Change-Id: I79092dfa7a6918bf359b266bec7a7bbc736f08ce
Martijn Coenen [Mon, 2 Jan 2017 14:16:24 +0000 (15:16 +0100)]
Callback elision for HIDL interfaces.
Test: mma, hidl_test_java
Bug:
31380743
Change-Id: I9a5c8ef0cc6ac3150395a867690ca82ec2bc419f
Treehugger Robot [Thu, 5 Jan 2017 07:43:49 +0000 (07:43 +0000)]
Merge "Integration of the LDAC codec for A2DP source"
Pavlin Radoslavov [Thu, 5 Jan 2017 00:47:02 +0000 (16:47 -0800)]
Integration of the LDAC codec for A2DP source
The codec can be used if the encoding shared library is installed
on the device:
libldacBT_enc.so
Test: A2DP streaming to LDAC headsets
Bug:
30958229
Change-Id: I524805fd308b5181427515617eda05625a7c4ae5
Pavlin Radoslavov [Thu, 5 Jan 2017 02:07:05 +0000 (02:07 +0000)]
Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am:
5242acbd0b
am:
a750c90ac1
Change-Id: I7957fb151bb113485240fdc2bae1cdd380930f27
Pavlin Radoslavov [Thu, 5 Jan 2017 02:02:01 +0000 (02:02 +0000)]
Merge "Integration of the aptX and aptX-HD codecs for A2DP source"
am:
5242acbd0b
Change-Id: I4007f4e68e889ed0a41ac5fc035f175e3709bb0d
Treehugger Robot [Thu, 5 Jan 2017 01:56:34 +0000 (01:56 +0000)]
Merge "Integration of the aptX and aptX-HD codecs for A2DP source"
Pavlin Radoslavov [Thu, 5 Jan 2017 00:10:09 +0000 (16:10 -0800)]
Integration of the aptX and aptX-HD codecs for A2DP source
Each of the codecs can be used if the corresponding encoding
shared library is installed on the device:
- aptX: libaptX.so
- aptX-HD: libaptXHD.so
Test: A2DP streaming to aptX and aptX-HD headsets
Bug:
30958229
Change-Id: I24faddc8cd88ae3e1370922c633f30e13124a867
Jeremy Joslin [Wed, 4 Jan 2017 23:16:38 +0000 (23:16 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission." am:
a54d76a81f
am:
84fd1e1120
Change-Id: I85279a0185d9191bf81e1088d68f86827fe2d103
Jeremy Joslin [Wed, 4 Jan 2017 23:10:42 +0000 (23:10 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission."
am:
a54d76a81f
Change-Id: I4fc03585c4943712f5c1309a5bfa2995dac1bbe0
Julius D'souza [Wed, 4 Jan 2017 23:05:48 +0000 (23:05 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
am:
b60eb1a854
Change-Id: I09803955b09d3dec66bca8e4fed6f21fe18aa7d6
Julius D'souza [Wed, 4 Jan 2017 23:05:42 +0000 (23:05 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode.
am:
bbfdf7ad23
Change-Id: Iafc7d24b276db9b145709e7af80e03292c1ce735
Treehugger Robot [Wed, 4 Jan 2017 23:04:46 +0000 (23:04 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission."
Julius D'souza [Wed, 4 Jan 2017 22:59:57 +0000 (22:59 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
Jeremy Joslin [Wed, 4 Jan 2017 22:58:52 +0000 (22:58 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am:
5b4aec1dc6
am:
01828eb244
Change-Id: I094906527e9baf20f6bcb844f261d0fdcb8f6aa6
Jeremy Joslin [Wed, 4 Jan 2017 22:53:12 +0000 (22:53 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning."
am:
5b4aec1dc6
Change-Id: Ic80d796221d94a092ed210dde3d1e3886d950265
Treehugger Robot [Wed, 4 Jan 2017 22:43:34 +0000 (22:43 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning."
Jeremy Joslin [Wed, 4 Jan 2017 21:47:42 +0000 (21:47 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am:
34d46ca94c
am:
acbf592683
Change-Id: Ic488962a47eecea4c2ed522596549ef088bfbfc3
Jeremy Joslin [Wed, 4 Jan 2017 21:42:41 +0000 (21:42 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
am:
34d46ca94c
Change-Id: I1e6f1751cf3ce690e09e8681c86f744a38c550d6
Treehugger Robot [Wed, 4 Jan 2017 21:35:03 +0000 (21:35 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
Jeremy Joslin [Wed, 21 Dec 2016 22:16:19 +0000 (14:16 -0800)]
Defining a new REQUEST_NETWORK_SCORES permission.
This is intended to be a drop-in replacement for the existing
BROADCAST_NETWORK_PRIVILEGED with a more appropriate name.
Test: Built, ran.
BUG:
33752149
Change-Id: Iebe9d1c12f159bd91953ef094d9866eba9ff925a
Merged-In: I12bdba9694fdf2a2e39990736265919edafd865e
Jeremy Joslin [Thu, 29 Dec 2016 23:00:23 +0000 (15:00 -0800)]
Fix NetworkScoreServiceTest.testSystemRunning.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33905890
Change-Id: Icc1db79cde26f1445ca925780ff760b7aa0515b1
Merged-In: Idc92fe3669b0efdb20d3899ce4ce7bae70033aff
Joe LaPenna [Wed, 4 Jan 2017 19:54:32 +0000 (19:54 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi." am:
944b017031
am:
1c4cfe1af9
Change-Id: I094905e8fa7f54f4f5f0be80fa833ca44654f334
Joe LaPenna [Wed, 4 Jan 2017 19:49:35 +0000 (19:49 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi."
am:
944b017031
Change-Id: If63881b8b33ced7950ebb7e83fb8994e454b8642
Jeremy Joslin [Thu, 29 Dec 2016 18:18:48 +0000 (10:18 -0800)]
Use the new BIND_NETWORK_RECOMMENDATION_SERVICE.
Declare that the system uses the new
BIND_NETWORK_RECOMMENDATION_SERVICE permission.
Test: Built & ran
BUG:
33897544
Change-Id: I43424642a631f58da3a065f8221e351180f4f221
Merged-In: I41c7550adf0d1f81ed9a12068ba569e6a57f3b42
Treehugger Robot [Wed, 4 Jan 2017 19:42:16 +0000 (19:42 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi."
Marie Janssen [Wed, 4 Jan 2017 19:18:31 +0000 (19:18 +0000)]
Merge "Bluetooth: don't output dumpsys info twice" am:
c77074300b
am:
fde6c2a4af
Change-Id: I53c6c777cac8eb129ba1a4a08e81a496deb31c44
Marie Janssen [Wed, 4 Jan 2017 19:13:57 +0000 (19:13 +0000)]
Merge "Bluetooth: don't output dumpsys info twice"
am:
c77074300b
Change-Id: I727ed233944a18565e7286bfe0a8d7832a2be962
Marie Janssen [Wed, 4 Jan 2017 19:07:18 +0000 (19:07 +0000)]
Merge "Bluetooth: don't output dumpsys info twice"
Marie Janssen [Tue, 3 Jan 2017 19:37:38 +0000 (11:37 -0800)]
Bluetooth: don't output dumpsys info twice
Dumpsys info was printed in the "Application Services" section as well
as the bluetooth_manager section. Add an argument to print so it prints
from here, and doesn't in the other section.
Test: run a bugreport, check in "APP SERVICES" section
Bug:
29356402
Change-Id: I8adedaeac54c9a538c581459654dbdf96361e046
Joe LaPenna [Wed, 4 Jan 2017 08:44:22 +0000 (00:44 -0800)]
Expose RecommendationRequest.Builder as SystemApi.
In order to test our recommender, we need to be able to create
network recommendation requests.
Test: make update-api
Change-Id: I68df0d3e684bcdb90709a34478d2aa669ee23547
Merged-In: I68df0d3e684bcdb90709a34478d2aa669ee23547
qinzhichao [Wed, 4 Jan 2017 17:32:20 +0000 (17:32 +0000)]
Merge "Fix NullPointerException in MediaPlayer" am:
c7c899bbe2
am:
15c9c1f8d1
Change-Id: I313f483e69e098252cf1b753aa5f6b38945d9669
qinzhichao [Wed, 4 Jan 2017 17:27:48 +0000 (17:27 +0000)]
Merge "Fix NullPointerException in MediaPlayer"
am:
c7c899bbe2
Change-Id: Iff261e6bd78c4f757ee0f7ae199710c9f92f0778
Treehugger Robot [Wed, 4 Jan 2017 17:23:06 +0000 (17:23 +0000)]
Merge "Fix NullPointerException in MediaPlayer"
Jeremy Joslin [Wed, 4 Jan 2017 15:34:16 +0000 (15:34 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am:
871beedc6d
am:
a169fc3494
Change-Id: I25f816c0ee3df784a02be58a042c505f2c839394
Jeremy Joslin [Wed, 4 Jan 2017 15:29:57 +0000 (15:29 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
am:
871beedc6d
Change-Id: I2554ede84b313e66af57e05c59046747c16ec23e
Treehugger Robot [Wed, 4 Jan 2017 15:24:30 +0000 (15:24 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
Neil Fuller [Wed, 4 Jan 2017 12:38:50 +0000 (12:38 +0000)]
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am:
75ba827a4e
am:
6a29676687
Change-Id: Icb55f2b160f6bd2f6c12845613ea3b4ea834693d
Neil Fuller [Wed, 4 Jan 2017 12:32:29 +0000 (12:32 +0000)]
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets"
am:
75ba827a4e
Change-Id: I08b809241b6e025c9a30377c09f616be3484d7af
Treehugger Robot [Wed, 4 Jan 2017 12:26:48 +0000 (12:26 +0000)]
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets"
Ivan Podogov [Wed, 4 Jan 2017 10:41:26 +0000 (10:41 +0000)]
Merge "HID Device role API fixes" am:
f33a71d017
am:
a7d58fecc6
Change-Id: Iab0dc91a8e2d4066d5eb85ec4771d42642783671
Ivan Podogov [Wed, 4 Jan 2017 10:37:38 +0000 (10:37 +0000)]
Merge "HID Device role API fixes"
am:
f33a71d017
Change-Id: Ib7f524b7ad0bf63b852f2ffd4039d8b47ef7fc01
Neil Fuller [Wed, 4 Jan 2017 10:07:25 +0000 (10:07 +0000)]
Set isConnected, isBound, implCreated on server-side LocalSockets
Previously LocalServerSocket.accept() would return a LocalSocket
instance with isConnected, isBound and implCreated set to false.
[implCreated determines whether impl.create() needs to called].
A socket created via accept() in this way is implicitly bound
and connected. impl.create() does not need to be called because
impl.accept(LocalSocketImpl s) is called instead and has the same
effect (s.fd and s.mFdCreatedInternally set correctly).
This change modifies the behavior so that the flags are now all
set to true in this case and isBound() and isConnected() will
now return the correct answer.
Attempts to call bind() and connect() will still throw
IOException as before, but with a different exception message.
Correctly setting implCreated in LocalSocket means that
LocalSocketImpl.create() will no longer be called for accept()
created sockets and no longer needs to treat the "fd != null"
case as a no-op: we can now assert that there must be no fd set
when create() is called as we will no longer call it with sockets
created using accept().
Bug: https://code.google.com/p/android/issues/detail?id=35942
Test: Device boot
Test: vogar --mode app_process cts/tests/tests/net/src/android/net/cts/LocalServerSocketTest.java
Test: vogar --mode app_process cts/tests/tests/net/src/android/net/cts/LocalSocketTest.java
Change-Id: I3ac55439412e84501ae7c5ae6c9976e03b2d6fc5
Ivan Podogov [Wed, 4 Jan 2017 10:32:41 +0000 (10:32 +0000)]
Merge "HID Device role API fixes"
qinzhichao [Wed, 4 Jan 2017 06:51:33 +0000 (14:51 +0800)]
Fix NullPointerException in MediaPlayer
Issue detail:
https://code.google.com/p/android/issues/detail?id=231417
setSubtitleAnchor() is a synchronized method and has checked
mSubtitleController. So checking for null pointer is not
needed in scanInternalSubtitleTracks() method.
Signed-off-by: qinzhichao <qinzhichao@xiaomi.com>
Steven Moreland [Wed, 4 Jan 2017 05:07:06 +0000 (05:07 +0000)]
Merge "Add checked exceptions to HwBinder transact." am:
6c5cc261f8
am:
ca5d560090
Change-Id: I6d2dd373f83244e3fe61197cd704a3833a50329c
Steven Moreland [Wed, 4 Jan 2017 05:03:28 +0000 (05:03 +0000)]
Merge "Add checked exceptions to HwBinder transact."
am:
6c5cc261f8
Change-Id: I3bcac03a745722acd983dc4e7bdc31ae806bdbd4
Treehugger Robot [Wed, 4 Jan 2017 04:58:38 +0000 (04:58 +0000)]
Merge "Add checked exceptions to HwBinder transact."
Pavlin Radoslavov [Wed, 4 Jan 2017 03:44:40 +0000 (03:44 +0000)]
Merge "Add a mechanism for configuring the A2DP Source codecs" am:
63270f2b96
am:
8b46f87e7e
Change-Id: I39e4b90491f646887200649954b652d9f5439925