Pavlin Radoslavov
5aaa985e97
Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am: 5242acbd0b
...
am: a750c90ac1
Change-Id: I7957fb151bb113485240fdc2bae1cdd380930f27
2017-01-05 02:07:05 +00:00
Pavlin Radoslavov
a750c90ac1
Merge "Integration of the aptX and aptX-HD codecs for A2DP source"
...
am: 5242acbd0b
Change-Id: I4007f4e68e889ed0a41ac5fc035f175e3709bb0d
2017-01-05 02:02:01 +00:00
Treehugger Robot
5242acbd0b
Merge "Integration of the aptX and aptX-HD codecs for A2DP source"
2017-01-05 01:56:35 +00:00
Svetoslav Ganov
0b1501a7c8
Warn makeDefault ignored for system settings only if true
...
Test: changed system setting and got it back without a warning
bug:33816118
Change-Id: I4e185b46467fc885d2bafedbcbdf41354d0fa9d8
2017-01-04 17:12:03 -08:00
Bill Yi
b1871a2117
Import translations. DO NOT MERGE
...
Change-Id: I1f02709e81ed68998fb070d5a3f970ff4f645bbe
Auto-generated-cl: translation import
2017-01-04 17:07:41 -08:00
Andrew Sapperstein
bd4eeb7259
Added alert icon to high temp dialog.
...
Test: manual
Bug: 30995038
Change-Id: I966294c5fb0b8297b2f336102996291f66c08d2c
(cherry picked from commit e26dc3d194 )
2017-01-04 16:54:31 -08:00
Andrew Sapperstein
d51ac7322e
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 65d8a5fc73 )
2017-01-04 16:54:15 -08:00
Andrew Sapperstein
67e97053c5
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 b7caf1d06d )
2017-01-04 16:53:44 -08:00
Makoto Onuki
a755fb1030
Do not call RecoverySystem with DPMS lock held
...
Note DPM.wipeData() on a secondary user is now blocking, just like
it's been always blocking on the primary user.
Test: Manually tested wipeData() with TestDPC, both on 1) the primary user,
2) a secondary user and 3) work profile.
* Modified TestDPC so it supports secondary users
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Bug 30681079
Change-Id: Ib97a92a6af87a5589d2643b9ae0522395735e1a5
2017-01-04 16:44:22 -08:00
Amith Yamasani
c9facc0a1f
Merge "Track background sensor usage"
2017-01-05 00:32:10 +00:00
Pavlin Radoslavov
feeb9b245c
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
2017-01-04 16:30:35 -08:00
jackqdyulei
b68fd7ae0a
Remove hardcoded color for cellular data usage view
...
1. Remove hardcoded color and create colorStateList instead
2. Remove warning color and use attr textColorError instead
3. Add function to extract color from colorStateList
Bug: 32592245
Test: manual - Take screenshots
Change-Id: I7f0a54b304b09b99ba1f255952e7e99e009a4d2a
2017-01-04 16:12:44 -08:00
Steven Moreland
ab156196f8
Merge "Return<*> getStatus().isOk() -> isOk()"
2017-01-04 23:46:55 +00:00
Jeremy Joslin
11fa7f3d0b
Merge "Defining a new REQUEST_NETWORK_SCORES permission." am: a54d76a81f am: 84fd1e1120 am: 195ac87578
...
am: afc31dfe0f -s ours
Change-Id: I609bbca2e676837f2433e6d8ee55b0d8f863c865
2017-01-04 23:25:17 +00:00
Julius D'souza
7e2db40e5d
Merge "Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am: b60eb1a854 am: d559cb8124" into nyc-mr2-dev-plus-aosp
...
am: c0177f8772 -s ours
Change-Id: I797513f3072baf1e77ea502f2b03c0de734eb232
2017-01-04 23:20:43 +00:00
Julius D'souza
91af136305
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am: b60eb1a854 am: d559cb8124
...
am: 3382eed560 -s ours
Change-Id: Ia0711babeba3b0c6b47b6a2166202bb345fe114b
2017-01-04 23:20:36 +00:00
Jeremy Joslin
afc31dfe0f
Merge "Defining a new REQUEST_NETWORK_SCORES permission." am: a54d76a81f am: 84fd1e1120
...
am: 195ac87578
Change-Id: I1f6de46c521a232c1a218e3e6b50883ea6e150b0
2017-01-04 23:20:17 +00:00
Julius D'souza
d4e7c559e2
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am: bbfdf7ad23 am: 54a0faa37b" into nyc-mr2-dev-plus-aosp
...
am: 8433ec815b -s ours
Change-Id: I618705be4aabd249145093679106695290289981
2017-01-04 23:18:54 +00:00
Julius D'souza
9c6d4ba451
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am: bbfdf7ad23 am: 54a0faa37b
...
am: 7e8cbefcf1 -s ours
Change-Id: I18b0193d947b173076f9d2662f943d43a9670b90
2017-01-04 23:18:50 +00:00
Julius D'souza
e5084f55e6
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am: b60eb1a854 am: da8462aa5b
...
am: 1364904c55 -s ours
Change-Id: I720b212e16f6df6c5215ae529050b1b5a84a0900
2017-01-04 23:17:44 +00:00
Jeremy Joslin
195ac87578
Merge "Defining a new REQUEST_NETWORK_SCORES permission." am: a54d76a81f
...
am: 84fd1e1120
Change-Id: I85279a0185d9191bf81e1088d68f86827fe2d103
2017-01-04 23:16:38 +00:00
Julius D'souza
ca9d7bdfbc
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am: bbfdf7ad23 am: 8366e50043
...
am: d1d68b6597 -s ours
Change-Id: Ifd30fb62fa65562962bc3671a22716a06574c6f3
2017-01-04 23:16:36 +00:00
Android Build Merger (Role)
c0177f8772
Merge "Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am: b60eb1a854 am: d559cb8124" into nyc-mr2-dev-plus-aosp
2017-01-04 23:13:31 +00:00
Julius D'souza
3382eed560
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am: b60eb1a854
...
am: d559cb8124
Change-Id: Ia17370de250385171f6ff6b93eb3a59a4347f5a0
2017-01-04 23:12:50 +00:00
Android Build Merger (Role)
8433ec815b
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am: bbfdf7ad23 am: 54a0faa37b" into nyc-mr2-dev-plus-aosp
2017-01-04 23:12:34 +00:00
Julius D'souza
7e8cbefcf1
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am: bbfdf7ad23
...
am: 54a0faa37b
Change-Id: I30a13868896713fe71697608f200dad264b5d4c4
2017-01-04 23:11:51 +00:00
Julius D'souza
1364904c55
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am: b60eb1a854
...
am: da8462aa5b
Change-Id: I537e98e43c61868d156439383ee21a06b3dc2b41
2017-01-04 23:11:46 +00:00
Julius D'souza
d1d68b6597
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am: bbfdf7ad23
...
am: 8366e50043
Change-Id: I40341da2fe7c3e8e5129e647666eaf1860a2e522
2017-01-04 23:10:46 +00:00
Jeremy Joslin
84fd1e1120
Merge "Defining a new REQUEST_NETWORK_SCORES permission."
...
am: a54d76a81f
Change-Id: I4fc03585c4943712f5c1309a5bfa2995dac1bbe0
2017-01-04 23:10:42 +00:00
Android Build Merger (Role)
e19fa20ca5
Merge "Merge "Fix NetworkScoreServiceTest.testSystemRunning." am: 5b4aec1dc6 am: 01828eb244 am: b68823cab8 am: 0872235d4c -s ours"
2017-01-04 23:09:33 +00:00
Jeremy Joslin
13558a467a
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am: 5b4aec1dc6 am: 01828eb244 am: b68823cab8
...
am: 0872235d4c -s ours
Change-Id: I05cc72e28a691b3b8f92fa06706e6e3c189ec1bd
2017-01-04 23:08:46 +00:00
Allen Hair
16bceb27a9
Merge "Provide a mechanism for dumping code coverage for the system server."
2017-01-04 23:08:29 +00:00
TreeHugger Robot
6d630527bf
Merge "Fixing return type check when expanding via menu."
2017-01-04 23:08:16 +00:00
Julius D'souza
d559cb8124
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
...
am: b60eb1a854
Change-Id: I09803955b09d3dec66bca8e4fed6f21fe18aa7d6
2017-01-04 23:05:48 +00:00
Julius D'souza
da8462aa5b
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
...
am: b60eb1a854
Change-Id: I86ef53eec2bbeff07c52e079e925719c3923941c
2017-01-04 23:05:45 +00:00
Julius D'souza
54a0faa37b
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode.
...
am: bbfdf7ad23
Change-Id: Iafc7d24b276db9b145709e7af80e03292c1ce735
2017-01-04 23:05:42 +00:00
Julius D'souza
8366e50043
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode.
...
am: bbfdf7ad23
Change-Id: Ic6b72d6b72df516d4cec3b7a38e12366f7e334a1
2017-01-04 23:05:41 +00:00
Treehugger Robot
a54d76a81f
Merge "Defining a new REQUEST_NETWORK_SCORES permission."
2017-01-04 23:04:47 +00:00
Jeremy Joslin
0872235d4c
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am: 5b4aec1dc6 am: 01828eb244
...
am: b68823cab8
Change-Id: I19f5c7179a489e992356f141314582abc803ad2e
2017-01-04 23:02:45 +00:00
Julius D'souza
b60eb1a854
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
2017-01-04 23:00:00 +00:00
Jeremy Joslin
b68823cab8
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am: 5b4aec1dc6
...
am: 01828eb244
Change-Id: I094906527e9baf20f6bcb844f261d0fdcb8f6aa6
2017-01-04 22:58:52 +00:00
Jeremy Joslin
01828eb244
Merge "Fix NetworkScoreServiceTest.testSystemRunning."
...
am: 5b4aec1dc6
Change-Id: Ic80d796221d94a092ed210dde3d1e3886d950265
2017-01-04 22:53:12 +00:00
Treehugger Robot
5b4aec1dc6
Merge "Fix NetworkScoreServiceTest.testSystemRunning."
2017-01-04 22:43:35 +00:00
TreeHugger Robot
220c4155f7
Merge "Add notifications for incorrect plugin versions"
2017-01-04 22:21:16 +00:00
sergeyv
0a0f23163a
Move GraphicBuffer to graphics package
...
Test: locally tested Bitmap.createHardwareBitmap method
bug: 30999911
Change-Id: Iad432577f26f2362ede9e77cd8a5425c010692e5
2017-01-04 14:01:52 -08:00
Makoto Onuki
2b3fffbbd0
Merge "Follow-up to I1e4dd97"
2017-01-04 21:59:50 +00:00
Jeremy Joslin
5a413f5872
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am: 34d46ca94c am: acbf592683 am: cb3f75cca7
...
am: 6a848fdf09 -s ours
Change-Id: I5f94537db2313fab72d363c9e4f78e9ac3379a67
2017-01-04 21:57:11 +00:00
Jeremy Joslin
6a848fdf09
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am: 34d46ca94c am: acbf592683
...
am: cb3f75cca7
Change-Id: I0da58029bb854a7df7bc286a0bd6a22c61d5daee
2017-01-04 21:52:11 +00:00
Jeremy Joslin
cb3f75cca7
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am: 34d46ca94c
...
am: acbf592683
Change-Id: Ic488962a47eecea4c2ed522596549ef088bfbfc3
2017-01-04 21:47:42 +00:00
jackqdyulei
77880db705
Move textColor to style StatusBar.Expanded.Date
...
Bug: 32592245
Test: Manual - take an screenshot
Change-Id: Iebcd9046bfdfcebb06f51bbfa26b59684ba47699
2017-01-04 13:44:03 -08:00