OSDN Git Service
Jim Miller [Tue, 25 Aug 2015 23:36:30 +0000 (23:36 +0000)]
am
919a3fdf: am
01c5bf54: Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev
* commit '
919a3fdf9c92aa232f6304c32227cf0fe99cb8f3':
Handle driver errors from remove, enroll and auth.
Jim Miller [Tue, 25 Aug 2015 23:29:40 +0000 (23:29 +0000)]
am
01c5bf54: Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev
* commit '
01c5bf5470a8c1c75f74792d8be1dada3a6f7b8a':
Handle driver errors from remove, enroll and auth.
Jim Miller [Tue, 25 Aug 2015 23:22:29 +0000 (23:22 +0000)]
Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev
Jorim Jaggi [Tue, 25 Aug 2015 23:09:59 +0000 (23:09 +0000)]
am
4816d7d5: am
e30e8980: Merge "Disable RT animations for header ripple" into mnc-dr-dev
* commit '
4816d7d58c7717a5a89c75fee17ce6202c7b1bea':
Disable RT animations for header ripple
Jorim Jaggi [Tue, 25 Aug 2015 23:02:24 +0000 (23:02 +0000)]
am
e30e8980: Merge "Disable RT animations for header ripple" into mnc-dr-dev
* commit '
e30e8980a1ceeacdc7ecafd36a622cc93d7ab3fc':
Disable RT animations for header ripple
Jorim Jaggi [Tue, 25 Aug 2015 22:54:34 +0000 (22:54 +0000)]
Merge "Disable RT animations for header ripple" into mnc-dr-dev
Zach Johnson [Tue, 25 Aug 2015 19:22:16 +0000 (19:22 +0000)]
am
5d636c8c: Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev
* commit '
5d636c8c50cc4a26492095b3df61801f3935424f':
Fix AudioAttributes.usageToString() string return values
Zach Johnson [Tue, 25 Aug 2015 19:22:11 +0000 (19:22 +0000)]
am
3f62358b: Merge "*ring ring* Who is it? Destiny? I\'ve been expecting your call..." into cw-e-dev
* commit '
3f62358b7e3a35f6f9c68aac09889e5d47bc6d2a':
*ring ring* Who is it? Destiny? I've been expecting your call...
Zach Johnson [Tue, 25 Aug 2015 19:16:59 +0000 (19:16 +0000)]
Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev
Zach Johnson [Tue, 25 Aug 2015 19:16:43 +0000 (19:16 +0000)]
Merge "*ring ring* Who is it? Destiny? I've been expecting your call..." into cw-e-dev
Wei Liu [Tue, 25 Aug 2015 18:32:47 +0000 (18:32 +0000)]
am
30275c19: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '
30275c1924b2bd45b05bd9c98f8648ecbc71374f':
Refactor UidDetailProvider and its dependencies to SettingsLib.
Zach Johnson [Mon, 24 Aug 2015 23:33:16 +0000 (16:33 -0700)]
Fix AudioAttributes.usageToString() string return values
Change-Id: I75642d043d647c921259dad20df504dd2e551644
Zach Johnson [Mon, 24 Aug 2015 22:38:27 +0000 (15:38 -0700)]
*ring ring* Who is it? Destiny? I've been expecting your call...
https://www.youtube.com/watch?v=7VFPtY7hiGw
Allow USAGE_NOTIFICATION_RINGTONE regardless of effect supression
component, because otherwise we can't use the system implementation of
ringtones (audio or vibration). If a platform wishes to turn supress this,
it can be disabled through the default zen configuration if necessary.
Change-Id: I02a89376b40c6eecde2468c93898b4a821315e64
Wei Liu [Tue, 25 Aug 2015 18:07:17 +0000 (18:07 +0000)]
am
37e1db23: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
* commit '
37e1db2320acd850e0738f3972d3ba4334f59949':
Move SummaryForAllUidLoader to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 00:35:49 +0000 (17:35 -0700)]
Refactor UidDetailProvider and its dependencies to SettingsLib.
so that it can be reused by Wear app data usage.
Change-Id: Ifd5709647ba031bb38b2293c35def01bcdee1448
Nicolas Prevot [Tue, 25 Aug 2015 17:57:28 +0000 (17:57 +0000)]
am
ae2880a6: am
26b555d4: am
d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.
* commit '
ae2880a62881b08eb692978a869a226fcc692c78':
Don't set a null filter to a cross-profile ResolveInfo.
Wei Liu [Tue, 25 Aug 2015 17:55:32 +0000 (17:55 +0000)]
Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
Nicolas Prevot [Tue, 25 Aug 2015 17:49:18 +0000 (17:49 +0000)]
am
26b555d4: am
d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.
* commit '
26b555d42ce2cf78d42ebcc9806447bf83df9318':
Don't set a null filter to a cross-profile ResolveInfo.
Nicolas Prevot [Tue, 25 Aug 2015 17:39:24 +0000 (17:39 +0000)]
am
d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.
* commit '
d34ecae444867b78be06bb5a6b0fb2a66c2e30aa':
Don't set a null filter to a cross-profile ResolveInfo.
Chris Wren [Tue, 25 Aug 2015 14:22:24 +0000 (14:22 +0000)]
am
d267c3b3: am
83d83194: Merge "instrument fingerprint crypto token service" into mnc-dr-dev
* commit '
d267c3b3212f804a1507947f98233230af9413b4':
instrument fingerprint crypto token service
Chris Wren [Tue, 25 Aug 2015 14:14:41 +0000 (14:14 +0000)]
am
83d83194: Merge "instrument fingerprint crypto token service" into mnc-dr-dev
* commit '
83d83194c3e68740593800ee2c295247d2bf2e06':
instrument fingerprint crypto token service
Chris Wren [Tue, 25 Aug 2015 14:10:20 +0000 (14:10 +0000)]
Merge "instrument fingerprint crypto token service" into mnc-dr-dev
Nicolas Prevot [Tue, 25 Aug 2015 12:01:43 +0000 (13:01 +0100)]
Don't set a null filter to a cross-profile ResolveInfo.
ResolverActivity expects the filter not to be null.
BUG:
23395395
Change-Id: Ie7081daba1ad138b1a3903ef9dd1b649806c8d0e
Erik Wolsheimer [Tue, 25 Aug 2015 05:22:22 +0000 (05:22 +0000)]
am
49eb98e7: add permissions strings that have to be altered from framework originals for use in Wear BUG:
23223527
* commit '
49eb98e783e2f8e8e5fe2db4844babdc31553be6':
add permissions strings that have to be altered from framework originals for use in Wear BUG:
23223527
Erik Wolsheimer [Tue, 25 Aug 2015 05:14:50 +0000 (22:14 -0700)]
add permissions strings that have to be altered from framework originals for use in Wear
BUG:
23223527
Change-Id: I5c175f3867d72e1dd1a539bec454ac60d2d501d7
Jorim Jaggi [Tue, 25 Aug 2015 05:13:47 +0000 (05:13 +0000)]
am
2ef327ed: am
2cb70049: Scale notifications on lockscreen for 420 dpi devices
* commit '
2ef327ede9f9b5f5da90a2d54eceee2a0e9c4406':
Scale notifications on lockscreen for 420 dpi devices
Jorim Jaggi [Tue, 25 Aug 2015 05:07:12 +0000 (05:07 +0000)]
am
2cb70049: Scale notifications on lockscreen for 420 dpi devices
* commit '
2cb7004928e4bb34022e3ced112c2917fc5362f9':
Scale notifications on lockscreen for 420 dpi devices
Vinod Krishnan [Tue, 25 Aug 2015 05:03:03 +0000 (05:03 +0000)]
am
46814fbf: Merge "Override Body Sensors string for watches" into cw-e-dev
* commit '
46814fbfc842d80033f4b1a8ae702f25eb8fd5d2':
Override Body Sensors string for watches
Jorim Jaggi [Mon, 24 Aug 2015 21:52:45 +0000 (14:52 -0700)]
Scale notifications on lockscreen for 420 dpi devices
Bug:
23299488
Change-Id: Ied4505532aad41a3a1469efce2464a491661fb6c
Vinod Krishnan [Tue, 25 Aug 2015 04:51:05 +0000 (04:51 +0000)]
Merge "Override Body Sensors string for watches" into cw-e-dev
Vinod Krishnan [Tue, 25 Aug 2015 04:47:45 +0000 (21:47 -0700)]
Override Body Sensors string for watches
Change-Id: Ie967f7ae5444b9ce92a46cd30a85896814c8fd17
Jaewan Kim [Tue, 25 Aug 2015 01:40:11 +0000 (01:40 +0000)]
Merge "Add documentation for media router's palette dependency." into mnc-ub-dev
Eino-Ville Talvala [Mon, 24 Aug 2015 23:31:49 +0000 (23:31 +0000)]
am
cd05509a: am
6393275f: am
2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit '
cd05509a81fff64e28dd1d7a2f482af5f269c6fc':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Eino-Ville Talvala [Mon, 24 Aug 2015 23:21:16 +0000 (23:21 +0000)]
am
6393275f: am
2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit '
6393275f5f8daa2d14dbc3fbd6511a78978999cd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Eino-Ville Talvala [Mon, 24 Aug 2015 23:12:16 +0000 (23:12 +0000)]
am
2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit '
2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Eino-Ville Talvala [Mon, 24 Aug 2015 23:08:00 +0000 (23:08 +0000)]
Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
Jorim Jaggi [Mon, 24 Aug 2015 22:05:05 +0000 (22:05 +0000)]
am
7166ae1d: am
d94d3a2a: Fix issues with light status bar and fp wake-and-unlock
* commit '
7166ae1d19269d536442572e35063f624350000e':
Fix issues with light status bar and fp wake-and-unlock
Adrian Roos [Mon, 24 Aug 2015 21:59:58 +0000 (21:59 +0000)]
am
7edca79e: am
8a8885b9: am
def6896d: Fix shifted wallpaper after OTA
* commit '
7edca79ede391a058b690c7ed203099dd24e7145':
Fix shifted wallpaper after OTA
Jorim Jaggi [Mon, 24 Aug 2015 21:56:17 +0000 (21:56 +0000)]
am
d94d3a2a: Fix issues with light status bar and fp wake-and-unlock
* commit '
d94d3a2aa5cd1f177f61f73733217c952e356c43':
Fix issues with light status bar and fp wake-and-unlock
Adrian Roos [Mon, 24 Aug 2015 21:51:09 +0000 (21:51 +0000)]
am
8a8885b9: am
def6896d: Fix shifted wallpaper after OTA
* commit '
8a8885b91de361b3a6a975e380e4a00fa92f8d7d':
Fix shifted wallpaper after OTA
Jorim Jaggi [Fri, 21 Aug 2015 23:52:55 +0000 (16:52 -0700)]
Fix issues with light status bar and fp wake-and-unlock
- When wake-and-unlocking, make sure to skip the light status bar
transition.
- Fix race condition with window manager when unlocking when device
is interactive for supplying the timings for the light status bar
transition.
- Fix media artwork when wake-and-unlocking while pulsing.
Bug:
23365544
Change-Id: I209ca1e6684811f5f313354ca1614a0ebd49388c
Adrian Roos [Mon, 24 Aug 2015 21:41:43 +0000 (21:41 +0000)]
am
def6896d: Fix shifted wallpaper after OTA
* commit '
def6896d10ce4869831bf91eb73709e8a9714b27':
Fix shifted wallpaper after OTA
Eino-Ville Talvala [Mon, 24 Aug 2015 21:06:12 +0000 (14:06 -0700)]
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Devices that do not support the BURST_CAPTURE capability do not
get the split resolution lists. However, one spot in the stream
configuration map enumeration did not guard against this properly.
As a result, the category of devices that are not-BURST-CAPABLE and
do list resolutions that operate at a 'slow' (<= 20fps) rates cause
an assert to fire from an apparently-inconsistent size list.
Guard the filtering correctly, to correctly support such
devices.
Bug:
23489536
Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701
Erik Wolsheimer [Mon, 24 Aug 2015 21:00:08 +0000 (21:00 +0000)]
am
379e7343: Merge "DO NOT MERGE guard against null DimLayer instances in TaskStack BUG:
23452983" into cw-e-dev
* commit '
379e73435ff1ed5c0fd3dabd6ae2d50174085d22':
DO NOT MERGE guard against null DimLayer instances in TaskStack BUG:
23452983
Jorim Jaggi [Mon, 24 Aug 2015 21:00:02 +0000 (21:00 +0000)]
am
5d552f2c: am
414985c4: Remove window from mWaitingForDrawn when policy hidden
* commit '
5d552f2cf733f39677fa4a8617e69566624b8cae':
Remove window from mWaitingForDrawn when policy hidden
Erik Wolsheimer [Mon, 24 Aug 2015 20:53:45 +0000 (20:53 +0000)]
Merge "DO NOT MERGE guard against null DimLayer instances in TaskStack BUG:
23452983" into cw-e-dev
Adrian Roos [Mon, 24 Aug 2015 20:39:11 +0000 (13:39 -0700)]
Fix shifted wallpaper after OTA
Fixes a bug where WindowManager's and SurfaceFlinger's
view of the wallpaper's position could get out of sync.
Bug:
13020924
Change-Id: Iad17b0f516fffacd2877ceac40fcc8e2647c06b2
Jorim Jaggi [Mon, 24 Aug 2015 20:52:21 +0000 (20:52 +0000)]
am
414985c4: Remove window from mWaitingForDrawn when policy hidden
* commit '
414985c422664c7f8d5dec5562b502907b965876':
Remove window from mWaitingForDrawn when policy hidden
Erik Wolsheimer [Mon, 24 Aug 2015 18:24:05 +0000 (11:24 -0700)]
DO NOT MERGE
guard against null DimLayer instances in TaskStack
BUG:
23452983
Change-Id: I8edaafe01b7bca93bfa6a15be0ae49c5e34eff40
Jorim Jaggi [Sat, 22 Aug 2015 00:07:09 +0000 (17:07 -0700)]
Remove window from mWaitingForDrawn when policy hidden
When doing a wake-and-unlock sequence and the app underneath hides
the status bar, we are dismissing Keyguard, the app gets focus, the
app hides the status bar BUT we haven't finished drawn yet, so we
are waiting until the timeout because w.hasDrawnLw() always returns
false. Remove window from pending list if it gets policy hidden.
Bug:
23431343
Change-Id: I27e8c6d4efb435a4d3b632a4a37c0de5b021c2e7
Joe Fernandez [Mon, 24 Aug 2015 20:43:51 +0000 (20:43 +0000)]
am
c9a110b0: am
8c8a0c00: am
c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
* commit '
c9a110b0a873306e3219f1de17050cdaee6bc486':
docs: Add Studio 1.3.2 release notes and download links
Joe Fernandez [Mon, 24 Aug 2015 20:37:57 +0000 (20:37 +0000)]
am
8c8a0c00: am
c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
* commit '
8c8a0c0034cd87ae80392164a67af13648b29b40':
docs: Add Studio 1.3.2 release notes and download links
Joe Fernandez [Mon, 24 Aug 2015 20:30:20 +0000 (20:30 +0000)]
am
c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
* commit '
c550a6fa945c0eeb5d766d0a54a50af54eddd67f':
docs: Add Studio 1.3.2 release notes and download links
Joe Fernandez [Mon, 24 Aug 2015 20:25:04 +0000 (20:25 +0000)]
Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
Joe Fernandez [Fri, 21 Aug 2015 00:11:56 +0000 (17:11 -0700)]
docs: Add Studio 1.3.2 release notes and download links
- Added Studio 1.3.2 release notes
- Added Studio 1.3.2 download link information
- Added ADT 23.0.7 release notes (catch up from 8/17)
Change-Id: I930059d9bf85f7063eb3f55e0c77d46a064c75b0
Chris Wren [Mon, 24 Aug 2015 20:19:03 +0000 (16:19 -0400)]
instrument fingerprint crypto token service
Histogram counts number of calls with and without a token.
Bug:
22951001
Change-Id: Idaabee389bfa33eb009d48bb9a0edae146bcc217
Eino-Ville Talvala [Mon, 24 Aug 2015 19:34:50 +0000 (19:34 +0000)]
am
f2c5ce5d: am
a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
* commit '
f2c5ce5db149e320299896b1afdcb7c63378663d':
Camera: Add support for notifying NFC stack when camera is active
Eino-Ville Talvala [Mon, 24 Aug 2015 19:27:42 +0000 (19:27 +0000)]
am
a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
* commit '
a42cf680a57e73eb4ed874bb78b7f47c6d5d76d3':
Camera: Add support for notifying NFC stack when camera is active
Eino-Ville Talvala [Mon, 24 Aug 2015 19:22:04 +0000 (19:22 +0000)]
Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
Vineeta Srivastava [Mon, 24 Aug 2015 19:17:03 +0000 (19:17 +0000)]
am
7fd1014f: am
21490522: Merge "Don\'t show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev
* commit '
7fd1014f093258d820e15dc9814e5aaad579bafb':
Don't show roaming icon when connecting HT HR network with Tele2 SIM
Vineeta Srivastava [Mon, 24 Aug 2015 19:07:36 +0000 (19:07 +0000)]
am
21490522: Merge "Don\'t show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev
* commit '
21490522523c24c2873d4b3b89caa7d243982490':
Don't show roaming icon when connecting HT HR network with Tele2 SIM
Vineeta Srivastava [Mon, 24 Aug 2015 19:00:27 +0000 (19:00 +0000)]
Merge "Don't show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev
Wei Liu [Fri, 21 Aug 2015 05:34:49 +0000 (22:34 -0700)]
Move SummaryForAllUidLoader to SettingsLib.
In order to show the data usage per app on Android Wear,
I'm moving SummaryForAllUidLoader to SettingsLib so that
the code can be reused.
Change-Id: I4819ee96a75d62a86968376556258270b3bb8ba1
Scott Main [Mon, 24 Aug 2015 16:54:59 +0000 (16:54 +0000)]
am
1c5e92b1: am
8b86268b: am
c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-de
* commit '
1c5e92b125328fdfdd64de78b83ad2c65d9bf5f7':
add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/
Scott Main [Mon, 24 Aug 2015 16:49:00 +0000 (16:49 +0000)]
am
8b86268b: am
c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-dev
* commit '
8b86268be3fd713394915cbed3d71cc85f806fe1':
add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/
Scott Main [Mon, 24 Aug 2015 16:41:22 +0000 (16:41 +0000)]
am
c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-dev
* commit '
c04d21fc4ec66d34ca5395db59fadc5e4626bb1c':
add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/
Geoff Mendal [Mon, 24 Aug 2015 16:37:31 +0000 (16:37 +0000)]
am
92f43c8e: (-s ours) am
4e3af2ec: (-s ours) Import translations. DO NOT MERGE
* commit '
92f43c8eb74722ecedcbda5b2af5daa581f2dd29':
Import translations. DO NOT MERGE
Scott Main [Mon, 24 Aug 2015 16:34:35 +0000 (16:34 +0000)]
Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-dev
Geoff Mendal [Mon, 24 Aug 2015 16:29:56 +0000 (16:29 +0000)]
am
4e3af2ec: (-s ours) Import translations. DO NOT MERGE
* commit '
4e3af2ec5a480754e5d0793ce21b68cb3a9b32d8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Aug 2015 16:04:11 +0000 (11:04 -0500)]
Import translations. DO NOT MERGE
Change-Id: I62399fd97cd9a757f8e6b8ec6c7f0b21154c1a43
Auto-generated-cl: translation import
Sungmin Choi [Mon, 17 Aug 2015 21:15:37 +0000 (14:15 -0700)]
Don't show roaming icon when connecting HT HR network with Tele2 SIM
Bug:
23263661
Change-Id: Idcc52d53f7d7860ca561688ea311fdf50f3447b2
Eino-Ville Talvala [Sat, 22 Aug 2015 05:53:29 +0000 (05:53 +0000)]
am
f99eba07: am
ec2efb9c: am
08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
* commit '
f99eba07c0d49e31e9a274fba6d10bc42fc2c942':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
Eino-Ville Talvala [Sat, 22 Aug 2015 05:45:46 +0000 (05:45 +0000)]
am
ec2efb9c: am
08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
* commit '
ec2efb9cac57f0cd6c371422114a37c5c9791ec8':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
Eino-Ville Talvala [Sat, 22 Aug 2015 05:38:01 +0000 (05:38 +0000)]
am
08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
* commit '
08b12dfba630659601972f0d857b6580fdae4313':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
Eino-Ville Talvala [Sat, 22 Aug 2015 05:33:26 +0000 (05:33 +0000)]
Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
Jim Miller [Sat, 22 Aug 2015 01:45:15 +0000 (18:45 -0700)]
Handle driver errors from remove, enroll and auth.
FingerprintService expects callbacks from the HAL to happen over
the provided notify() method. However, there are some circumstances
when errors can't be propagated (i.e. the driver cannot be loaded).
In this case, the call to the method (remove(), enroll(), authenticate())
fails and we get a return status != 0. When this happens, FingerprintService
now sends an error response to the client. In general, this will mean
the driver is unavailable, so we send FINGERPRINT_ERROR_HW_UNAVAILABLE.
Fixes bug
23183484
Change-Id: Ifb40ba6fb1d960810043749fd8478ba37c968405
Jorim Jaggi [Sat, 22 Aug 2015 01:22:01 +0000 (01:22 +0000)]
am
7795faac: am
4351111b: Merge "Fix jank when clicking on HUN" into mnc-dr-dev
* commit '
7795faace682aee863d836da91364b2ea5632c8f':
Fix jank when clicking on HUN
Jorim Jaggi [Sat, 22 Aug 2015 01:16:44 +0000 (01:16 +0000)]
am
4351111b: Merge "Fix jank when clicking on HUN" into mnc-dr-dev
* commit '
4351111bbb8b64ff8a89be549c0a503d487b1a78':
Fix jank when clicking on HUN
Jorim Jaggi [Sat, 22 Aug 2015 01:10:17 +0000 (01:10 +0000)]
Merge "Fix jank when clicking on HUN" into mnc-dr-dev
Andrew Solovay [Sat, 22 Aug 2015 00:52:31 +0000 (00:52 +0000)]
am
3f233293: am
e2ca8593: am
9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev
* commit '
3f23329357e6f0de74c03694ab16e5cc165d490e':
docs: Fix return info for support lib checkSelfPermission()
Andrew Solovay [Sat, 22 Aug 2015 00:44:44 +0000 (00:44 +0000)]
am
e2ca8593: am
9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev
* commit '
e2ca8593a7f665eb4693fdc2802b4d3e36971b73':
docs: Fix return info for support lib checkSelfPermission()
Eino-Ville Talvala [Sat, 22 Aug 2015 00:42:21 +0000 (00:42 +0000)]
am
00ca835d: am
e5b4c3d5: am
a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
* commit '
00ca835d89541d4be81d787145719d1845665951':
Camera: Fix depth documentation issues
Eino-Ville Talvala [Thu, 20 Aug 2015 22:43:57 +0000 (15:43 -0700)]
Camera: Add support for notifying NFC stack when camera is active
On some devices, NFC full poll operation and camera operation
interfere. Add a system property ro.camera.notify_nfc. When set to >
0, the NFC adapter will be notified to disable polling whenever the
camera is active.
Bug:
23393557
Change-Id: I7e22018900970cbbd3d34bd8b3974e0b1cc98a8d
Andrew Solovay [Sat, 22 Aug 2015 00:36:54 +0000 (00:36 +0000)]
am
9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev
* commit '
9520071b983e2ca61160f580e0be3fe24d305760':
docs: Fix return info for support lib checkSelfPermission()
Eino-Ville Talvala [Sat, 22 Aug 2015 00:33:47 +0000 (00:33 +0000)]
am
e5b4c3d5: am
a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
* commit '
e5b4c3d5f329ee830c46f92deef23be1dfbead80':
Camera: Fix depth documentation issues
Andrew Solovay [Sat, 22 Aug 2015 00:30:59 +0000 (00:30 +0000)]
Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev
Glenn Kasten [Sat, 22 Aug 2015 00:27:17 +0000 (00:27 +0000)]
am
403eaaf2: am
c445438e: am
d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev
* commit '
403eaaf2d00ff705421f75ae5618b24ea1b2557d':
MIDI docs: fix buffer allocation
Cheryl Potter [Sat, 22 Aug 2015 00:27:11 +0000 (00:27 +0000)]
am
c4b0028e: am
a4f65ff5: am
41fc973c: am
251f2479: am
dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
* commit '
c4b0028e6f71a7bfcce4c15b2e62186ba78a0aeb':
docs: changed red to yellow in code snippet
Fyodor Kupolov [Sat, 22 Aug 2015 00:27:05 +0000 (00:27 +0000)]
am
563f974d: am
d7cdbd4d: am
e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
* commit '
563f974d97232706743ac415c65238b1c84ec1d5':
Fixed a typo in convertRestrictionsToBundle JavaDoc
Adrian Roos [Sat, 22 Aug 2015 00:26:58 +0000 (00:26 +0000)]
am
fb6f6f24: am
2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
* commit '
fb6f6f2490372f113698d9c8d09dae7f4991dec3':
Invoke strong auth callback and default strong auth expired to true
Jim Miller [Sat, 22 Aug 2015 00:26:52 +0000 (00:26 +0000)]
am
c66a0db2: am
1bbc2750: am
74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
* commit '
c66a0db280d5b8f21e7335b964f13cf6b765f336':
Fix type-o in FingerprintManager documentation
Trevor Bunker [Sat, 22 Aug 2015 00:26:45 +0000 (00:26 +0000)]
am
e2fb50b2: am
fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev
* commit '
e2fb50b21d67decc555b6f89dea1d56fe8ee6655':
Add support for new window orientation sensor.
Adrian Roos [Sat, 22 Aug 2015 00:26:39 +0000 (00:26 +0000)]
am
a8bbebd4: am
b5e47228: Add StrongAuthTracker
* commit '
a8bbebd426b554378cedf3d4e729cabd7e0caff9':
Add StrongAuthTracker
Jorim Jaggi [Sat, 22 Aug 2015 00:26:31 +0000 (00:26 +0000)]
am
2021956a: am
ab45a217: Make wake-and-unlock faster
* commit '
2021956a1c35dba2b88257dc4a8eed8fa0acd650':
Make wake-and-unlock faster
Jorim Jaggi [Sat, 22 Aug 2015 00:26:24 +0000 (00:26 +0000)]
am
83526e3b: am
86bed406: Fix fingerprint listening state race conditions
* commit '
83526e3bbdff8e8ca3f85616d0678eb5d00ae3b7':
Fix fingerprint listening state race conditions
Eino-Ville Talvala [Sat, 22 Aug 2015 00:25:38 +0000 (00:25 +0000)]
am
a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
* commit '
a7dde2e89ec9a8c0ce5460d4f57d1e561f16520f':
Camera: Fix depth documentation issues
Glenn Kasten [Sat, 22 Aug 2015 00:17:53 +0000 (00:17 +0000)]
am
c445438e: am
d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev
* commit '
c445438e64d713ceb45937de17f7ab2fa34fe295':
MIDI docs: fix buffer allocation
Cheryl Potter [Sat, 22 Aug 2015 00:17:48 +0000 (00:17 +0000)]
am
a4f65ff5: am
41fc973c: am
251f2479: am
dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
* commit '
a4f65ff5e0cd265ef28697dc17f451106a79f90d':
docs: changed red to yellow in code snippet
Fyodor Kupolov [Sat, 22 Aug 2015 00:17:44 +0000 (00:17 +0000)]
am
d7cdbd4d: am
e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
* commit '
d7cdbd4d812f3d3501c37b7242a7038298c7ee14':
Fixed a typo in convertRestrictionsToBundle JavaDoc
Adrian Roos [Sat, 22 Aug 2015 00:17:39 +0000 (00:17 +0000)]
am
2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
* commit '
2c632c8831349d2c951c9addae05f080958f0604':
Invoke strong auth callback and default strong auth expired to true
OSDN Git Service
