Charles He
d2aa0bb0d3
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev am: 15b8313d1b
...
am: d7d9c0241f
2017-02-07 14:17:06 +00:00
Charles He
f6387d8a51
Fingerprint: get auth id for non-current user. am: aae60473e1
...
am: 9b734a7c4c
2017-02-07 14:16:05 +00:00
Andreas Huber
74400b2ef4
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c035 am: 0bae9b1406 am: 0e686542e6
...
am: 390cd6ceda
2017-02-07 14:12:09 +00:00
Pavlin Radoslavov
489ce07b81
Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62 am: cd6e0ee19d am: b7067e2b6c
...
am: 537eaf0f6e
2017-02-07 14:05:43 +00:00
Jason Monk
f5c7778c7d
Merge "resolve merge conflicts of a800795a15 to master"
2017-02-07 14:02:22 +00:00
Andrei Stingaceanu
155c3a88ac
Merge "Clickable spans - trigger onClick onSingleTapUp"
2017-02-07 11:19:53 +00:00
TreeHugger Robot
c15add0040
Merge "Extend permissions of cameraserver"
2017-02-07 10:13:09 +00:00
Jaewan Kim
620f72841f
Merge "Add oneway keyword for the IOnMediaKeyListener"
2017-02-07 07:59:25 +00:00
Yuichi Araki
fd62c58ede
Merge "Fix doc for setReparentWithOverlay"
2017-02-07 07:35:48 +00:00
TreeHugger Robot
86613acaac
Merge "Import translations. DO NOT MERGE"
2017-02-07 04:31:15 +00:00
TreeHugger Robot
27d151749f
Merge "Import translations. DO NOT MERGE"
2017-02-07 04:30:39 +00:00
Soroosh Mariooryad
e622690efa
Merge "Modifying SuggestionParser to support dismiss logic of smart suggestions."
2017-02-07 02:12:58 +00:00
TreeHugger Robot
ad8cab3892
Merge "Show saved networks before scored networks."
2017-02-07 02:06:33 +00:00
TreeHugger Robot
f546dbf39d
Merge "Fix NetworkPolicyManagerServiceTest."
2017-02-07 01:56:18 +00:00
Doris Ling
93d53bc578
Merge "Remove category key SYSTEM_INPUT"
2017-02-07 01:51:19 +00:00
Soroosh Mariooryad
56ce766e92
Modifying SuggestionParser to support dismiss logic of smart
...
suggestions.
Test: RunSettingsLibRoboTests
Fixes: 35059823
Change-Id: I8c257f4f89f7dbc179aee85e013bdaecc8c3c09c
2017-02-06 17:37:49 -08:00
Jason Monk
8cb6669f75
resolve merge conflicts of a800795a15 to master
...
Test: treehugger
Change-Id: I1f4743288021546344966c2b3ca1ee33c73667a8
2017-02-06 20:25:11 -05:00
Charles He
d7d9c0241f
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
...
am: 15b8313d1b
2017-02-07 01:20:49 +00:00
Charles He
9b734a7c4c
Fingerprint: get auth id for non-current user.
...
am: aae60473e1
2017-02-07 01:20:42 +00:00
Charles He
15b8313d1b
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
2017-02-07 01:15:24 +00:00
Charles He
aae60473e1
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
2017-02-07 01:02:51 +00:00
Android Build Merger (Role)
56d70eec4a
Merge "Merge "Remove uncessary dependency of libhwui" am: df36be5f17 am: eebd7d7970 am: 558e5dac4d am: ffa46b2053"
2017-02-07 00:58:38 +00:00
TreeHugger Robot
f69ffd24b8
Merge "Fingerprint: get auth id for non-current user."
2017-02-07 00:58:17 +00:00
Miao Wang
deaff9a411
Merge "Remove uncessary dependency of libhwui" am: df36be5f17 am: eebd7d7970 am: 558e5dac4d
...
am: ffa46b2053
2017-02-07 00:58:02 +00:00
Jack Yu
73bfa1a87a
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2 am: 7eac8ec7c1 am: 84e84a73b7
...
am: 46c9c133e0
2017-02-07 00:56:23 +00:00
Tyler Gunn
eb4613371c
Merge "Self managed CS implementation." am: d736a6b2c2 am: 6bd991b3d2 am: 6a643c3a60
...
am: efeae9bca4
2017-02-07 00:55:16 +00:00
Selim Cinek
d755dd0e72
Merge "Fixed test failures for notification comparator"
2017-02-07 00:43:46 +00:00
Andreas Huber
390cd6ceda
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c035 am: 0bae9b1406
...
am: 0e686542e6
2017-02-07 00:20:19 +00:00
Pavlin Radoslavov
537eaf0f6e
Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62 am: cd6e0ee19d
...
am: b7067e2b6c
2017-02-07 00:18:40 +00:00
Jason Monk
a800795a15
Merge "Hotspot Tile: longclick should open Tethering settings" am: 96c4f1a21e am: 4e82bf6c51
...
am: 55345f5c30
2017-02-07 00:17:43 +00:00
Casey Burkhardt
edb54686c2
Merge "Initial implementation of Nav Bar Accessibility Button"
2017-02-07 00:14:49 +00:00
Miao Wang
ffa46b2053
Merge "Remove uncessary dependency of libhwui" am: df36be5f17 am: eebd7d7970
...
am: 558e5dac4d
2017-02-07 00:12:49 +00:00
Andreas Huber
0e686542e6
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c035
...
am: 0bae9b1406
2017-02-07 00:12:13 +00:00
Pavlin Radoslavov
b7067e2b6c
Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62
...
am: cd6e0ee19d
2017-02-07 00:10:21 +00:00
Jason Monk
55345f5c30
Merge "Hotspot Tile: longclick should open Tethering settings" am: 96c4f1a21e
...
am: 4e82bf6c51
2017-02-07 00:09:14 +00:00
Jack Yu
46c9c133e0
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2 am: 7eac8ec7c1
...
am: 84e84a73b7
2017-02-07 00:08:12 +00:00
Miao Wang
558e5dac4d
Merge "Remove uncessary dependency of libhwui" am: df36be5f17
...
am: eebd7d7970
2017-02-07 00:08:05 +00:00
Tyler Gunn
efeae9bca4
Merge "Self managed CS implementation." am: d736a6b2c2 am: 6bd991b3d2
...
am: 6a643c3a60
2017-02-07 00:05:09 +00:00
Jack Yu
84e84a73b7
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2
...
am: 7eac8ec7c1
2017-02-07 00:04:04 +00:00
Tyler Gunn
6a643c3a60
Merge "Self managed CS implementation." am: d736a6b2c2
...
am: 6bd991b3d2
2017-02-07 00:01:04 +00:00
Andreas Huber
0bae9b1406
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
...
am: 97fca8c035
2017-02-06 23:45:53 +00:00
Treehugger Robot
97fca8c035
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
2017-02-06 23:41:28 +00:00
Justin Klaassen
e7f68ac380
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev am: 1f56b60981
...
am: 2d93a66f47
2017-02-06 23:34:25 +00:00
Justin Klaassen
253c2093a5
Remove experimental twilight-based automatic brightness am: 614f40ea01
...
am: 46d3d6d313
2017-02-06 23:33:25 +00:00
Justin Klaassen
2d93a66f47
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
...
am: 1f56b60981
2017-02-06 23:28:37 +00:00
Justin Klaassen
46d3d6d313
Remove experimental twilight-based automatic brightness
...
am: 614f40ea01
2017-02-06 23:28:27 +00:00
TreeHugger Robot
1f56b60981
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
2017-02-06 23:21:04 +00:00
Pavlin Radoslavov
cd6e0ee19d
Merge "Add a mechanism to configure the default A2DP codec priorities"
...
am: acf34d8b62
2017-02-06 23:12:23 +00:00
Aaron Whyte
1874c5503f
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am: 50fa8ad424 am: 95f418cc52
...
am: 0eea1cf702
2017-02-06 23:11:23 +00:00
Ying Wai (Daniel) Fan
b7a1a0833b
Prevent division-by-zero error when calculating battery capacity. am: 415f8b32e8 am: b87f8900ce
...
am: 639236265e
2017-02-06 23:10:25 +00:00
