OSDN Git Service
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
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
TreeHugger Robot [Thu, 5 Jan 2017 10:08:41 +0000 (10:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 5 Jan 2017 10:06:44 +0000 (10:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Martijn Coenen [Thu, 5 Jan 2017 09:58:33 +0000 (09:58 +0000)]
Merge "Callback elision for HIDL interfaces." am:
33bd8a97b3 am:
4369507dcb
am:
e358f83640
Change-Id: Ia4345bfb09b2ab05d434951cd4acd9a7fa81bd49
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
Robert Sesek [Thu, 5 Jan 2017 09:43:53 +0000 (09:43 +0000)]
Merge "Synchronize access to WebViewZygote." am:
fd6f631de5 am:
c8111e07d0
am:
2c3818158a
Change-Id: Ib6afc79a3905a68fa92d5ff9389752724a77d305
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."
Bill Yi [Thu, 5 Jan 2017 08:27:04 +0000 (00:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic18109adbc1f4e2e3f8bf15aa6d5cf0cb703b601
Auto-generated-cl: translation import
Bill Yi [Thu, 5 Jan 2017 08:18:30 +0000 (00:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia63b58c348cd9978df4b800cdff5926ec9f487fa
Auto-generated-cl: translation import
Pavlin Radoslavov [Thu, 5 Jan 2017 07:59:59 +0000 (07:59 +0000)]
Merge "Integration of the LDAC codec for A2DP source" am:
3c050268f0 am:
bb8f1cd92b
am:
7d14914239
Change-Id: I01686a6a4c493dc1dce90c82f2215e955c2ce61f
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"
Andrew Sapperstein [Thu, 5 Jan 2017 03:07:54 +0000 (03:07 +0000)]
Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev
am:
0c7631f8b0
Change-Id: Ia9a3f2789fd4ec13578790e8afd557198b393809
Andrew Sapperstein [Thu, 5 Jan 2017 03:07:47 +0000 (03:07 +0000)]
Added alert icon to high temp dialog.
am:
bd4eeb7259
Change-Id: I8f6d4a0c9ba5c15478010714995243c305982707
Andrew Sapperstein [Thu, 5 Jan 2017 03:07:01 +0000 (03:07 +0000)]
Add VR mode check for thermal notification
am:
d51ac7322e
Change-Id: I056136375b74a38a4973951fb33f795e784bab1e
Andrew Sapperstein [Thu, 5 Jan 2017 03:05:59 +0000 (03:05 +0000)]
Show notif when device reaches throttling temp
am:
67e97053c5
Change-Id: I44639cb19b7fa9547dc1e579a5beb34f923da2a7
TreeHugger Robot [Thu, 5 Jan 2017 03:00:56 +0000 (03:00 +0000)]
Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev
* changes:
Added alert icon to high temp dialog.
Add VR mode check for thermal notification
Show notif when device reaches throttling temp
Pavlin Radoslavov [Thu, 5 Jan 2017 02:12:04 +0000 (02:12 +0000)]
Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am:
5242acbd0b am:
a750c90ac1
am:
5aaa985e97
Change-Id: I1ef73d7f11e244d77293a9b8b9c747ee79498819
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"
Andrew Sapperstein [Wed, 4 Jan 2017 19:25:20 +0000 (11:25 -0800)]
Added alert icon to high temp dialog.
Test: manual
Bug:
30995038
Change-Id: I966294c5fb0b8297b2f336102996291f66c08d2c
(cherry picked from commit
e26dc3d194f87ab3fbfdd5a843109b2f4b248383)
Andrew Sapperstein [Mon, 19 Dec 2016 22:36:33 +0000 (14:36 -0800)]
Add VR mode check for thermal notification
When in VR mode, don't show the high temp notification
since VR shows its own notification.
Test: manual
Bug:
30995038
Change-Id: I845480d968a9b0da9997f035875885bc261c577a
(cherry picked from commit
65d8a5fc73aac05633d42d7161ca38151aa5f675)
Andrew Sapperstein [Wed, 14 Dec 2016 23:39:20 +0000 (15:39 -0800)]
Show notif when device reaches throttling temp
Adds logic to SystemUI that shows a notification alerting the user
that their phone has reached a certain temperature and has throttled
itself in order to cool down.
The logic is controlled by a configuration resource:
R.bool.config_showTemperatureWarning. If false, no action is taken.
When true, PowerUI checks every 30 seconds if the current temp of
HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN is greater than
the throttling temp of HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN.
If any one of the temperatures returned is greater, a notification is shown.
Clicking on the notification will show a dialog explaining more details
about what the device is doing in response to the high temperature.
The notification will disappear once the temperature drops below
the throttling temperature.
In order to check the temperature in SystemUI, HardwarePropertiesManager
has been updated to also allow any calls made by callers holding the
signature-level DEVICE_POWER permission.
Test: runtest systemui
Bug:
30995038
Change-Id: I1b3f122341911c68e90c8a49ad35267ac382b356
(cherry picked from commit
b7caf1d06d5e4ef21cadcc6a68d4b4c4552fb7bc)
OSDN Git Service
