OSDN Git Service
TreeHugger Robot [Thu, 5 Jan 2017 17:26:35 +0000 (17:26 +0000)]
Merge "Remove two unused filters on PowerUI receiver."
TreeHugger Robot [Thu, 5 Jan 2017 17:08:22 +0000 (17:08 +0000)]
Merge "Decode images to sRGB, premultiply based on framework define"
Matt Sarett [Wed, 21 Dec 2016 17:17:17 +0000 (12:17 -0500)]
Decode images to sRGB, premultiply based on framework define
This reenables color conversion to sRGB at decode time.
Use the value ANDROID_LINEAR_BLENDING_ENABLED to decide
whether to use the codec's linear premultiply or manually
perform a legacy premultiply.
Test: Demonstrated that legacy premultiply is still
faster than the linear premultiply. So the performance
of the two pass approach (decode, then premultiply)
is acceptable. Skia tests both of these decoding modes.
BUG:
33741991
BUG:
8860389
BUG:
24279600
Change-Id: Idea0f359565bd8c7c3ba06e77a897173677db1c6
Ben Murdoch [Thu, 5 Jan 2017 14:57:43 +0000 (14:57 +0000)]
Remove two unused filters on PowerUI receiver.
Removing some dead code.
Test: None, remove dead code.
Change-Id: Ibcb31797dc1551f7fed540843afc58cb4eb7d077
Nicolas Prévot [Thu, 5 Jan 2017 14:54:41 +0000 (14:54 +0000)]
Merge "Make disallow add/remove managed profile restriction not global."
Nicolas Prevot [Thu, 5 Jan 2017 10:29:34 +0000 (10:29 +0000)]
Make disallow add/remove managed profile restriction not global.
Otherwise: if the DO sets remove managed profile user restriction:
the profile owner of a managed profile cannot remove this managed
profile.
BUG:
33854430
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I90b2028ea627a2073298bf9ef3c07b4fdf8d13a1
Bill Yi [Thu, 5 Jan 2017 10:20:58 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
20088b3e31 -s ours
am:
2b1a252a5c -s ours
Change-Id: Id3b30de9325aa23a3c39f355d1eac3976f0637ad
Bill Yi [Thu, 5 Jan 2017 10:19:57 +0000 (10:19 +0000)]
Import translations. DO NOT MERGE am:
319605a34b -s ours
am:
3eb96fe7e8 -s ours
Change-Id: I79dbc24642a18df97d795406b509d0fd6a450d27
Bill Yi [Thu, 5 Jan 2017 10:18:53 +0000 (10:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9e8b15b953 -s ours
am:
c125e0ef17 -s ours
Change-Id: I31f30e18d69a1c53aead7d735b69d41a77bdc3df
Bill Yi [Thu, 5 Jan 2017 10:17:45 +0000 (10:17 +0000)]
Import translations. DO NOT MERGE am:
a51dba4ca5 -s ours
am:
991dedc5cd -s ours
Change-Id: Ic849334e45179870002589f4c92c327a49ba7709
Martijn Coenen [Thu, 5 Jan 2017 10:13:42 +0000 (10:13 +0000)]
Merge "Update GNSS to use elided interface return values."
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
Martijn Coenen [Wed, 4 Jan 2017 11:57:47 +0000 (12:57 +0100)]
Update GNSS to use elided interface return values.
Test: mma
Bug:
31830743
Change-Id: I315723bc50f682d90c7afd75357a10ed5d4db03f
TreeHugger Robot [Thu, 5 Jan 2017 10:12:21 +0000 (10:12 +0000)]
Merge "Import translations. DO NOT MERGE"
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:09:56 +0000 (10:09 +0000)]
Merge "Import translations. DO NOT MERGE"
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 10:04:07 +0000 (10:04 +0000)]
Merge "Callback elision for HIDL interfaces." am:
33bd8a97b3 am:
4369507dcb am:
e358f83640
am:
5ea3e4cbb2
Change-Id: I7067ed2c95a526025336252f167a3d438c2ee486
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
Narayan Kamath [Thu, 5 Jan 2017 09:55:35 +0000 (09:55 +0000)]
Merge "PackageParser: Add serialization mechanism for parse results."
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
Robert Sesek [Thu, 5 Jan 2017 09:50:05 +0000 (09:50 +0000)]
Merge "Synchronize access to WebViewZygote." am:
fd6f631de5 am:
c8111e07d0 am:
2c3818158a
am:
8be4cfc638
Change-Id: I31e7f0e75173e79e42ec9ce8703e7fd40f39c31a
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 08:04:26 +0000 (08:04 +0000)]
Merge "Integration of the LDAC codec for A2DP source" am:
3c050268f0 am:
bb8f1cd92b am:
7d14914239
am:
01be004c72
Change-Id: Ia0bdac1d25993519e85f962e7b7624ae5740e685
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"
Bill Yi [Thu, 5 Jan 2017 07:01:05 +0000 (23:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I54ff61c5cb2420451db6d9ac2eb58a65f7b1986d
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 5 Jan 2017 05:07:51 +0000 (05:07 +0000)]
Merge changes from topic 'am-
3372882dede549118c8d455a558b1c53'
* changes:
Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev am:
0c7631f8b0 am:
2380d82941
Added alert icon to high temp dialog. am:
bd4eeb7259 am:
b54a792429
Add VR mode check for thermal notification am:
d51ac7322e am:
a477ead31c
Show notif when device reaches throttling temp am:
67e97053c5 am:
104c66d71e -s ours
Andrew Sapperstein [Thu, 5 Jan 2017 05:06:04 +0000 (05:06 +0000)]
Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev am:
0c7631f8b0
am:
2380d82941
Change-Id: Ia6bb473054e47801ea5735b9b88237c96f609da0
Andrew Sapperstein [Thu, 5 Jan 2017 05:05:08 +0000 (05:05 +0000)]
Added alert icon to high temp dialog. am:
bd4eeb7259
am:
b54a792429
Change-Id: Iab6f4e3542eab2bb086de5223e91b2395d5e6c32
Andrew Sapperstein [Thu, 5 Jan 2017 05:04:15 +0000 (05:04 +0000)]
Add VR mode check for thermal notification am:
d51ac7322e
am:
a477ead31c
Change-Id: I02d2e98462e32e2d6d8b288954d9915f8312cc10
Tomasz Mikolajewski [Thu, 5 Jan 2017 05:03:29 +0000 (05:03 +0000)]
Merge "Update API documentation about virtual files."
Andrew Sapperstein [Thu, 5 Jan 2017 05:03:10 +0000 (05:03 +0000)]
Show notif when device reaches throttling temp am:
67e97053c5
am:
104c66d71e -s ours
Change-Id: Icf4f2551926f34ef6112e737aaea1f9297f0ae75
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
TreeHugger Robot [Thu, 5 Jan 2017 02:36:04 +0000 (02:36 +0000)]
Merge "Warn makeDefault ignored for system settings only if true"
Pavlin Radoslavov [Thu, 5 Jan 2017 02:17:35 +0000 (02:17 +0000)]
Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am:
5242acbd0b am:
a750c90ac1 am:
5aaa985e97
am:
546866988a
Change-Id: Id2eb6fc928098fffdf1be85bc708efa8a1b7a339
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"
Svetoslav Ganov [Thu, 5 Jan 2017 01:08:15 +0000 (17:08 -0800)]
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
Bill Yi [Thu, 5 Jan 2017 01:07:41 +0000 (17:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1f02709e81ed68998fb070d5a3f970ff4f645bbe
Auto-generated-cl: translation import
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)
Amith Yamasani [Thu, 5 Jan 2017 00:32:06 +0000 (00:32 +0000)]
Merge "Track background sensor usage"
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
Steven Moreland [Wed, 4 Jan 2017 23:46:51 +0000 (23:46 +0000)]
Merge "Return<*> getStatus().isOk() -> isOk()"
Jeremy Joslin [Wed, 4 Jan 2017 23:25:17 +0000 (23:25 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission." am:
a54d76a81f am:
84fd1e1120 am:
195ac87578
am:
afc31dfe0f -s ours
Change-Id: I609bbca2e676837f2433e6d8ee55b0d8f863c865
Julius D'souza [Wed, 4 Jan 2017 23:20:43 +0000 (23:20 +0000)]
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
Julius D'souza [Wed, 4 Jan 2017 23:20:36 +0000 (23:20 +0000)]
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
Jeremy Joslin [Wed, 4 Jan 2017 23:20:17 +0000 (23:20 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission." am:
a54d76a81f am:
84fd1e1120
am:
195ac87578
Change-Id: I1f6de46c521a232c1a218e3e6b50883ea6e150b0
Julius D'souza [Wed, 4 Jan 2017 23:18:54 +0000 (23:18 +0000)]
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
Julius D'souza [Wed, 4 Jan 2017 23:18:50 +0000 (23:18 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23 am:
54a0faa37b
am:
7e8cbefcf1 -s ours
Change-Id: I18b0193d947b173076f9d2662f943d43a9670b90
Julius D'souza [Wed, 4 Jan 2017 23:17:44 +0000 (23:17 +0000)]
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
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
Julius D'souza [Wed, 4 Jan 2017 23:16:36 +0000 (23:16 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23 am:
8366e50043
am:
d1d68b6597 -s ours
Change-Id: Ifd30fb62fa65562962bc3671a22716a06574c6f3
Android Build Merger (Role) [Wed, 4 Jan 2017 23:13:29 +0000 (23:13 +0000)]
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
Julius D'souza [Wed, 4 Jan 2017 23:12:50 +0000 (23:12 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am:
b60eb1a854
am:
d559cb8124
Change-Id: Ia17370de250385171f6ff6b93eb3a59a4347f5a0
Android Build Merger (Role) [Wed, 4 Jan 2017 23:12:30 +0000 (23:12 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23 am:
54a0faa37b" into nyc-mr2-dev-plus-aosp
Julius D'souza [Wed, 4 Jan 2017 23:11:51 +0000 (23:11 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23
am:
54a0faa37b
Change-Id: I30a13868896713fe71697608f200dad264b5d4c4
Julius D'souza [Wed, 4 Jan 2017 23:11:46 +0000 (23:11 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am:
b60eb1a854
am:
da8462aa5b
Change-Id: I537e98e43c61868d156439383ee21a06b3dc2b41
Julius D'souza [Wed, 4 Jan 2017 23:10:46 +0000 (23:10 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23
am:
8366e50043
Change-Id: I40341da2fe7c3e8e5129e647666eaf1860a2e522
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
Android Build Merger (Role) [Wed, 4 Jan 2017 23:09:30 +0000 (23:09 +0000)]
Merge "Merge "Fix NetworkScoreServiceTest.testSystemRunning." am:
5b4aec1dc6 am:
01828eb244 am:
b68823cab8 am:
0872235d4c -s ours"
Jeremy Joslin [Wed, 4 Jan 2017 23:08:46 +0000 (23:08 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am:
5b4aec1dc6 am:
01828eb244 am:
b68823cab8
am:
0872235d4c -s ours
Change-Id: I05cc72e28a691b3b8f92fa06706e6e3c189ec1bd
Allen Hair [Wed, 4 Jan 2017 23:08:25 +0000 (23:08 +0000)]
Merge "Provide a mechanism for dumping code coverage for the system server."
TreeHugger Robot [Wed, 4 Jan 2017 23:08:12 +0000 (23:08 +0000)]
Merge "Fixing return type check when expanding via menu."
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:45 +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: I86ef53eec2bbeff07c52e079e925719c3923941c
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
Julius D'souza [Wed, 4 Jan 2017 23:05:41 +0000 (23:05 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode.
am:
bbfdf7ad23
Change-Id: Ic6b72d6b72df516d4cec3b7a38e12366f7e334a1
Treehugger Robot [Wed, 4 Jan 2017 23:04:46 +0000 (23:04 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission."
Jeremy Joslin [Wed, 4 Jan 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am:
5b4aec1dc6 am:
01828eb244
am:
b68823cab8
Change-Id: I19f5c7179a489e992356f141314582abc803ad2e
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."
TreeHugger Robot [Wed, 4 Jan 2017 22:21:12 +0000 (22:21 +0000)]
Merge "Add notifications for incorrect plugin versions"
Makoto Onuki [Wed, 4 Jan 2017 21:59:46 +0000 (21:59 +0000)]
Merge "Follow-up to I1e4dd97"
Jeremy Joslin [Wed, 4 Jan 2017 21:57:11 +0000 (21:57 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am:
34d46ca94c am:
acbf592683 am:
cb3f75cca7
am:
6a848fdf09 -s ours
Change-Id: I5f94537db2313fab72d363c9e4f78e9ac3379a67
Jeremy Joslin [Wed, 4 Jan 2017 21:52:11 +0000 (21:52 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am:
34d46ca94c am:
acbf592683
am:
cb3f75cca7
Change-Id: I0da58029bb854a7df7bc286a0bd6a22c61d5daee
OSDN Git Service
