David Friedman
b6092f5aed
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca
...
am: d8e95f6bda
2017-01-07 02:51:16 +00:00
Dave Friedman
fb8676e50c
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0
...
am: eedb695579
2017-01-07 02:50:18 +00:00
David Friedman
d8e95f6bda
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266
...
am: bcc449eeca
2017-01-07 02:46:33 +00:00
Dave Friedman
eedb695579
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b
...
am: a111e0f7f0
2017-01-07 02:43:44 +00:00
David Friedman
bcc449eeca
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826
...
am: c3b564e266
2017-01-07 02:39:33 +00:00
Dave Friedman
a111e0f7f0
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe
...
am: e0fd4c8a3b
2017-01-07 02:38:45 +00:00
David Friedman
c3b564e266
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev
...
am: 101f885826
2017-01-07 02:30:48 +00:00
Dave Friedman
e0fd4c8a3b
Docs: Updates Javadoc documentation. Bug: 32532540
...
am: 2a3ebadcbe
2017-01-07 02:30:45 +00:00
David Friedman
101f885826
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev
2017-01-07 02:24:57 +00:00
Alex Naidis
80888cdcbe
Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am: 0b325c6634
...
am: fd55f834c8
2017-01-07 01:44:14 +00:00
Alex Naidis
fd55f834c8
Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
...
am: 0b325c6634
2017-01-07 01:40:42 +00:00
Treehugger Robot
0b325c6634
Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
2017-01-07 01:33:18 +00:00
Pavlin Radoslavov
8905569c67
Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8
...
am: d190040dd1
2017-01-07 01:29:44 +00:00
Pavlin Radoslavov
d190040dd1
Merge "Add Bluetooth Codec selection UI to the Developer Options"
...
am: bfd7f9a1f8
2017-01-07 01:25:34 +00:00
Treehugger Robot
bfd7f9a1f8
Merge "Add Bluetooth Codec selection UI to the Developer Options"
2017-01-07 01:19:33 +00:00
Dave Friedman
2a3ebadcbe
Docs: Updates Javadoc documentation.
...
Bug: 32532540
Change-Id: Ia811d9a51812206b18b75a98f6c5a55b92627404
2017-01-06 16:41:19 -08:00
Pavlin Radoslavov
60d704f841
Add Bluetooth Codec selection UI to the Developer Options
...
Test: A2DP streaming to headsets and manual UI interaction
Bug: 30958229
Change-Id: I88f6efedf1c89b524c863543135ef7be9b7e1a7c
2017-01-06 15:44:27 -08:00
Alex Naidis
f030a28a6b
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 >
2017-01-06 22:21:24 +00:00
Dan Albert
22f0b9d1ae
Merge "Unversion NDK stub libraries." am: ddc7ac8ba6
...
am: e2b4d4a38a
2017-01-06 21:03:24 +00:00
Dan Albert
e2b4d4a38a
Merge "Unversion NDK stub libraries."
...
am: ddc7ac8ba6
2017-01-06 20:54:52 +00:00
Treehugger Robot
ddc7ac8ba6
Merge "Unversion NDK stub libraries."
2017-01-06 20:44:19 +00:00
Dan Albert
98e462df7d
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
2017-01-06 11:04:14 -08:00
Ruchi Kandoi
c1db6c05d0
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b
...
am: 388980d88f
2017-01-06 19:03:07 +00:00
Ruchi Kandoi
388980d88f
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
...
am: cc4203221b
2017-01-06 18:58:17 +00:00
Ruchi Kandoi
cc4203221b
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
2017-01-06 18:49:45 +00:00
Ruchi Kandoi
104e0b4399
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 >
2017-01-06 18:48:51 +00:00
Alain Vongsouvanh
e51a76861c
bools: fix use_lock_pattern_drawable javadoc.
...
am: c4046b5542
2017-01-06 17:41:43 +00:00
TreeHugger Robot
414f8fbdbb
Merge "resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2017-01-06 10:40:36 +00:00
Yohann Roussel
1c0070aa5d
Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" am: 43c98c74fe
...
am: ef5d1cb3b4
2017-01-06 09:42:44 +00:00
Yohann Roussel
ef5d1cb3b4
Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks"
...
am: 43c98c74fe
2017-01-06 09:38:33 +00:00
Yohann Roussel
43c98c74fe
Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks"
2017-01-06 09:29:26 +00:00
Alain Vongsouvanh
c4046b5542
bools: fix use_lock_pattern_drawable javadoc.
...
Change-Id: If135544edb499ee64117bf81c6e3d0eebbfcff00
2017-01-05 22:54:07 -08:00
Ajay Panicker
e0211af867
Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53
...
am: d76576b6d1
2017-01-06 01:46:10 +00:00
Ajay Panicker
d76576b6d1
Merge "Prevent LocalSocket from creating an fd if fd is already there"
...
am: 616910fd53
2017-01-06 01:41:09 +00:00
Treehugger Robot
616910fd53
Merge "Prevent LocalSocket from creating an fd if fd is already there"
2017-01-06 01:29:47 +00:00
Steven Moreland
94924f38fb
Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca
...
am: 3290ba072b
2017-01-06 01:09:26 +00:00
Steven Moreland
3290ba072b
Merge "HwBinder: get/register checked exceptions."
...
am: 9ec4fec5ca
2017-01-06 01:05:02 +00:00
Treehugger Robot
9ec4fec5ca
Merge "HwBinder: get/register checked exceptions."
2017-01-06 00:58:17 +00:00
Evgenii Stepanov
97e98f18b7
Merge "Fix stack-buffer-overflow detected by AddressSanitizer." am: 1d8995aa9c
...
am: bd38f6f4f8
2017-01-06 00:29:29 +00:00
Evgenii Stepanov
bd38f6f4f8
Merge "Fix stack-buffer-overflow detected by AddressSanitizer."
...
am: 1d8995aa9c
2017-01-06 00:25:28 +00:00
Treehugger Robot
1d8995aa9c
Merge "Fix stack-buffer-overflow detected by AddressSanitizer."
2017-01-06 00:17:00 +00:00
Amin Shaikh
d7f371813a
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4
...
am: 7495cf633c
2017-01-06 00:15:01 +00:00
Amin Shaikh
7495cf633c
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer."
...
am: 48eecdcbc4
2017-01-06 00:08:19 +00:00
Treehugger Robot
48eecdcbc4
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer."
2017-01-05 23:57:54 +00:00
Ajay Panicker
7a8c36aa4e
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
2017-01-05 23:52:30 +00:00
Alain Vongsouvanh
5549258eea
resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp
...
Change-Id: Ia35164bd4ea262fa72afb7b78a47b0e4f0ef96ba
2017-01-05 15:27:37 -08:00
Amin Shaikh
2cd918a63e
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
2017-01-05 14:28:47 -08:00
Xin Li
2cb75e822d
Merge "Use half-width quotes in code example." am: 1fe99a819c
...
am: 161d1487ba
2017-01-05 21:57:48 +00:00
Xin Li
161d1487ba
Merge "Use half-width quotes in code example."
...
am: 1fe99a819c
2017-01-05 21:51:13 +00:00
Treehugger Robot
1fe99a819c
Merge "Use half-width quotes in code example."
2017-01-05 21:39:06 +00:00
