OSDN Git Service
Rubin Xu [Fri, 10 Feb 2017 12:32:48 +0000 (12:32 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9 am:
f85a20702a
am:
060cde9802
Change-Id: Ic591b48e298823b46f8d1fc25b0e01a82cc263b5
Rubin Xu [Fri, 10 Feb 2017 12:28:56 +0000 (12:28 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9
am:
f85a20702a
Change-Id: I3861a5229fdb55f7dc7fd57e1706b34f9847d492
Rubin Xu [Fri, 10 Feb 2017 12:24:43 +0000 (12:24 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce
am:
72074e3ab9
Change-Id: I1cd4db65e0fe8c92628f22f94fe937cf64f2da04
Rubin Xu [Fri, 10 Feb 2017 12:20:18 +0000 (12:20 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293
am:
824c8284ce
Change-Id: If4dfa2d7af980c91ec3d3f8faa7e7f4a39350c82
Rubin Xu [Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
am:
42f2e80293
Change-Id: Ic167e10a205b5c8f9df81cd20a6f08359d3807f4
TreeHugger Robot [Fri, 10 Feb 2017 12:10:58 +0000 (12:10 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
Sooraj Sasindran [Fri, 10 Feb 2017 05:57:13 +0000 (05:57 +0000)]
Merge "Expose api to retrieve wakelock information per client" am:
8fbf6a29d0 am:
730c2d9c72 -s ours
am:
bae8d7a8c4 -s ours
Change-Id: I352f7dc305e64fa5e82bd3cccd9015732ab54504
Sooraj Sasindran [Fri, 10 Feb 2017 05:50:12 +0000 (05:50 +0000)]
Merge "Expose api to retrieve wakelock information per client" am:
8fbf6a29d0
am:
730c2d9c72 -s ours
Change-Id: I17a8dfcf0be71bcb667e70bab2834f0b7fd42b3c
Sooraj Sasindran [Fri, 10 Feb 2017 05:45:05 +0000 (05:45 +0000)]
Merge "Expose api to retrieve wakelock information per client"
am:
8fbf6a29d0
Change-Id: I1ca7d53b256333170b849cb1103c8b3ca0e76e0b
Sooraj Sasindran [Fri, 10 Feb 2017 05:38:40 +0000 (05:38 +0000)]
Merge "Expose api to retrieve wakelock information per client"
Sooraj Sasindran [Fri, 10 Feb 2017 03:03:38 +0000 (03:03 +0000)]
Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp
am:
cbbf530125
Change-Id: Id5ea5536246343a530f7579a31039421b3859de3
Sooraj Sasindran [Fri, 10 Feb 2017 02:58:40 +0000 (02:58 +0000)]
Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp
Andreas Gampe [Fri, 10 Feb 2017 01:03:15 +0000 (01:03 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am:
851afe56b8 am:
0e01cae667
am:
74acde1bc5
Change-Id: I40d67fcde4d9263d5c75d5c3f782a860dcff93f8
Andreas Gampe [Fri, 10 Feb 2017 00:58:42 +0000 (00:58 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am:
851afe56b8
am:
0e01cae667
Change-Id: Ifaa7595efaef554a47e05e030ccaf16a53a3bfce
Andreas Gampe [Fri, 10 Feb 2017 00:54:55 +0000 (00:54 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
am:
851afe56b8
Change-Id: Ib21530d511158635793f6180d53f193d1f1b0d95
Treehugger Robot [Fri, 10 Feb 2017 00:45:55 +0000 (00:45 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
Sooraj Sasindran [Mon, 18 Jul 2016 18:50:50 +0000 (11:50 -0700)]
Expose api to retrieve wakelock information per client
Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis
BUG=
31041780
Merged-In: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Selim Cinek [Fri, 10 Feb 2017 00:12:48 +0000 (00:12 +0000)]
Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev
am:
fbf2e0fb2c
Change-Id: Ib1c45af5ffea1d09e14ac5daac61a1046d2594a2
Selim Cinek [Fri, 10 Feb 2017 00:06:39 +0000 (00:06 +0000)]
Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev
Selim Cinek [Wed, 8 Feb 2017 20:51:59 +0000 (12:51 -0800)]
Fixed an issue where the emergency affordance didn't show
The state wheather the sim affordance was needed before was
loaded but not saved locally if it didn't change, so any
further requests would have the default values if it stayed
true.
Test: add india sim, go into airplane mode, reboot, see emergency
button
Fixes:
34370542
Change-Id: I9da1f5ca8025df6c2618ab467e937cf5cf9aa132
Sooraj Sasindran [Mon, 18 Jul 2016 18:50:50 +0000 (11:50 -0700)]
Expose api to retrieve wakelock information per client
Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis
BUG=
31041780
Merged-In: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Andreas Gampe [Wed, 8 Feb 2017 03:44:37 +0000 (19:44 -0800)]
Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit
Move methods where they belong.
Test: m
Test: Device boots
Merged-In: I805c6493078e960ff5b70d84dd93d2da6c7aa797
Change-Id: I805c6493078e960ff5b70d84dd93d2da6c7aa797
Android Build Merger (Role) [Thu, 9 Feb 2017 19:58:17 +0000 (19:58 +0000)]
Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94 am:
0265687aef" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Thu, 9 Feb 2017 19:58:11 +0000 (19:58 +0000)]
Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94 am:
89085b1593" into nyc-mr2-dev-plus-aosp
Greg Plesur [Thu, 9 Feb 2017 19:57:34 +0000 (19:57 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94
am:
0265687aef
Change-Id: I4cd33b9e688d90d8555b91c6547dbffe3099e0ae
Greg Plesur [Thu, 9 Feb 2017 19:57:28 +0000 (19:57 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94
am:
89085b1593
Change-Id: I50b457b5c6b5614d8b7c450b3ee6f7e375478194
Greg Plesur [Thu, 9 Feb 2017 19:56:28 +0000 (19:56 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am:
735b4dc0af
am:
968477129c
Change-Id: I623dd515c8eae81b4146d67c83007fc5213561a2
Greg Plesur [Thu, 9 Feb 2017 19:53:06 +0000 (19:53 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am:
735b4dc0af
am:
d78a0d21cb
Change-Id: I2e45ee1174cb287d8ce142ac4176148ceca5b248
Android Build Merger (Role) [Thu, 9 Feb 2017 19:50:56 +0000 (19:50 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours am:
966e600365 -s ours" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Thu, 9 Feb 2017 19:50:10 +0000 (19:50 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours
am:
966e600365 -s ours
Change-Id: Ia3e044a2c4e2c71505d9666fbe0f3a0552f5e14f
Greg Plesur [Thu, 9 Feb 2017 19:50:03 +0000 (19:50 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
am:
5659b15a94
Change-Id: I9bb30911e82207da68c3c5f088ef9efd1edf75ca
Greg Plesur [Thu, 9 Feb 2017 19:50:01 +0000 (19:50 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
am:
5659b15a94
Change-Id: I4bb6bc892ea172b7bda1ccc5dd840de128908223
Jeff Sharkey [Thu, 9 Feb 2017 19:50:01 +0000 (19:50 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours
am:
6d4af9c7f8 -s ours
Change-Id: I5e6c70874400b8239dfc4be958a002d964f3d204
Greg Plesur [Thu, 9 Feb 2017 19:49:58 +0000 (19:49 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
am:
735b4dc0af
Change-Id: Iafcc772f7f9c8111d26ebc48af67e104848e0885
Greg Plesur [Thu, 9 Feb 2017 19:49:58 +0000 (19:49 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
am:
735b4dc0af
Change-Id: I5c8ca6d0a63af83cde91c17d10a634469c726442
Jeff Sharkey [Thu, 9 Feb 2017 19:45:35 +0000 (19:45 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours
am:
31c7fa003d -s ours
Change-Id: I69602a5fbca3fd966c2bc8ab900b004308ce5f41
Jeff Sharkey [Thu, 9 Feb 2017 19:45:34 +0000 (19:45 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours
am:
31c7fa003d -s ours
Change-Id: Ia19b5ec4e496b8c87461081a23aef6335fe45725
Greg Plesur [Thu, 9 Feb 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
Jeff Sharkey [Thu, 9 Feb 2017 19:41:31 +0000 (19:41 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours
am:
b30169299b -s ours
Change-Id: Iac47439b256367683e44d09042996ad060c3c43d
Paul Duffin [Thu, 9 Feb 2017 19:37:26 +0000 (19:37 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am:
621ebe692f am:
a2c92b0b88
am:
c1a93884dc
Change-Id: Icce543cd86f83bff8c2e80bf7ef492d22c9cf2dc
Jeff Sharkey [Thu, 9 Feb 2017 19:37:23 +0000 (19:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
78f2e38a12 -s ours
Change-Id: I51385a2b84bfc4e0fa387ceb644be523ca55ced3
Paul Duffin [Thu, 9 Feb 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am:
621ebe692f
am:
a2c92b0b88
Change-Id: I605588603280ff0b4ebc1088c6c1f1c933c1e657
Paul Duffin [Thu, 9 Feb 2017 19:28:25 +0000 (19:28 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
am:
621ebe692f
Change-Id: Ifc6e7ac4f4a1bfc8c592d3b956ac985e9dd6e0ea
Paul Duffin [Thu, 9 Feb 2017 19:18:34 +0000 (19:18 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug:
33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
Merged-In: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Thu, 9 Feb 2017 17:50:15 +0000 (17:50 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd am:
99755cb458
am:
2b9ee48dae
Change-Id: I2d6e3e455df562561615c539474a8368c1371830
Android Build Merger (Role) [Thu, 9 Feb 2017 17:47:11 +0000 (17:47 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd am:
99755cb458 am:
0a2374524a" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Thu, 9 Feb 2017 17:46:20 +0000 (17:46 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd am:
99755cb458
am:
0a2374524a
Change-Id: Idab19b2a8cecbcaf3f1b63c3c4b0d0edb388f260
Jeff Sharkey [Thu, 9 Feb 2017 17:45:13 +0000 (17:45 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675 am:
14b308de91
am:
19fd8e3f06
Change-Id: Ied0e990e32f09ee2ac7bcb9846f3589d00038204
Jeff Sharkey [Thu, 9 Feb 2017 17:44:19 +0000 (17:44 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd
am:
99755cb458
Change-Id: Ia8c7e13f716b2007298b1773f00f338f665c7678
Jeff Sharkey [Thu, 9 Feb 2017 17:42:09 +0000 (17:42 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675 am:
14b308de91
am:
473b52eb62
Change-Id: Ic9afb12547b271de6e423601131605b0d930e10b
Jeff Sharkey [Thu, 9 Feb 2017 17:41:44 +0000 (17:41 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd
am:
99755cb458
Change-Id: I0380911f9607eed5f10a6c497f273ccbc67b3721
Jeff Sharkey [Thu, 9 Feb 2017 17:39:14 +0000 (17:39 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675
am:
14b308de91
Change-Id: I3ae65230058cd51b4efb06358dae35dce419c04b
Jeff Sharkey [Thu, 9 Feb 2017 17:37:47 +0000 (17:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e
am:
47656a3cbd
Change-Id: I5835528fe288b1ee117265d37e39fcfd0bbb301b
Jeff Sharkey [Thu, 9 Feb 2017 17:37:44 +0000 (17:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675
am:
14b308de91
Change-Id: I428dcaa5e44364d30a51392c224ad68a6e455e2b
Jeff Sharkey [Thu, 9 Feb 2017 17:33:51 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours
am:
be0dab477e
Change-Id: I28971e3707b67f7f3e4a566fd4f8e891d7e8823b
Jeff Sharkey [Thu, 9 Feb 2017 17:33:43 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
3eddf40675
Change-Id: Ied7f446ac2e539654b9f7d5e1ab7cce8aec7390e
Jeff Sharkey [Thu, 9 Feb 2017 17:28:44 +0000 (17:28 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
a78841ebd4 -s ours
Change-Id: Iac6ae6f87a60318e4557b238c196c3b0627e95ab
Greg Plesur [Thu, 9 Feb 2017 16:06:24 +0000 (11:06 -0500)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
BUG:
34824902
Change-Id: I95fbe0a352c48a3fff5af57b91325901a16d3d89
Paul Duffin [Thu, 9 Feb 2017 14:47:53 +0000 (14:47 +0000)]
Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
This partially reverts commit
3e5fbca0c57742f28f5c7e6bda6c3500b9471b47.
Bug:
35187548
Bug:
30188076
Bug:
35089332
Test: make checkbuild
Change-Id: I7ab4279aab604e3d56003b0a59867948aebabd28
Bill Yi [Thu, 9 Feb 2017 11:36:58 +0000 (11:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
740ddc38bc -s ours
Change-Id: I967c516afc18ee97b2790cedd4747e8f93c57368
Bill Yi [Thu, 9 Feb 2017 11:36:52 +0000 (11:36 +0000)]
Import translations. DO NOT MERGE
am:
d0bc779893 -s ours
Change-Id: I06ce169e1bebd7c4543090b2ba0c3b119121d954
TreeHugger Robot [Thu, 9 Feb 2017 11:28:22 +0000 (11:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 9 Feb 2017 09:57:11 +0000 (01:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I751a4937bc2753f50aaf1177868c9199e8d201ec
Auto-generated-cl: translation import
Martijn Coenen [Thu, 9 Feb 2017 08:51:12 +0000 (08:51 +0000)]
Merge "Don't generate and send reply object in oneway calls." am:
60f11f3d16 am:
14cc9c291e
am:
53e5640589
Change-Id: I3ee89a098a2913f5ce7f4c357b9c5c86f4bd4b15
Martijn Coenen [Thu, 9 Feb 2017 08:47:12 +0000 (08:47 +0000)]
Merge "Don't generate and send reply object in oneway calls." am:
60f11f3d16
am:
14cc9c291e
Change-Id: I415b895812703aa8ec290234fb71d1d0a89aece9
Martijn Coenen [Thu, 9 Feb 2017 08:42:27 +0000 (08:42 +0000)]
Merge "Don't generate and send reply object in oneway calls."
am:
60f11f3d16
Change-Id: I790576158c1d2cae6b746f3b5d0dbecad750629a
Martijn Coenen [Thu, 9 Feb 2017 08:37:29 +0000 (08:37 +0000)]
Merge "Don't generate and send reply object in oneway calls."
Martijn Coenen [Wed, 8 Feb 2017 09:22:28 +0000 (10:22 +0100)]
Don't generate and send reply object in oneway calls.
Bug:
35044790
Test: hidl_test, hidl_test_java
Change-Id: Iae8f5b071f89d2af5ca15360c6a1a0fbf8040e77
Android Build Merger (Role) [Wed, 8 Feb 2017 23:54:08 +0000 (23:54 +0000)]
Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83 am:
ddec36e31a" into nyc-mr2-dev-plus-aosp
Greg Plesur [Wed, 8 Feb 2017 23:53:29 +0000 (23:53 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83
am:
ddec36e31a
Change-Id: Id36db178cad26adba0a43370af2f4f6cdd1a0443
Android Build Merger (Role) [Wed, 8 Feb 2017 23:53:15 +0000 (23:53 +0000)]
Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83 am:
58fce5386b" into nyc-mr2-dev-plus-aosp
Greg Plesur [Wed, 8 Feb 2017 23:52:35 +0000 (23:52 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() am:
c7b18342ea
am:
66af3515de
Change-Id: I6e97c2c08b8773c9b0f3a472c8f679cc23e8e365
Greg Plesur [Wed, 8 Feb 2017 23:52:32 +0000 (23:52 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83
am:
58fce5386b
Change-Id: I784fc51c541da12056f7c47810d3b222f40dea04
Greg Plesur [Wed, 8 Feb 2017 23:49:32 +0000 (23:49 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() am:
c7b18342ea
am:
b6323817db
Change-Id: I5f3b6935af32ba94fef35d8db573d75925eee434
Greg Plesur [Wed, 8 Feb 2017 23:44:34 +0000 (23:44 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
am:
8a2ea2cf83
Change-Id: Ie25c9bfa82ccffc58b68c13b515d7f556d955289
Greg Plesur [Wed, 8 Feb 2017 23:44:27 +0000 (23:44 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
am:
c7b18342ea
Change-Id: I1969d32950057ecacc03e8c5d00ad185fb627044
Greg Plesur [Wed, 8 Feb 2017 23:44:17 +0000 (23:44 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
am:
8a2ea2cf83
Change-Id: I9c2c3d822023277aada4685a11f4b272585550ea
Greg Plesur [Wed, 8 Feb 2017 23:44:13 +0000 (23:44 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
am:
c7b18342ea
Change-Id: I692fee4165de9a274d8eb8f0deaf49762974bb22
Andrew Sapperstein [Wed, 8 Feb 2017 23:37:26 +0000 (23:37 +0000)]
Merge "Add additional logging for temperature readings." into nyc-mr2-dev
am:
759e1c5219
Change-Id: Id598870f05298933d4ef053e0ea3b37113e01f65
Andrew Sapperstein [Wed, 8 Feb 2017 23:37:19 +0000 (23:37 +0000)]
Add additional logging for temperature readings.
am:
4cfe56709b
Change-Id: I57547d77357deaa663c482937f26890930dc8845
TreeHugger Robot [Wed, 8 Feb 2017 23:36:06 +0000 (23:36 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
TreeHugger Robot [Wed, 8 Feb 2017 23:31:13 +0000 (23:31 +0000)]
Merge "Add additional logging for temperature readings." into nyc-mr2-dev
Tyler Gunn [Wed, 8 Feb 2017 22:05:45 +0000 (22:05 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider." am:
c164b159f8 am:
e55b11573e
am:
998655f80e
Change-Id: I01c5d8c15ce9377f126fc7268bd1a8ecee602dc8
Tyler Gunn [Wed, 8 Feb 2017 22:01:07 +0000 (22:01 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider." am:
c164b159f8
am:
e55b11573e
Change-Id: Iffef42c4050bbda451e9cd99cb90589060b105bd
Tyler Gunn [Wed, 8 Feb 2017 21:56:39 +0000 (21:56 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider."
am:
c164b159f8
Change-Id: I3abbb1de951f65c226a6849f34946880e9f650ff
Treehugger Robot [Wed, 8 Feb 2017 21:46:43 +0000 (21:46 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider."
Greg Plesur [Wed, 8 Feb 2017 19:57:34 +0000 (14:57 -0500)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
BUG:
34824902
Change-Id: I49d4d7043829862e1abacb3f400a6690f454d6c0
Roshan Pius [Wed, 8 Feb 2017 21:08:41 +0000 (21:08 +0000)]
Merge changes If970d851,I5bd11574 am:
3c054697fc am:
65eef762a9
am:
6dd6ba628b
Change-Id: I2e150126a816314c057e31ec5902088814890421
Roshan Pius [Wed, 8 Feb 2017 21:07:48 +0000 (21:07 +0000)]
WifiManager: API upates for O am:
fb441f5009 am:
aabb1c7ecf
am:
02bf13a6c9
Change-Id: I75883c53958f2495a3e906a8940ef2a7ced98ec5
Roshan Pius [Wed, 8 Feb 2017 21:06:45 +0000 (21:06 +0000)]
WifiConfiguration: Remove priority field am:
45491113ed am:
51641c20b2
am:
707ced526f
Change-Id: I294a36db16c8e079cae5b748421dccfbb50dadc4
Roshan Pius [Wed, 8 Feb 2017 21:01:12 +0000 (21:01 +0000)]
Merge changes If970d851,I5bd11574 am:
3c054697fc
am:
65eef762a9
Change-Id: I02a05b3b327b79f9b344db0a3b5d5c96b49bcd5a
Roshan Pius [Wed, 8 Feb 2017 21:00:24 +0000 (21:00 +0000)]
WifiManager: API upates for O am:
fb441f5009
am:
aabb1c7ecf
Change-Id: I0ff9ca3f59b4d10e41fd2d3a38329cc7f71844cf
Roshan Pius [Wed, 8 Feb 2017 20:59:17 +0000 (20:59 +0000)]
WifiConfiguration: Remove priority field am:
45491113ed
am:
51641c20b2
Change-Id: I820420e7c38aac3ddff2441cf40dc367b483c0ff
Roshan Pius [Wed, 8 Feb 2017 20:50:02 +0000 (20:50 +0000)]
Merge changes If970d851,I5bd11574
am:
3c054697fc
Change-Id: I2794ca0e7dfaaf10a47862a4646483772a530b5e
Roshan Pius [Wed, 8 Feb 2017 20:49:57 +0000 (20:49 +0000)]
WifiManager: API upates for O
am:
fb441f5009
Change-Id: I00207a5219d97c49b1231610ad78f7ec4cbe0b96
Roshan Pius [Wed, 8 Feb 2017 20:49:13 +0000 (20:49 +0000)]
WifiConfiguration: Remove priority field
am:
45491113ed
Change-Id: I2dd6f7f7b1912259b646a715049164b48334d5b4
Treehugger Robot [Wed, 8 Feb 2017 20:38:12 +0000 (20:38 +0000)]
Merge changes If970d851,I5bd11574
* changes:
WifiManager: API upates for O
WifiConfiguration: Remove priority field
songjinshi [Wed, 8 Feb 2017 20:28:48 +0000 (20:28 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am:
b6f7a85b85 am:
ec69bd0aa3
am:
36bcc913f7
Change-Id: Icf40ff98196d885e6974eb679532064b30bc68cd
songjinshi [Wed, 8 Feb 2017 20:22:26 +0000 (20:22 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am:
b6f7a85b85
am:
ec69bd0aa3
Change-Id: Idfe455733dd12bf82c31cb505681e4fa89d57bfb
OSDN Git Service
