OSDN Git Service
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
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
Bill Yi [Tue, 7 Feb 2017 17:28:07 +0000 (17:28 +0000)]
Import translations. DO NOT MERGE
am:
ca2ead63c9 -s ours
Change-Id: I0411d2408480cd60d32c40db1e5c5f59a9d98609
TreeHugger Robot [Tue, 7 Feb 2017 17:21:06 +0000 (17:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Paul Duffin [Tue, 7 Feb 2017 15:04:10 +0000 (15:04 +0000)]
Replace com.android.internal.util.Predicate with java.util.function.Predicate
Bug:
35089332
Bug:
30188076
Test: make checkbuild
Merged-In: I0a5b4bf520fc39b59d8d790b01e9cff0d54e6d21
Change-Id: I58e4e35e7b7315033d893748f7c79e1ba6732f39
Paul Lawrence [Tue, 7 Feb 2017 16:18:03 +0000 (08:18 -0800)]
Expand seccomp whitelist
Bug:
34979910
Test: System boots, app runs
Change-Id: I8b60a24ac855679251e73edcdec57eb4af4a5610
Tyler Gunn [Tue, 7 Feb 2017 04:47:04 +0000 (20:47 -0800)]
Add support for wait-on-handlers command.
Add support for wait on handlers adb telecom command. Used in CTS
tests to ensure work is completed once all Telecom handlers have finished
their current work.
Test: CTS, Manual
Bug:
34159263
Change-Id: I14acc0a04710b445c172629c2327813ee73a5a55
Bill Yi [Tue, 7 Feb 2017 04:39:57 +0000 (04:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
6654edae49 -s ours
Change-Id: If56de402cfaf73f7ac75e1253b79345e58bc1710
Bill Yi [Tue, 7 Feb 2017 04:39:53 +0000 (04:39 +0000)]
Import translations. DO NOT MERGE
am:
446a66d235 -s ours
Change-Id: I9297388b7b115d9da3083c388aeb25341acd7560
TreeHugger Robot [Tue, 7 Feb 2017 04:30:04 +0000 (04:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 7 Feb 2017 04:27:54 +0000 (04:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
f3f4f78dc7 -s ours
Change-Id: Ifda84719fb488b46456723973b76ce59caef0aa6
Bill Yi [Tue, 7 Feb 2017 04:27:50 +0000 (04:27 +0000)]
Import translations. DO NOT MERGE
am:
b83f6b6f44 -s ours
Change-Id: I7e228f66a17fbdede843865827fc91f4c6790509
TreeHugger Robot [Tue, 7 Feb 2017 04:21:41 +0000 (04:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Charles He [Tue, 7 Feb 2017 01:20:49 +0000 (01:20 +0000)]
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
am:
15b8313d1b
Change-Id: I2d2eca47ab2eb548e48dad733a7956be83511252
Charles He [Tue, 7 Feb 2017 01:20:42 +0000 (01:20 +0000)]
Fingerprint: get auth id for non-current user.
am:
aae60473e1
Change-Id: I547076caaa27d86d682addc14106a344a1b4cec9
Charles He [Tue, 7 Feb 2017 01:15:20 +0000 (01:15 +0000)]
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
Charles He [Fri, 27 Jan 2017 16:14:52 +0000 (16:14 +0000)]
Fingerprint: get auth id for non-current user.
Previously, getAuthenticatorId() simply returns the authenticator id
corresponding to the currently active user in FingerprintService.
However, this can cause bugs when, for example, KeyStore calls the
method before storing a fingerprint-bound key for a non-current user. In
such cases, the authenticator id of the calling user is desired, which
is not necessarily the same as the "current user" in FingerprintService.
This CL ensures the FingerprintService always returns the authenticator
id of the calling user.
Bug:
33459191
Test: manual
Change-Id: Ia9d6b869d16bd37f45358ba839cd12901ebc1076
Merged-In: I35c5a3a7082cffb8941eeaa219c8e20948ad41a9
Bill Yi [Tue, 7 Feb 2017 00:42:58 +0000 (16:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id83eff0bcff1cfadadc4e91ce2d9d58a3f31194e
Auto-generated-cl: translation import
Andreas Huber [Tue, 7 Feb 2017 00:20:19 +0000 (00:20 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am:
97fca8c035 am:
0bae9b1406
am:
0e686542e6
Change-Id: I145b206fc2af5dee4271b94640476507a49f7dbd
Pavlin Radoslavov [Tue, 7 Feb 2017 00:18:40 +0000 (00:18 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities" am:
acf34d8b62 am:
cd6e0ee19d
am:
b7067e2b6c
Change-Id: I459480c5bf8e512340d95452c491e9e2986a84a8
Jason Monk [Tue, 7 Feb 2017 00:17:43 +0000 (00:17 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings" am:
96c4f1a21e am:
4e82bf6c51
am:
55345f5c30
Change-Id: I7874cfc1e034577390d5d77ebbdb22358de57b47
Miao Wang [Tue, 7 Feb 2017 00:12:49 +0000 (00:12 +0000)]
Merge "Remove uncessary dependency of libhwui" am:
df36be5f17 am:
eebd7d7970
am:
558e5dac4d
Change-Id: I99b2fded709c63c71fd9d9f02020a986e3025fa6
Andreas Huber [Tue, 7 Feb 2017 00:12:13 +0000 (00:12 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am:
97fca8c035
am:
0bae9b1406
Change-Id: I0eb29e3e80243a958aa2520924ea9ad859034cdf
Pavlin Radoslavov [Tue, 7 Feb 2017 00:10:21 +0000 (00:10 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities" am:
acf34d8b62
am:
cd6e0ee19d
Change-Id: I6fb8a3a35451cf2d1e228466ef4a4d4e89d1d4ca
Jason Monk [Tue, 7 Feb 2017 00:09:14 +0000 (00:09 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings" am:
96c4f1a21e
am:
4e82bf6c51
Change-Id: I39d311e1b455a7a3e53ac8c1b12d1d67b07972ee
Jack Yu [Tue, 7 Feb 2017 00:08:12 +0000 (00:08 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am:
84f97e21b2 am:
7eac8ec7c1
am:
84e84a73b7
Change-Id: I9aab25b14a5774ff5c7d64c5bc6a8aa5490d9ec0
Miao Wang [Tue, 7 Feb 2017 00:08:05 +0000 (00:08 +0000)]
Merge "Remove uncessary dependency of libhwui" am:
df36be5f17
am:
eebd7d7970
Change-Id: I3e7b282340259eaad71569e8a15f5028852852ee
Tyler Gunn [Tue, 7 Feb 2017 00:05:09 +0000 (00:05 +0000)]
Merge "Self managed CS implementation." am:
d736a6b2c2 am:
6bd991b3d2
am:
6a643c3a60
Change-Id: I43f59846ecc7601730aa3a15b106292d7ace0df0
Jack Yu [Tue, 7 Feb 2017 00:04:04 +0000 (00:04 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am:
84f97e21b2
am:
7eac8ec7c1
Change-Id: I8fdb5f13a50a0965cb2fbfd15212bc26e076054c
OSDN Git Service
