OSDN Git Service
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
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
Erik Wolsheimer [Wed, 8 Feb 2017 20:19:41 +0000 (20:19 +0000)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am:
84aa5a864f
am:
7600235339
Change-Id: I04996cdf09f06dd4267693eea2ed1ee75239ea90
Paul Duffin [Wed, 8 Feb 2017 20:18:34 +0000 (20:18 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am:
78a20be77a am:
9e99b9ee45
am:
9250814fd2
Change-Id: Ifd924bdb62102657bf0c6d4b07ab919cf0f96c0c
songjinshi [Wed, 8 Feb 2017 20:18:13 +0000 (20:18 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
am:
b6f7a85b85
Change-Id: Iea79127b2c7d823844406f677a98fea54043f4cb
Paul Lawrence [Wed, 8 Feb 2017 20:17:35 +0000 (20:17 +0000)]
Merge "Expand seccomp whitelist" am:
fd77a331eb am:
1201ce98dd
am:
e9799155c9
Change-Id: If9652ab58b37d2011251345bf5e85afdb3bac4d6
Tyler Gunn [Wed, 8 Feb 2017 20:16:15 +0000 (20:16 +0000)]
Merge "Add support for wait-on-handlers command." am:
da6d683caa am:
a3b4985ad4
am:
3e086be542
Change-Id: Ib704d3d5c67b987e4daa375c6ca7f2b1a5d8fdbb
Treehugger Robot [Wed, 8 Feb 2017 20:11:22 +0000 (20:11 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
Erik Wolsheimer [Wed, 8 Feb 2017 20:01:24 +0000 (20:01 +0000)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am:
84aa5a864f
am:
36008dd6bd
Change-Id: Ia7e636049d4a3a0490013a54ffb90d7f4f534949
Erik Wolsheimer [Wed, 8 Feb 2017 19:46:50 +0000 (19:46 +0000)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
am:
84aa5a864f
Change-Id: I9b5c9b25a9bd4ad5b51f7d0c7004c7275ce1e460
Erik Wolsheimer [Wed, 8 Feb 2017 19:46:49 +0000 (19:46 +0000)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
am:
84aa5a864f
Change-Id: Ibcbaba3bb406e07f97561bc87916f6891fc25b74
Paul Duffin [Wed, 8 Feb 2017 18:30:17 +0000 (18:30 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am:
78a20be77a
am:
9e99b9ee45
Change-Id: I289950cff0cdc6b5ad301936c7b55eadee5fd0f8
Paul Lawrence [Wed, 8 Feb 2017 18:29:08 +0000 (18:29 +0000)]
Merge "Expand seccomp whitelist" am:
fd77a331eb
am:
1201ce98dd
Change-Id: I87fa2d6962ebb288c8c79488cfaf73485fca7bbf
Tyler Gunn [Wed, 8 Feb 2017 18:27:37 +0000 (18:27 +0000)]
Merge "Add support for wait-on-handlers command." am:
da6d683caa
am:
a3b4985ad4
Change-Id: I80669c442c53a49687974851dccf0c9c9b500e96
Paul Duffin [Wed, 8 Feb 2017 18:14:50 +0000 (18:14 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
am:
78a20be77a
Change-Id: I6f32dc27f70e4c22d25ec6bd2eec715700ebbd89
Paul Lawrence [Wed, 8 Feb 2017 18:10:28 +0000 (18:10 +0000)]
Merge "Expand seccomp whitelist"
am:
fd77a331eb
Change-Id: I824c984b907e43248d6eba6259f31f4aab7d64db
Paul Duffin [Wed, 8 Feb 2017 18:06:07 +0000 (18:06 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
Paul Lawrence [Wed, 8 Feb 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Expand seccomp whitelist"
Tyler Gunn [Wed, 8 Feb 2017 17:17:30 +0000 (17:17 +0000)]
Merge "Add support for wait-on-handlers command."
am:
da6d683caa
Change-Id: I71bee35ec1bf6ff4100f6515ea87dcc89312a689
Roshan Pius [Fri, 3 Feb 2017 20:51:40 +0000 (12:51 -0800)]
WifiManager: API upates for O
Deprecate the following API's:
1. pingSupplicant() - We don't want apps trying to figure out if
wpa_supplicant is running or not. It should not be something that
apps need to know.
2. saveConfiguration() - No longer needed, we automatically persist data
when needed.
Other changes:
1. Reworded the docstrings to remove direct reference to wpa_supplicant
for network configuration related API's.
2. We no longer allow apps to modfiy network configuration of other
apps. Added a docstring explaining that in the 3 modify API's.
3. Changed the wording of enableNetwork's |disableOthers| flag.
Bug:
31146757
Test: make update-api
Change-Id: If970d85146de3532072191cb2b7ecb0d5adb2774
Roshan Pius [Tue, 24 Jan 2017 22:58:34 +0000 (14:58 -0800)]
WifiConfiguration: Remove priority field
This field is no longer used anywhere within wifi framework and hence
removing this from public API.
Bug:
28341078
Test: make update-api
Change-Id: I5bd115742ca610735b00c20f2ffab7590c5f3256
Paul Lawrence [Wed, 8 Feb 2017 16:26:56 +0000 (08:26 -0800)]
Expand seccomp whitelist
Bug:
35059702
Test: Device boots, app no longer produces SIGSYS failures
Change-Id: I020b625bd7529ad9806c0b23a1ca70bc87906dad
Tyler Gunn [Wed, 8 Feb 2017 16:09:09 +0000 (16:09 +0000)]
Merge "Add support for wait-on-handlers command."
Paul Duffin [Wed, 8 Feb 2017 11:39:15 +0000 (11:39 +0000)]
Merge "Fix problem with JavaDoc" am:
8f33fcdc4b am:
4929aafc1d
am:
290274df0d
Change-Id: I4e9ef88d6aa6c69a35b6b995ebf0b90214aef79d
Paul Duffin [Wed, 8 Feb 2017 11:35:19 +0000 (11:35 +0000)]
Merge "Fix problem with JavaDoc" am:
8f33fcdc4b
am:
4929aafc1d
Change-Id: I08c9f20c34a2952105854d107b442884dba220b1
Paul Duffin [Wed, 8 Feb 2017 11:31:15 +0000 (11:31 +0000)]
Merge "Fix problem with JavaDoc"
am:
8f33fcdc4b
Change-Id: I25fd01b35a2c1299304401a1333f737ee9252317
Treehugger Robot [Wed, 8 Feb 2017 11:21:28 +0000 (11:21 +0000)]
Merge "Fix problem with JavaDoc"
Manu Cornet [Wed, 8 Feb 2017 10:46:16 +0000 (10:46 +0000)]
2D Recents: Slightly darken header to differentiate from thumbnail
am:
017a3acc3c
Change-Id: I3eba04869c2cc0095f7f0f43855aeba3bc595759
Paul Duffin [Wed, 8 Feb 2017 09:14:46 +0000 (09:14 +0000)]
Fix problem with JavaDoc
Test: make checkbuild
Change-Id: Ia321e0a57ff63aa62adee16d611c063a22807176
Manu Cornet [Tue, 7 Feb 2017 01:47:42 +0000 (17:47 -0800)]
2D Recents: Slightly darken header to differentiate from thumbnail
Bug:
34771148
Test: Locally on sw600dp device, sent screenshot to UX to confirm
Change-Id: I74282c6ed81d3b48d554f9acf55d4fafca2c73f4
Erik Wolsheimer [Wed, 8 Feb 2017 04:54:20 +0000 (20:54 -0800)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
BUG:
34312358
Change-Id: I9b303d443b082bba8b440e6e1ef68b050a970386
Shreyas Basarge [Wed, 8 Feb 2017 00:58:52 +0000 (00:58 +0000)]
Merge "Fix requiresCharging false value ignored issue" into nyc-mr2-dev
am:
f47b9cf1c1
Change-Id: Id1488228df87b0facf59f8ad24054ea09f1e94c0
Shreyas Basarge [Wed, 8 Feb 2017 00:58:47 +0000 (00:58 +0000)]
Fix requiresCharging false value ignored issue
am:
e33c3c81af
Change-Id: Ia96915b00e274ed6c7c8fdaea46ee5a0ba83bdcb
Shreyas Basarge [Wed, 8 Feb 2017 00:49:55 +0000 (00:49 +0000)]
Merge "Fix requiresCharging false value ignored issue" into nyc-mr2-dev
Jiaquan He [Wed, 8 Feb 2017 00:06:29 +0000 (00:06 +0000)]
Merge "2D Recents: Fix the thumbnail radius." into nyc-mr2-dev
am:
85016506c6
Change-Id: Id0a029ed2120e7c040332a0e6fb46b05c5c4b947
Jiaquan He [Wed, 8 Feb 2017 00:06:22 +0000 (00:06 +0000)]
2D Recents: Fix the thumbnail radius.
am:
083c6fbbd0
Change-Id: I93ff98979bcffa0c3724807ec9caac8f39025fa6
TreeHugger Robot [Wed, 8 Feb 2017 00:00:22 +0000 (00:00 +0000)]
Merge "2D Recents: Fix the thumbnail radius." into nyc-mr2-dev
Tyler Gunn [Wed, 30 Nov 2016 23:14:26 +0000 (15:14 -0800)]
Change prototype for "setCamera" in IMS VideoProvider.
Changing "setCamera" prototype to include the uid.
Test: Unit test, manual test.
Bug:
32747443
Merged-In: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
Change-Id: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
Peter Qiu [Tue, 7 Feb 2017 23:54:40 +0000 (23:54 +0000)]
Merge changes from topic 'Passpoint API Rename' am:
93d66c83cf am:
322c9a9ec5
am:
1c8845c6b0
Change-Id: Id22714a3ab72ce5a0b5e1dcd294a7ef7db33da57
Peter Qiu [Tue, 7 Feb 2017 23:49:35 +0000 (23:49 +0000)]
hotspot2: expose Passpoint APIs as public am:
bffe405e1f am:
b898025e8c
am:
1a8cb5dfec
Change-Id: I75201e7f464e7228458b62d9f79565097b602752
Peter Qiu [Tue, 7 Feb 2017 23:48:42 +0000 (23:48 +0000)]
hotspot2: fix class/function/variable names to comply with API guideline am:
da8a67e8a6 am:
7fec249699
am:
57375308dc
Change-Id: I897cd2c051d7c4b3b5165114d975f5e7398f4556
Peter Qiu [Tue, 7 Feb 2017 23:47:46 +0000 (23:47 +0000)]
Merge changes from topic 'Passpoint API Rename' am:
93d66c83cf
am:
322c9a9ec5
Change-Id: I91231f6c6ad804997071f81f0d3998f1d8231a73
Peter Qiu [Tue, 7 Feb 2017 23:47:32 +0000 (23:47 +0000)]
hotspot2: rename classes to comply with API guideline am:
a77809766c am:
c4f4a1ac9e
am:
9bddb8ccd8
Change-Id: I78d0edc46b89683832f26061f97f3ebebe245f93
Peter Qiu [Tue, 7 Feb 2017 23:40:45 +0000 (23:40 +0000)]
hotspot2: expose Passpoint APIs as public am:
bffe405e1f
am:
b898025e8c
Change-Id: I10d77f87722d5b21004df1394b1b5d9e82b78976
Peter Qiu [Tue, 7 Feb 2017 23:39:50 +0000 (23:39 +0000)]
hotspot2: fix class/function/variable names to comply with API guideline am:
da8a67e8a6
am:
7fec249699
Change-Id: Ib37832f30b5174f52e71ef2e3f796c669ba7bda9
Peter Qiu [Tue, 7 Feb 2017 23:38:36 +0000 (23:38 +0000)]
hotspot2: rename classes to comply with API guideline am:
a77809766c
am:
c4f4a1ac9e
Change-Id: I00cda97fa573cb7dcb3ac8501ead6b34b91f1b1e
Peter Qiu [Tue, 7 Feb 2017 23:38:35 +0000 (23:38 +0000)]
Merge changes from topic 'Passpoint API Rename'
am:
93d66c83cf
Change-Id: Ibff6d79c8ca51b760932909e89b21e8c843acc89
Peter Qiu [Tue, 7 Feb 2017 23:32:08 +0000 (23:32 +0000)]
hotspot2: expose Passpoint APIs as public
am:
bffe405e1f
Change-Id: I86065439f5902b6ce7b0ceec3f295e14f0dff47f
Peter Qiu [Tue, 7 Feb 2017 23:31:02 +0000 (23:31 +0000)]
hotspot2: fix class/function/variable names to comply with API guideline
am:
da8a67e8a6
Change-Id: I48f7b3ab747c0323aec5208c7a0afa123ff68729
Peter Qiu [Tue, 7 Feb 2017 23:30:19 +0000 (23:30 +0000)]
hotspot2: rename classes to comply with API guideline
am:
a77809766c
Change-Id: Iaaf34a5ec744775e472d1b3eb8673ebf610b1c61
Treehugger Robot [Tue, 7 Feb 2017 23:25:02 +0000 (23:25 +0000)]
Merge changes from topic 'Passpoint API Rename'
* changes:
hotspot2: expose Passpoint APIs as public
hotspot2: fix class/function/variable names to comply with API guideline
hotspot2: rename classes to comply with API guideline
Paul Lawrence [Tue, 7 Feb 2017 23:08:00 +0000 (23:08 +0000)]
Merge "Expand seccomp whitelist" am:
10e7aed13f am:
0ab0d47516
am:
53e6c94c0b
Change-Id: I4f6e9e4c705505861c7b61dcc2c36f3d997a402d
Paul Lawrence [Tue, 7 Feb 2017 23:03:32 +0000 (23:03 +0000)]
Merge "Expand seccomp whitelist" am:
10e7aed13f
am:
0ab0d47516
Change-Id: Id7512df1f0df56f73352c82a3ad55eb5360ebd91
Paul Lawrence [Tue, 7 Feb 2017 22:59:34 +0000 (22:59 +0000)]
Merge "Expand seccomp whitelist"
am:
10e7aed13f
Change-Id: I8060b31a8ac20ddd77b7139c5a3bbd8d146dbc27
Paul Lawrence [Tue, 7 Feb 2017 22:50:43 +0000 (22:50 +0000)]
Merge "Expand seccomp whitelist"
Brad Ebinger [Tue, 7 Feb 2017 22:41:58 +0000 (22:41 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT." am:
ed5c217fc0 am:
3d6f878b75
am:
ac3f482f15
Change-Id: I773c607ea2999e6d32c7fcc578cf7b3c86510521
Brad Ebinger [Tue, 7 Feb 2017 22:37:31 +0000 (22:37 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT." am:
ed5c217fc0
am:
3d6f878b75
Change-Id: I0ed577718d9ffd72ec7668889d4da4db0060cb5f
Brad Ebinger [Tue, 7 Feb 2017 22:33:05 +0000 (22:33 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT."
am:
ed5c217fc0
Change-Id: I0fd4ed2260a9654e2889121022192f62f86a3d0c
Brad Ebinger [Tue, 7 Feb 2017 22:26:43 +0000 (22:26 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT."
Peter Qiu [Wed, 1 Feb 2017 04:08:38 +0000 (20:08 -0800)]
hotspot2: expose Passpoint APIs as public
Bug:
34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I8bf5c715b9088c673e59a73a78e18f6e6b64d1d1
Peter Qiu [Thu, 2 Feb 2017 18:25:05 +0000 (10:25 -0800)]
hotspot2: fix class/function/variable names to comply with API guideline
Bug:
34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworsk/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ide425c06be46bc41c8f601e732dca0543de096b1
Peter Qiu [Thu, 2 Feb 2017 18:22:16 +0000 (10:22 -0800)]
hotspot2: rename classes to comply with API guideline
This is purely a file rename operation.
Bug:
34862444
Test: None
Change-Id: I297a228f3ee7e09c9cce5ca9f677eb1db478fd46
songjinshi [Fri, 16 Dec 2016 09:48:21 +0000 (17:48 +0800)]
[Debug]: Add timeout for dumpNativeBacktraceToFile.
If the debuggerd be blocked, the watchdog and
activitymanager thread will be blocked when the
ANR or watchdog occurs,so we needed to add
timeout for dumpNativeBacktraceToFile.
Change-Id: Iab1a64328e70257025d860638d93a4fb8eaaeea2
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Bill Yi [Tue, 7 Feb 2017 17:28:13 +0000 (17:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
7e61e7c585 -s ours
Change-Id: I541c140a9244f7671b3a09f19a4e0ff7acef4f0f