OSDN Git Service
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:32 +0000 (01:42 +0000)]
am
ef319302: am
522e67e4: (-s ours) am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
ef31930253fe9c0b0cc7d42c0f11181ffe69ea1b':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:26 +0000 (01:42 +0000)]
am
a6d71a2c: am
8df6131a: (-s ours) am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
a6d71a2c37fbf4357ddb084ed5050c27826514ac':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:22 +0000 (01:42 +0000)]
am
df44516b: am
59f026e9: (-s ours) am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
df44516b78b6dd3c2ae5849a07a6e07e9302b668':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:18 +0000 (01:42 +0000)]
am
bf019327: am
b44f7fda: (-s ours) am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
bf01932797aa5ae8d94643b7861b45c89364b2ba':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:13 +0000 (01:42 +0000)]
am
ef284578: am
78d77bc3: (-s ours) am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
ef284578ee3b77890bcb45bbd1f89a5d244bced1':
Remove kxml dependency [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:21 +0000 (01:28 +0000)]
am
522e67e4: (-s ours) am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
522e67e4ac600fb19c18f55f0e51096af9ae37d3':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:14 +0000 (01:28 +0000)]
am
8df6131a: (-s ours) am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
8df6131ac103ac58ab03f6aae01e136df3c6a7b1':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:07 +0000 (01:28 +0000)]
am
59f026e9: (-s ours) am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
59f026e937e749a77f12614010f8be05123f4837':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:27:52 +0000 (01:27 +0000)]
am
b44f7fda: (-s ours) am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
b44f7fda759394b6447f19c0b3c9a3fdf8f9cd95':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:27:45 +0000 (01:27 +0000)]
am
78d77bc3: (-s ours) am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
78d77bc379f42dfe020cf0719ceae14174cf1c33':
Remove kxml dependency [DO NOT MERGE]
Tim Kilbourn [Thu, 27 Aug 2015 01:15:58 +0000 (01:15 +0000)]
am
8f1ea834: Handle the -a flag for dumpsys appops.
* commit '
8f1ea834f9af5ccf6cea1f529f63e727cd13b6a8':
Handle the -a flag for dumpsys appops.
Tim Kilbourn [Wed, 26 Aug 2015 22:07:37 +0000 (15:07 -0700)]
Handle the -a flag for dumpsys appops.
Bug:
23017449
Change-Id: I6ce9ac368e2739153867c246893eb544d052834f
Roshan Pius [Wed, 26 Aug 2015 21:15:16 +0000 (21:15 +0000)]
Merge "Reformat local Korean numbers in national format." into mnc-dr-dev
Daniel Estrada Alva [Wed, 26 Aug 2015 21:09:50 +0000 (21:09 +0000)]
Merge "Disable AR HW when client binder dies." into mnc-dr-dev
Alan Viverette [Wed, 26 Aug 2015 20:45:26 +0000 (20:45 +0000)]
am
95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
* commit '
9513785715e2325ee3a3269fbfe7b1f4409eff5c':
Avoid NPE when getPositionForView() is called on detached view
Alan Viverette [Wed, 26 Aug 2015 20:38:53 +0000 (20:38 +0000)]
Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:04 +0000 (20:18 +0000)]
am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
de3ac8f9fc5987ac1f1223da02b4275fdbae3d56':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:51 +0000 (20:17 +0000)]
am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
50e1406a4ad668179a9a3d28c58d68c0eee44237':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:46 +0000 (20:17 +0000)]
am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
81990c3f988369c755590288b93508e30024c56c':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:40 +0000 (20:17 +0000)]
am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
0a07bb95a1dd94c3457860a934d3ee546919cff2':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:34 +0000 (20:17 +0000)]
am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
bbbdc2ad8939c28828a8441c0b24812c53a9eb66':
Remove kxml dependency [DO NOT MERGE]
Alan Viverette [Wed, 26 Aug 2015 19:21:39 +0000 (15:21 -0400)]
Avoid NPE when getPositionForView() is called on detached view
Bug:
23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20
Chien-Yu Chen [Wed, 26 Aug 2015 19:07:52 +0000 (19:07 +0000)]
am
e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit '
e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
Camera: Update for reprocess session
Chien-Yu Chen [Wed, 26 Aug 2015 18:56:15 +0000 (18:56 +0000)]
Merge "Camera: Update for reprocess session" into mnc-dev
Nicholas Sauer [Wed, 26 Aug 2015 18:25:26 +0000 (18:25 +0000)]
am
7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
* commit '
7c17ec5fa5cb51d12713016622e4b5a939c8bb76':
Add GET_APP_OPS_STATS to Shell
Selim Cinek [Wed, 26 Aug 2015 18:25:07 +0000 (18:25 +0000)]
Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev
Nicholas Sauer [Wed, 26 Aug 2015 18:17:03 +0000 (18:17 +0000)]
Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
Daniel Estrada Alva [Wed, 26 Aug 2015 17:30:09 +0000 (17:30 +0000)]
Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
Selim Cinek [Wed, 26 Aug 2015 17:20:50 +0000 (17:20 +0000)]
Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev
Selim Cinek [Wed, 26 Aug 2015 02:03:48 +0000 (19:03 -0700)]
Migrate camera vibration to the systemUI
Also make sure the device is awake before vibrating.
Bug:
23200352
Change-Id: I63d04a82a4b8d9fa3e8f9deff5dd71295c82c930
Selim Cinek [Fri, 14 Aug 2015 20:19:37 +0000 (13:19 -0700)]
Launching the camera now from systemUI including animations
The GestureLaunchService now informs systemUI that a launch
has been requested and the systemUI, depending on its state
will launch the Camera in the correct mode, including
animations.
Bug:
22957192
Bug:
22958025
Change-Id: I815437c8bd33638245ac61a750f64af74fe3e1e3
Roshan Pius [Tue, 25 Aug 2015 18:23:49 +0000 (11:23 -0700)]
Reformat local Korean numbers in national format.
Korean carriers don't want the country codes displayed for local calls.
However the network returns the entire phone number including the
country code for Volte calls. According to the Koean phone numbering
scheme (https://en.wikipedia.org/wiki/Telephone_numbers_in_South_Korea),
we need to replace the country code +82 with a 0 prepended to the
carrier code to format it as a national number.
BUG:
22862845
Change-Id: Ifbb9eb8d5379608b4ea9d95ae7744779340b188e
Geoff Mendal [Wed, 26 Aug 2015 16:18:32 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 26 Aug 2015 16:10:31 +0000 (11:10 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ia70a231f9cb167baec336984d4531137c833b48f
Auto-generated-cl: translation import
Michael Wright [Wed, 26 Aug 2015 13:08:25 +0000 (13:08 +0000)]
Merge "Update rotation without holding the WOL lock." into mnc-dr-dev
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:44 +0000 (05:54 +0000)]
am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
92480a9ad89a813bdf36185fa8c4d227d8415b4c':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:39 +0000 (05:54 +0000)]
am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
f6b08547458b9219da1717a79363f778bfc57dd0':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:33 +0000 (05:54 +0000)]
am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
b1370c2687f4b03f7b9b36f89bb636b5b65f9531':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:28 +0000 (05:54 +0000)]
am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
aa72988955789be6e790c344daba3ef17abfcd98':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:23 +0000 (05:54 +0000)]
am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
5c90c4f459c2a7213a197f7ee98ad71e85af31bc':
Remove kxml dependency [DO NOT MERGE]
Adrian Roos [Wed, 26 Aug 2015 00:43:31 +0000 (00:43 +0000)]
Merge "Disable fingerprint after user lockout" into mnc-dr-dev
Todd Kennedy [Wed, 26 Aug 2015 00:35:42 +0000 (00:35 +0000)]
am
5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev
* commit '
5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb':
Allow extra slop in battery stats
Todd Kennedy [Wed, 26 Aug 2015 00:27:46 +0000 (00:27 +0000)]
Merge "Allow extra slop in battery stats" into mnc-dev
Todd Kennedy [Wed, 26 Aug 2015 00:26:57 +0000 (17:26 -0700)]
Allow extra slop in battery stats
Current slop of 30ms was causing too many WTFs to be thrown. Increase the slop
to 750ms.
Bug:
23391894
Change-Id: Ica5be9b00745bfe58872d43be8c32f8c147075ed
Chris Tate [Wed, 26 Aug 2015 00:20:50 +0000 (00:20 +0000)]
am
e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
* commit '
e62421f1fbc1ea44e7737989e134fdf9fc1ec4cc':
Teach Pm about the "always ask" link-handling state
Chris Tate [Wed, 26 Aug 2015 00:10:23 +0000 (00:10 +0000)]
Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
Raph Levien [Tue, 25 Aug 2015 23:35:37 +0000 (23:35 +0000)]
am
8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev
* commit '
8304c6c0f9d4b8624ab9cf5cfe5dce15db64c4de':
Truncate and ellipsize app name if too long for dialog.
Raph Levien [Tue, 25 Aug 2015 23:25:10 +0000 (23:25 +0000)]
Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev
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
Adrian Roos [Tue, 25 Aug 2015 22:59:00 +0000 (15:59 -0700)]
Disable fingerprint after user lockout
Bug:
22677859
Change-Id: I38b918d2e40b5bb423f2e5c171fe65bed8d440a6
Jorim Jaggi [Tue, 25 Aug 2015 22:54:34 +0000 (22:54 +0000)]
Merge "Disable RT animations for header ripple" into mnc-dr-dev
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
Truncate and ellipsize app name if too long for dialog.
If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.
Bug:
23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584
Michael Wright [Tue, 25 Aug 2015 20:15:12 +0000 (21:15 +0100)]
Update rotation without holding the WOL lock.
We need to make sure to only ever update the orientation of the
device from WindowOrientationListener when we're not holding the WOL
class lock, otherwise we can deadlock when WMS calls into us to set
the orientation based on an apps preference.
Bug:
23491348
Change-Id: Ifeded4d5d1dc923fa2ce0473bc4b7fe950dc0cfd
Christopher Tate [Tue, 25 Aug 2015 19:39:04 +0000 (12:39 -0700)]
Teach Pm about the "always ask" link-handling state
Bug
23511867
Change-Id: I74b3c8222a7d22541a96b698edd1a175d378e48f
Deepanshu Gupta [Tue, 19 May 2015 18:55:15 +0000 (11:55 -0700)]
Fix include tag rendering. [DO NOT MERGE]
A missing catch clause caused rendering to be failed when there is an
include tag that doesn't specify layout_width and layout_height. Also
improve the error messages to make debugging easier next time.
Change-Id: I617762636973a010b34da167c7b5fcd328b7d178
(cherry picked from commit
21b564573327b1ed2f7e06146b8a01c47ede3089)
Deepanshu Gupta [Mon, 18 May 2015 21:39:03 +0000 (14:39 -0700)]
Show better error message for color attr not found. [DO NOT MERGE]
Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
(cherry picked from commit
5f1bf496948fb6383ae17e5467a26a00489d7564)
Deepanshu Gupta [Fri, 15 May 2015 00:00:50 +0000 (17:00 -0700)]
Fix build: udpate parser factory method [DO NOT MERGE]
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
(cherry picked from commit
3dc19883c571a829c36aa603c04a55c91b00dd57)
Deepanshu Gupta [Thu, 14 May 2015 22:37:29 +0000 (15:37 -0700)]
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.
Conflicts:
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java
Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
(cherry picked from commit
f2d408b51debadca830eefbf8131185ac55ce699)
Deepanshu Gupta [Sat, 9 May 2015 20:09:22 +0000 (13:09 -0700)]
Remove kxml dependency [DO NOT MERGE]
Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.
Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
(cherry picked from commit
78af25584633462e4ab8cf9bafe10f43e7cb2d83)
Chien-Yu Chen [Tue, 25 Aug 2015 18:31:58 +0000 (11:31 -0700)]
Camera: Update for reprocess session
Document that some devices may not support submitting multiple
outputs in a single reprocess capture requests. Remove the
guaranteed reprocess session configurations that are less common
and may not be supported by all devices.
Bug:
23422291
Change-Id: I1c869612e9a83ef480113ca2628f68511a150b64
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.
Nicholas Sauer [Tue, 25 Aug 2015 15:47:50 +0000 (08:47 -0700)]
Add GET_APP_OPS_STATS to Shell
bug:
23397072
Change-Id: I9f60f175380048e0f3888d866069f8f76166c732
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
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
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 [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
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 [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: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: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:00:27 +0000 (19:00 +0000)]
Merge "Don't show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev
destradaa [Wed, 24 Jun 2015 00:25:53 +0000 (17:25 -0700)]
Cherry-pick: Add callback-based support for HW Activity Recognition.
Add a callback-based mechanism for GmsCore to connect to Hardware Activity
Recognition. This allows GmsCore to stop polling to identify if the Android
platform supports the functionality or not.
Bug:
17112184
Change-Id: I8f9459cbd15eecd70f6919c6551e6f7a663c732f
destradaa [Mon, 24 Aug 2015 17:41:53 +0000 (10:41 -0700)]
Disable AR HW when client binder dies.
Ensure that activities are unregistered from AR HW when the client's
binder dies. This clean up is required to prevent AR HW to keep active
when there are no clients listening for events.
Bug:
19894637
Change-Id: Iccd609cf1d2d4a4453c7a96cb8645b61639c3234
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/
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: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: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:10:17 +0000 (01:10 +0000)]
Merge "Fix jank when clicking on HUN" into mnc-dr-dev
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()
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
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
Eino-Ville Talvala [Sat, 22 Aug 2015 00:14:13 +0000 (00:14 +0000)]
Merge "Camera: Fix depth documentation issues" into mnc-dev
Glenn Kasten [Fri, 21 Aug 2015 23:32:32 +0000 (23:32 +0000)]
am
d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev
* commit '
d9eef3478ae2bea4d943082aaefd1a4a91a30600':
MIDI docs: fix buffer allocation
Eino-Ville Talvala [Fri, 21 Aug 2015 23:30:27 +0000 (16:30 -0700)]
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
This ensures that sizes don't change after being initially inspected,
and/or stale size information isn't reused incorrectly.
Bug:
22092273
Change-Id: I5b26ea53977da4c1412e476d06d94aa791846393
Glenn Kasten [Fri, 21 Aug 2015 23:27:08 +0000 (23:27 +0000)]
Merge "MIDI docs: fix buffer allocation" into mnc-dev
Cheryl Potter [Fri, 21 Aug 2015 23:12:47 +0000 (23:12 +0000)]
am
41fc973c: am
251f2479: am
dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
* commit '
41fc973c144287c010d6219ab82f2640ebaff9dc':
docs: changed red to yellow in code snippet
Fyodor Kupolov [Fri, 21 Aug 2015 23:12:43 +0000 (23:12 +0000)]
am
e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
* commit '
e6c64508aba566b5bd4ac9cd87a07358b13f5a06':
Fixed a typo in convertRestrictionsToBundle JavaDoc
Cheryl Potter [Fri, 21 Aug 2015 23:08:00 +0000 (23:08 +0000)]
am
251f2479: am
dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
* commit '
251f24790757cf38bffbd6cec06c6503f99299dd':
docs: changed red to yellow in code snippet
Fyodor Kupolov [Fri, 21 Aug 2015 23:04:09 +0000 (23:04 +0000)]
Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev