OSDN Git Service
Android Build Merger (Role) [Sat, 7 Jan 2017 02:59:53 +0000 (02:59 +0000)]
Merge "Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca am:
d8e95f6bda am:
b6092f5aed" into nyc-mr2-dev-plus-aosp
David Friedman [Sat, 7 Jan 2017 02:59:13 +0000 (02:59 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca am:
d8e95f6bda
am:
b6092f5aed
Change-Id: I388b5c7e19a4ca6333be82136c33df3a2731b3f0
Android Build Merger (Role) [Sat, 7 Jan 2017 02:59:06 +0000 (02:59 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0 am:
eedb695579 am:
89f96e8fa4" into nyc-mr2-dev-plus-aosp
Dave Friedman [Sat, 7 Jan 2017 02:58:22 +0000 (02:58 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0 am:
eedb695579
am:
89f96e8fa4
Change-Id: Iba9639fe928c6201a574dc1b9cdfb5247ab72439
Dave Friedman [Sat, 7 Jan 2017 02:58:15 +0000 (02:58 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0 am:
eedb695579
am:
fb8676e50c
Change-Id: I5b13dcbab3aed19c805473a6ab91eef197ded51d
David Friedman [Sat, 7 Jan 2017 02:51:16 +0000 (02:51 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca
am:
d8e95f6bda
Change-Id: I1638d0b407db1a990b0c32f3cb14344f524ba8a4
Dave Friedman [Sat, 7 Jan 2017 02:50:18 +0000 (02:50 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0
am:
eedb695579
Change-Id: Ia5922ed50290cc8f47d07f1516bc5a21b0bec270
Dave Friedman [Sat, 7 Jan 2017 02:50:17 +0000 (02:50 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0
am:
eedb695579
Change-Id: Icd2ded633cf7211ef9d1a2106216450db7773408
David Friedman [Sat, 7 Jan 2017 02:46:33 +0000 (02:46 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266
am:
bcc449eeca
Change-Id: I070f5c7088ce237995f995c2aa097e1f04cc4000
Dave Friedman [Sat, 7 Jan 2017 02:43:44 +0000 (02:43 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b
am:
a111e0f7f0
Change-Id: Ic5d7e0ce01bd573e0882122d0709cbc2da56f448
David Friedman [Sat, 7 Jan 2017 02:39:33 +0000 (02:39 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826
am:
c3b564e266
Change-Id: I23fdc92b08e32c643de8009bebf4e02c41741c7e
Dave Friedman [Sat, 7 Jan 2017 02:38:45 +0000 (02:38 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe
am:
e0fd4c8a3b
Change-Id: I8f65ad71433efbe1121e0617c6d7575b7db3a051
David Friedman [Sat, 7 Jan 2017 02:30:48 +0000 (02:30 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev
am:
101f885826
Change-Id: I5e6d948373c8f8ff2892c843329a7d2b540b8706
Dave Friedman [Sat, 7 Jan 2017 02:30:45 +0000 (02:30 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540
am:
2a3ebadcbe
Change-Id: Ibee55c5e73d9b51e5f5df24be01b0b797fa8a7a5
David Friedman [Sat, 7 Jan 2017 02:24:54 +0000 (02:24 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev
Alex Naidis [Sat, 7 Jan 2017 01:48:19 +0000 (01:48 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am:
0b325c6634 am:
fd55f834c8
am:
80888cdcbe
Change-Id: I9852107278f6206582393a57be60074763a6cb81
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
Pavlin Radoslavov [Sat, 7 Jan 2017 01:36:47 +0000 (01:36 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options" am:
bfd7f9a1f8 am:
d190040dd1
am:
8905569c67
Change-Id: I74b2606347e9b6e2a2424add4aa74d0db687f6ee
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"
Dave Friedman [Thu, 5 Jan 2017 02:27:26 +0000 (18:27 -0800)]
Docs: Updates Javadoc documentation.
Bug:
32532540
Change-Id: Ia811d9a51812206b18b75a98f6c5a55b92627404
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
Ruchi Kandoi [Fri, 6 Jan 2017 22:24:54 +0000 (22:24 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev
am:
cb4f643b95
Change-Id: I36d7312e2e9c6a121b3297c298d4e32867c7d84a
Ruchi Kandoi [Fri, 6 Jan 2017 22:24:46 +0000 (22:24 +0000)]
nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
am:
3a1ff62e5a
Change-Id: I1fbc203c2becededcbc8e9d873ff89244c52b7ba
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>
TreeHugger Robot [Fri, 6 Jan 2017 22:18:22 +0000 (22:18 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev
Ruben Brunk [Fri, 6 Jan 2017 21:14:31 +0000 (21:14 +0000)]
Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev
am:
0d8c4765b2
Change-Id: I709b8c9f3d6d32f3f71c2848716563a6b598d503
Ruben Brunk [Fri, 6 Jan 2017 21:14:27 +0000 (21:14 +0000)]
Fix unexpected VR mode exit on package update.
am:
1ad4a2d32e
Change-Id: Ic0c025d3f360197dc41fe2b999b5d20763285cd5
Dan Albert [Fri, 6 Jan 2017 21:10:51 +0000 (21:10 +0000)]
Merge "Unversion NDK stub libraries." am:
ddc7ac8ba6 am:
e2b4d4a38a
am:
22f0b9d1ae
Change-Id: Ie6abad6c56a55cd67c22903cd9d60bd907d45e9b
TreeHugger Robot [Fri, 6 Jan 2017 21:07:26 +0000 (21:07 +0000)]
Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev
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
Andrew Sapperstein [Fri, 6 Jan 2017 20:57:12 +0000 (20:57 +0000)]
Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev
am:
e553cebbeb
Change-Id: I390db320ba7139dcc96f361ce4f850b8125482b9
Andrew Sapperstein [Fri, 6 Jan 2017 20:57:05 +0000 (20:57 +0000)]
Update CHAR LIMIT for notification body.
am:
429cafb85e
Change-Id: I2cfa08917ce4581d4119ba7a6e492874368cf957
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:46:24 +0000 (20:46 +0000)]
Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev
Treehugger Robot [Fri, 6 Jan 2017 20:44:18 +0000 (20:44 +0000)]
Merge "Unversion NDK stub libraries."
Andrew Sapperstein [Fri, 6 Jan 2017 20:04:30 +0000 (20:04 +0000)]
Add temperature config for high temp warning.
am:
1cac83218c
Change-Id: I1aedaf0714e0f020f6e062bac716841ec472db2a
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>
Ruben Brunk [Fri, 6 Jan 2017 19:23:49 +0000 (11:23 -0800)]
Fix unexpected VR mode exit on package update.
Bug:
33809651
Change-Id: Ifbaf705e74eda2bde3e4b2d9092360a1c658e660
Ruchi Kandoi [Fri, 6 Jan 2017 19:10:22 +0000 (19:10 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am:
cc4203221b am:
388980d88f
am:
c1db6c05d0
Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d
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
Andrew Sapperstein [Fri, 6 Jan 2017 18:54:04 +0000 (10:54 -0800)]
Update CHAR LIMIT for notification body.
Test: is comment change
Bug:
34097363
Change-Id: I8ae19c3b5108c9c2f00614cd5d32cee06082a052
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>
Andrew Sapperstein [Fri, 6 Jan 2017 00:45:37 +0000 (16:45 -0800)]
Add temperature config for high temp warning.
Adds an integer resource (config_warningTemperature) that is used
to display the high temp warning. If it is set to less than 0,
the value from HardwarePropertiesManager#getDeviceTemperatures(
HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN,
HardwarePropertiesManager.TEMPERATURE_THROTTLING) is used instead.
Test: manual
Bug:
30995038
Change-Id: I05aa1b5930c6c151ebac439dfd5c00b3305dc46d
(cherry picked from commit
7518471ab69a23130b8cc6852e1b3d58809c97b2)
Android Build Merger (Role) [Fri, 6 Jan 2017 17:49:59 +0000 (17:49 +0000)]
Merge "bools: fix use_lock_pattern_drawable javadoc. am:
c4046b5542 am:
f36beac956" into nyc-mr2-dev-plus-aosp
Alain Vongsouvanh [Fri, 6 Jan 2017 17:49:11 +0000 (17:49 +0000)]
bools: fix use_lock_pattern_drawable javadoc. am:
c4046b5542
am:
f36beac956
Change-Id: I4df384dd641d623d0a7fb100661dbc6232c4014b
Alain Vongsouvanh [Fri, 6 Jan 2017 17:48:37 +0000 (17:48 +0000)]
bools: fix use_lock_pattern_drawable javadoc. am:
c4046b5542
am:
e51a76861c
Change-Id: I202ece102111012cee7c3cca980b9256f84fc0ee
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
Alain Vongsouvanh [Fri, 6 Jan 2017 17:41:37 +0000 (17:41 +0000)]
bools: fix use_lock_pattern_drawable javadoc.
am:
c4046b5542
Change-Id: Ifd50a1780a232d3902e5a232c2b3445aeb6db178
Alain Vongsouvanh [Fri, 6 Jan 2017 10:47:52 +0000 (10:47 +0000)]
Merge "resolve merge conflicts of
2fda2ce15958 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am:
414f8fbdbb
Change-Id: I7dab2a9548fe2285caf94ca1d108df616bddd27a
Alain Vongsouvanh [Fri, 6 Jan 2017 10:47:48 +0000 (10:47 +0000)]
resolve merge conflicts of
2fda2ce15958 to nyc-mr1-dev-plus-aosp
am:
5549258eea
Change-Id: Ic77c99e37c9e5ff019adf5693ea40d9e5d80c562
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:50:07 +0000 (09:50 +0000)]
Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" am:
43c98c74fe am:
ef5d1cb3b4
am:
1c0070aa5d
Change-Id: I94912d6e633d7869f31a0f6323d4bc7d8e901db8
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:50:03 +0000 (01:50 +0000)]
Merge "Prevent LocalSocket from creating an fd if fd is already there" am:
616910fd53 am:
d76576b6d1
am:
e0211af867
Change-Id: I5ac57ca6439359fc65622254090a3ea6cc2aec18
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:16:02 +0000 (01:16 +0000)]
Merge "HwBinder: get/register checked exceptions." am:
9ec4fec5ca am:
3290ba072b
am:
94924f38fb
Change-Id: I3b871a941856fdeb0e989aeaadc5fdbc7732b681
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."
TreeHugger Robot [Fri, 6 Jan 2017 00:42:30 +0000 (00:42 +0000)]
Merge "resolve merge conflicts of
cb29c97907f3 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp
Evgenii Stepanov [Fri, 6 Jan 2017 00:36:33 +0000 (00:36 +0000)]
Merge "Fix stack-buffer-overflow detected by AddressSanitizer." am:
1d8995aa9c am:
bd38f6f4f8
am:
97e98f18b7
Change-Id: I9bf7d8e447796196d44055a29936de3d68f9ece9
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
Amin Shaikh [Fri, 6 Jan 2017 00:21:56 +0000 (00:21 +0000)]
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am:
48eecdcbc4 am:
7495cf633c
am:
d7f371813a
Change-Id: I8fc3a45a910294c46982bac9a3f6e183977aad16
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
Alain Vongsouvanh [Fri, 6 Jan 2017 00:11:25 +0000 (16:11 -0800)]
resolve merge conflicts of
cb29c97907f3 to nyc-mr2-dev-plus-aosp
Change-Id: I22ff2e61c0d46310e62fa45f98e11a5bba3d5f1a
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 22:05:33 +0000 (22:05 +0000)]
Merge "Use half-width quotes in code example." am:
1fe99a819c am:
161d1487ba
am:
2cb75e822d
Change-Id: I04cd0d83d7f808068d5021fb28d7b8b868f90c3b
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
Alain Vongsouvanh [Thu, 5 Jan 2017 19:45:02 +0000 (19:45 +0000)]
widget: Adding support for custom LockPatternView.
am:
2fda2ce159
Change-Id: Ib0d53bd7258f784dc3cb0661757b7c6d4979007f
Winson Chung [Thu, 5 Jan 2017 19:38:43 +0000 (19:38 +0000)]
Merge "Add logging for task view thumbnail state." into nyc-mr2-dev
am:
1d513b28e3
Change-Id: I16874246c946efa0f979af55edcd6ac90607cee6
Winson Chung [Thu, 5 Jan 2017 19:38:37 +0000 (19:38 +0000)]
Add logging for task view thumbnail state.
am:
eb2206cb51
Change-Id: Ibf8fed3d189483f8a8b351d87f406c90d0259fc5
TreeHugger Robot [Thu, 5 Jan 2017 19:33:44 +0000 (19:33 +0000)]
Merge "Add logging for task view thumbnail state." into nyc-mr2-dev
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
Bill Yi [Thu, 5 Jan 2017 10:13:33 +0000 (10:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
20088b3e31 -s ours
Change-Id: I436ace11c8559ba3c4dd4db8314e12455a1075a3
Bill Yi [Thu, 5 Jan 2017 10:13:28 +0000 (10:13 +0000)]
Import translations. DO NOT MERGE
am:
319605a34b -s ours
Change-Id: I8f3c68474b243df1d2dbc0902199fa54094bf946
Bill Yi [Thu, 5 Jan 2017 10:12:01 +0000 (10:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9e8b15b953 -s ours
Change-Id: I815b7a16c8893727641bc724b06feccbb6ba30ad
Bill Yi [Thu, 5 Jan 2017 10:11:56 +0000 (10:11 +0000)]
Import translations. DO NOT MERGE
am:
a51dba4ca5 -s ours
Change-Id: I3e7f129cdb9b84907254be487342e4e8aa215634
OSDN Git Service
